From ec254083e6488d2854d9f0225403e70a3ea968a4 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Wed, 22 Jul 2020 11:13:56 +0200
Subject: [PATCH 001/322] updated READMEs for 2.7.1-dev

---
 README.md        | 12 ++++++++++--
 SOL002/README.md |  2 +-
 SOL003/README.md |  2 +-
 SOL005/README.md |  2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index f844f21d7..656dc5202 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,18 @@
 # NFV API Conformance Test Specification (NFV-TST 010)
 
 This repository hosts the NFV API Conformance test specification for 
-the APIs defined in ETSI NFV GS [SOL002](https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.06.01_60/gs_NFV-SOL002v020601p.pdf), [SOL003](https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/02.06.01_60/gs_NFV-SOL003v020601p.pdf), [SOL005](https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/02.06.01_60/gs_NFV-SOL005v020601p.pdf), in their versions v2.6.1.
+the APIs defined in ETSI NFV GS [SOL002](https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.07.01_60/gs_NFV-SOL002v020701p.pdf), 
+[SOL003](https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/02.07.01_60/gs_NFV-SOL003v020701p.pdf), 
+[SOL005](https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/02.07.01_60/gs_NFV-SOL005v020701p.pdf), in their versions 
+v2.7.1.
 
-More information and download is available at [DGS/NFV-TST010ed261](https://portal.etsi.org/webapp/WorkProgram/Report_WorkItem.asp?WKI_ID=58428).
+More information and download is available at [DGS/NFV-TST010ed271](https://portal.etsi.org/webapp/WorkProgram/Report_WorkItem.asp?WKI_ID=58931).
 
+**{- Disclaimer: The content of this repository is related to a DRAFT, i.e. a working document, of ETSI ISG NFV.-}**
+
+{-It is provided for information only and is still under development. The content may be updated, replaced, or removed at any time. Do not use as reference material.-}
+
+The latest draft may be downloaded at the [ISG NFV open area](https://docbox.etsi.org/isg/nfv/open/Drafts/).
 
 ## Overview
 
diff --git a/SOL002/README.md b/SOL002/README.md
index 365fbf055..114399fcb 100644
--- a/SOL002/README.md
+++ b/SOL002/README.md
@@ -2,7 +2,7 @@
 
 This folder includes the NFV API conformance test descriptions for NFV SOL002 APIs.
 
-The reference spec version is v2.6.1: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.06.01_60/gs_NFV-SOL002v020601p.pdf
+The reference spec version is v2.7.1: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.07.01_60/gs_NFV-SOL002v020701p.pdf
 
 ## License
 
diff --git a/SOL003/README.md b/SOL003/README.md
index 286f229e6..32e5d14a6 100644
--- a/SOL003/README.md
+++ b/SOL003/README.md
@@ -2,7 +2,7 @@
 
 This folder includes the NFV API conformance test descriptions for NFV SOL003 APIs.
 
-The reference spec version is v2.6.1: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/02.06.01_60/gs_NFV-SOL003v020601p.pdf
+The reference spec version is v2.7.1: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/02.07.01_60/gs_NFV-SOL003v020701p.pdf
 
 ## License
 
diff --git a/SOL005/README.md b/SOL005/README.md
index 8b8fdae30..0b08282d2 100644
--- a/SOL005/README.md
+++ b/SOL005/README.md
@@ -2,7 +2,7 @@
 
 This folder includes the NFV API conformance test descriptions for NFV SOL005 APIs.
 
-The reference spec version is v2.6.1: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/02.06.01_60/gs_NFV-SOL005v020601p.pdf
+The reference spec version is v2.7.1: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/02.07.01_60/gs_NFV-SOL005v020701p.pdf
 
 ## License
 
-- 
GitLab


From 73a7ab390658080e0a766b319b80f3e6568f4c2e Mon Sep 17 00:00:00 2001
From: Frank Bryden <Frank.Bryden@etsi.org>
Date: Tue, 30 Jun 2020 14:32:37 +0200
Subject: [PATCH 002/322] Issue fixes regarding NSD Management

---
 .../NSDManagementKeywords.robot               | 118 +++++++++---------
 .../NSDManagementNotification.robot           |   2 +
 .../environment/nsDescriptors.txt             |   9 +-
 .../environment/pnfDescriptors.txt            |   5 +-
 .../environment/variables.txt                 |  17 +--
 5 files changed, 81 insertions(+), 70 deletions(-)

diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index 9304e5e06..b6681872a 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -4,13 +4,14 @@ Resource    environment/subscriptions.txt
 Resource    environment/nsDescriptors.txt    # Specific nsDescriptors Parameters
 Resource    environment/pnfDescriptors.txt    # Specific pnfDescriptors Parameters
 Resource    environment/individualSubscription.txt
-Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false 
 Library    MockServerLibrary 
 Library    OperatingSystem
 Library    BuiltIn
 Library    JSONLibrary
 Library    Collections
 Library    JSONSchemaLibrary    schemas/
+Library    RequestsLibrary
 Library    Process
 Library    String
 
@@ -65,7 +66,7 @@ Get all Network Service Descriptors Information without authorization token
 
 Get all Network Service Descriptors Information with expired or revoked authorization token
     Pass Execution If    ${AUTH_USAGE} == 0    Skipping test as it is not supporting authentication
-    Log    The GET method queries  using invalid token
+    Log    The GET method queries using invalid token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Authorization": "${NEG_AUTHORIZATION}"}
     Log    Execute Query and validate response
@@ -203,7 +204,6 @@ GET Individual Network Service Descriptor Information with invalid resource iden
     Integer    response status    404
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
-    Set Suite Variable    ${usageState}    ${response['body']['nsdUsageState']}
 
 Send PATCH to disable Individual Network Service Descriptor
     Log    Trying to perform a PATCH. As prerequisite the nsdInfo shall be in enabled operational state
@@ -333,25 +333,24 @@ Get NSD Content in Zip Format
     Log    Trying to get a NSD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
+    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdDownloadableZip}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
 Get single file NSD Content in Plain or Zip Format
     Log    Trying to get a NSD present in the NFVO Catalogue
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Set Headers    {"Accept": "${ACCEPT_ZIP}, ${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd_content
+    Rest Instances      frankie.json
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Get multi file NSD Content in Plain or Zip Format
     Log    Trying to get a VNFD from a given NSD Management present in the NFVO Catalogue
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Set Headers    {"Accept": "${ACCEPT_ZIP}, ${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
+    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdDownloadableZip}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -359,14 +358,13 @@ Get multi file NSD Content in Plain Format
     Log    Trying to get a negative case performing a get on a NSD present in the NFVO Catalogue. Accept will be text/plain but NSD is composed my multiple files.
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
+    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdDownloadableZip}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
 Get NSD Content with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Set Headers    {"Accept": "${ACCEPT_ZIP}, ${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${erroneous_nsdInfoId}/nsd_content
     ${output}=    Output    response
@@ -374,8 +372,7 @@ Get NSD Content with invalid resource identifier
 
 Get NSD Content with conflict due to onboarding state
     Log    Trying to get a VNFD from a given NSD Management present in the NFVO Catalogue
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Set Headers    {"Accept": "${ACCEPT_ZIP}, ${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${notOnboardedNsdInfoId}/nsd_content
     ${output}=    Output    response
@@ -402,48 +399,54 @@ GET NSD Content with invalid Range Request
     Set Suite Variable    ${response}    ${output}
 
 Send PUT Request to upload NSD Content as zip file in asynchronous mode
-    Log    Trying to perform a PUT. This method upload the content of a NSD
-    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=  Get File  ${contentZipFile}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content    ${body}
-    ${response}=    Output    response body
-    Should Be Empty    ${response}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output} 
+    Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_JSON}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
+    ${body}=  Get Binary File  ${contentZipFile}
+    ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content     data=${body}
+    Log     ${response}
+    Should Be Empty     ${response.text}
+    ${response}=    Create Dictionary   status=${response.status_code}
+    Log     ${response}
+    Set Suite Variable      ${response}     ${response}
+
 
 Send PUT Request to upload NSD Content as plain text file in asynchronous mode
     Log    Trying to perform a PUT. This method upload the content of a NSD
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_PLAIN}", "Authorization": "${AUTHORIZATION}", "Content-Type": "text/plain"}      verify=False
     ${body}=  Get File  ${contentPlainFile}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd_content    ${body}
-    ${response}=    Output    response body
-    Should Be Empty    ${response}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output} 
+    ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content     data=${body}
+    Should Be Empty     ${response.text}
+    ${response}=    Create Dictionary   status=${response.status_code}
+    Set Suite Variable  ${response}     ${response} 
 
 Send PUT Request to upload NSD Content as zip file in synchronous mode
-    Log    Trying to perform a PUT. This method upload the content of a NSD
-    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=  Get File  ${contentZipFile}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content    ${body}
-    ${response}=    Output    response body
-    Should Be Empty    ${response} 
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output} 
+    Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_JSON}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
+    ${body}=  Get Binary File  ${contentZipFile}
+    ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content     data=${body}
+    Should Be Empty     ${response.text}
+    #Log     Got frankie's put with ${response.status_code}
+    ${response}=    Create Dictionary   status=${response.status_code}
+    Set Suite Variable      ${response}     ${response}
 
 Send PUT Request to upload NSD Content as plain text file in synchronous mode
     Log    Trying to perform a PUT. This method upload the content of a NSD
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_PLAIN}", "Authorization": "${AUTHORIZATION}", "Content-Type": "text/plain"}      verify=False
     ${body}=  Get File  ${contentPlainFile}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd_content    ${body}
+    ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content     data=${body}
+    Should Be Empty     ${response.text}
+    ${response}=    Create Dictionary   status=${response.status_code}
+    Set Suite Variable  ${response}     ${response} 
+
+Check Post Condition NSD Content has been Uploaded
+    Log    Checking NsdOnboardingNotification Recieved
+    Wait Until Keyword Succeeds    ${retry}    ${interval}  Check Response is NsdOnboardingNotification
+
+Check Response is NsdOnboardingNotification
     ${response}=    Output    response body
-    Should Be Empty    ${response}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output} 
+    Should Contain    ${response['headers']['Content-Type']}    application/json
+    ${schema} =    Catenate    SEPARATOR=    NsdOnboardingNotification    .schema.json
+    Validate Json    ${schema}    ${response['body']}
+    Log    Json Schema Validation OK
+
 
 Check Post Condition NSD Content has been Uploaded
     Log    Checking NsdOnboardingNotification Recieved
@@ -653,7 +656,6 @@ GET Individual PNF Descriptor Information with invalid resource identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${erroneous_pnfdInfoId}
-    Integer    response status    404
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -742,14 +744,16 @@ Get PNFD Content with conflict due to onboarding state
 
 Send PUT Request to upload PNFD Content as plain text file
     Log    Trying to perform a PUT. This method upload the content of a PNFD
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=  Get File  ${contentFilePnfd}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content    ${body}
-    ${response}=    Output    response body
-    Should Be Empty    ${response}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output} 
+    Create Session    github         http://api.github.com
+    Create Session      pnfd     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}      headers={"Accept": "${ACCEPT_PLAIN}", "Content-Type": "${ACCEPT_PLAIN}", "Authorization": "${AUTHORIZATION}"}      verify=False
+    ${body}=  Get Binary File  ${contentZipFile}
+    ${response}=    Put Request     pnfd     ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoUpld}/pnfd_content     data=${body}
+    Log     ${response}
+    Should Be Empty     ${response.text}
+    ${response}=    Create Dictionary   status=${response.status_code}
+    Log     ${response}
+    Set Suite Variable      ${response}     ${response}
+
 
 Send PUT Request to upload PNFD Content with conflict due to onboarding state
     Log    Trying to perform a PUT. This method upload the content of a PNFD
@@ -980,13 +984,13 @@ Send Delete request for individual NSD Management Subscription with invalid reso
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual NSD Management Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${newSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for individual NSD Management Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -995,7 +999,7 @@ Send Put request for individual NSD Management Subscription
     Set Suite Variable    ${response}    ${output}
     
 Send Patch request for individual NSD Management Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
diff --git a/SOL005/NSDManagement-API/NSDManagementNotification.robot b/SOL005/NSDManagement-API/NSDManagementNotification.robot
index de6418c75..e2315bd50 100644
--- a/SOL005/NSDManagement-API/NSDManagementNotification.robot
+++ b/SOL005/NSDManagement-API/NSDManagementNotification.robot
@@ -295,6 +295,8 @@ Configure Notification Forward
     Create Mock Expectation With Http Forward  ${notification_tmp}  ${notification_fwd}
 
 Create Sessions
+    ${dir}=     List Directory  ${MOCK_SERVER_DIR}
+    Log     ${dir}
     Start Process  java  -jar ${MOCK_SERVER_JAR} -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
     Create Mock Session  ${callback_uri}:${callback_port}
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/environment/nsDescriptors.txt b/SOL005/NSDManagement-API/environment/nsDescriptors.txt
index b16e19ee9..8c4ecdf58 100644
--- a/SOL005/NSDManagement-API/environment/nsDescriptors.txt
+++ b/SOL005/NSDManagement-API/environment/nsDescriptors.txt
@@ -1,9 +1,10 @@
 *** Variables ***
 ${POS_FIELDS}     name=nsdOnboardingState
 ${NEG_FIELDS}     wrongName=any_value
-${nsdInfoId}    5a569e1d-4ffe-4e9a-8cf6-c24226651e56
-${nsdInfoIdPlain}    5a569e1d-4ffe-4e9a-8cf6-c24226651e56
-${nsdInfoIdZip}    5a569e1d-4ffe-4e9a-8cf6-c24226651e56
+${nsdInfoId}    030b1c34-116a-4cfe-9226-19732c3a7b28
+${nsdInfoIdPlain}    20734bbb-abf6-4cd8-a35d-f416f95dc180
+${nsdInfoIdZip}    5548bf85-8580-4c52-90d1-13c1a7a1dcb0
+${nsdDownloadableZip}   f3ce866a-a935-49db-9f39-8b14b662cedc
 ${erroneous_nsdInfoId}  erroneous_nsdInfoId
 ${disabledNsdInfoId}  5a569e1d-4ffe-4e9a-8cf6-c24226651e56
 ${fields}    _links
@@ -19,7 +20,7 @@ ${NFVO_RANGE_OK}    1
 ${range}          bytes=0-1023
 ${erroneousRange}    bytes=100000-1000000    # Requesting a out of range number of bytes
 ${onboardingStateNsdInfoId}    b992a851-08b1-45a8-9282-a5f7a7df04a6
-${contentZipFile}    files/nsdContent.zip
+${contentZipFile}    files/nsdContent.tar.gz
 ${contentPlainFile}    files/nsdContent.yaml
 ${creatingNsdInfoId}    71241932-994a-46e2-ad6c-1740674dda44
 ${NEG_AUTHORIZATION}    Bearer negativetoken
diff --git a/SOL005/NSDManagement-API/environment/pnfDescriptors.txt b/SOL005/NSDManagement-API/environment/pnfDescriptors.txt
index c3bf1896b..1a7d70dbc 100644
--- a/SOL005/NSDManagement-API/environment/pnfDescriptors.txt
+++ b/SOL005/NSDManagement-API/environment/pnfDescriptors.txt
@@ -1,7 +1,8 @@
 *** Variables ***
 ${POS_FIELDS}     name=pnfdOnboardingState
 ${NEG_FIELDS}     wrongName=any_value
-${pnfdInfoId}    40853bda-8a8f-4f63-9130-cef439f65348
+${pnfdInfoId}     3327be9e-f716-43ac-aaeb-fcd54b0a5369 #used for testing downloads
+${pnfdInfoUpld}   93c4cca6-b68b-4aa0-b06a-0e3725995585 #used for testing uploads 
 ${erroneous_pnfdInfoId}  erroneous_pnfdInfoId
 ${enabledPnfdInfoId}  40853bda-8a8f-4f63-9130-cef439f65348
 ${NFVO_FIELDS}    1
@@ -10,6 +11,6 @@ ${ACCEPT_PLAIN}    text/plain
 ${CONTENT_TYPE_PLAIN}    text/plain
 ${erroneous_pnfdId}    erroneousPnfdId
 ${onboardingStatePnfdId}    8ed2bf1f-f6ae-4d18-b478-bfab02fd4cd2
-${contentFilePnfd}    files/pnfdContent.zip
+${contentFilePnfd}    files/nsdContent.yaml
 ${creatingPnfdId}    2e4ce0ef-3ea8-49f9-92dd-8771866015bb
 ${userDefinedDataSet}    some
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/environment/variables.txt b/SOL005/NSDManagement-API/environment/variables.txt
index 9de189269..9c5a80749 100644
--- a/SOL005/NSDManagement-API/environment/variables.txt
+++ b/SOL005/NSDManagement-API/environment/variables.txt
@@ -1,20 +1,23 @@
 *** Variables ***
-${NFVO_HOST}    localhost    # Hostname of the NFVO
-${NFVO_PORT}    8081    # Listening port of the NFVO
+${NFVO_HOST}    172.21.248.145    # Hostname of the NFVO
+${NFVO_PORT}    9999    # Listening port of the NFVO
 ${NFVO_SCHEMA}    https
-${AUTHORIZATION}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
+#auth token for OSM Access
+${AUTHORIZATION}    Bearer FJMG15bVJeJb4Y1t1fSKXFaCFUh0e8LD 
 ${CONTENT_TYPE_JSON}    application/json
 ${ACCEPT_JSON}    application/json
-${apiRoot}        /
+${apiRoot}        /osm/
 ${AUTH_USAGE}     1
 ${NEG_AUTHORIZATION}    Bearer negativetoken
 ${apiVersion}     v1
 ${apiName}        nsd
 ${FIELD_USAGE}    1
-${NFVO_AUTHENTICATION}    Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9
-${NFVO_AUTH_USAGE}    1
+${NFVO_AUTHENTICATION}    Bearer isDGF7TiifGUgzeNb0Fls9aatfZRy4iX #never referenced
+${NFVO_AUTH_USAGE}    1 #never refernced
 
-${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+#MOCK_SERVER_JAR one too many '..'
+${MOCK_SERVER_JAR}    ../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+${MOCK_SERVER_DIR}    ../../bin/
 
 ${callback_port}    9091
 ${callback_uri}    http://172.22.1.7:${callback_port}
-- 
GitLab


From ea60d8f7735ec5cbaf1e75ccdad670ea274004f8 Mon Sep 17 00:00:00 2001
From: brydenf <frank.bryden@etsi.org>
Date: Wed, 1 Jul 2020 15:37:24 +0200
Subject: [PATCH 003/322] Reverted extra changes

Signed-off-by: brydenf <frank.bryden@etsi.org>
---
 SOL005/NSDManagement-API/NSDManagementKeywords.robot     | 6 ------
 SOL005/NSDManagement-API/NSDManagementNotification.robot | 2 --
 SOL005/NSDManagement-API/environment/variables.txt       | 2 --
 3 files changed, 10 deletions(-)

diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index b6681872a..b2c513f74 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -342,7 +342,6 @@ Get single file NSD Content in Plain or Zip Format
     Set Headers    {"Accept": "${ACCEPT_ZIP}, ${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd_content
-    Rest Instances      frankie.json
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -402,10 +401,8 @@ Send PUT Request to upload NSD Content as zip file in asynchronous mode
     Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_JSON}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
     ${body}=  Get Binary File  ${contentZipFile}
     ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content     data=${body}
-    Log     ${response}
     Should Be Empty     ${response.text}
     ${response}=    Create Dictionary   status=${response.status_code}
-    Log     ${response}
     Set Suite Variable      ${response}     ${response}
 
 
@@ -423,7 +420,6 @@ Send PUT Request to upload NSD Content as zip file in synchronous mode
     ${body}=  Get Binary File  ${contentZipFile}
     ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content     data=${body}
     Should Be Empty     ${response.text}
-    #Log     Got frankie's put with ${response.status_code}
     ${response}=    Create Dictionary   status=${response.status_code}
     Set Suite Variable      ${response}     ${response}
 
@@ -748,10 +744,8 @@ Send PUT Request to upload PNFD Content as plain text file
     Create Session      pnfd     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}      headers={"Accept": "${ACCEPT_PLAIN}", "Content-Type": "${ACCEPT_PLAIN}", "Authorization": "${AUTHORIZATION}"}      verify=False
     ${body}=  Get Binary File  ${contentZipFile}
     ${response}=    Put Request     pnfd     ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoUpld}/pnfd_content     data=${body}
-    Log     ${response}
     Should Be Empty     ${response.text}
     ${response}=    Create Dictionary   status=${response.status_code}
-    Log     ${response}
     Set Suite Variable      ${response}     ${response}
 
 
diff --git a/SOL005/NSDManagement-API/NSDManagementNotification.robot b/SOL005/NSDManagement-API/NSDManagementNotification.robot
index e2315bd50..de6418c75 100644
--- a/SOL005/NSDManagement-API/NSDManagementNotification.robot
+++ b/SOL005/NSDManagement-API/NSDManagementNotification.robot
@@ -295,8 +295,6 @@ Configure Notification Forward
     Create Mock Expectation With Http Forward  ${notification_tmp}  ${notification_fwd}
 
 Create Sessions
-    ${dir}=     List Directory  ${MOCK_SERVER_DIR}
-    Log     ${dir}
     Start Process  java  -jar ${MOCK_SERVER_JAR} -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
     Create Mock Session  ${callback_uri}:${callback_port}
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/environment/variables.txt b/SOL005/NSDManagement-API/environment/variables.txt
index 9c5a80749..7d4b0a285 100644
--- a/SOL005/NSDManagement-API/environment/variables.txt
+++ b/SOL005/NSDManagement-API/environment/variables.txt
@@ -15,9 +15,7 @@ ${FIELD_USAGE}    1
 ${NFVO_AUTHENTICATION}    Bearer isDGF7TiifGUgzeNb0Fls9aatfZRy4iX #never referenced
 ${NFVO_AUTH_USAGE}    1 #never refernced
 
-#MOCK_SERVER_JAR one too many '..'
 ${MOCK_SERVER_JAR}    ../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
-${MOCK_SERVER_DIR}    ../../bin/
 
 ${callback_port}    9091
 ${callback_uri}    http://172.22.1.7:${callback_port}
-- 
GitLab


From 33b77cd746925e5ed5489e2f80f3c1c95842d9f6 Mon Sep 17 00:00:00 2001
From: brydenf <frank.bryden@etsi.org>
Date: Mon, 6 Jul 2020 10:46:18 +0200
Subject: [PATCH 004/322] New JS files. Merge with remote changes.

---
 .../environment/nsDescriptors.txt             |  4 +-
 .../environment/variables.txt                 |  2 +-
 .../NSFaultManagement-API/Subscriptions.robot |  4 ++
 .../environment/variables.txt                 |  8 ++--
 .../DeleteNSInstanceWorkflow.robot            |  2 +-
 .../NSInstances.robot                         |  4 ++
 .../NSLCMOperationKeywords.robot              |  9 +++--
 .../TerminateNSTask.robot                     |  1 +
 .../environment/variables.txt                 | 12 +++---
 .../jsons/CreateNs.json                       |  6 +++
 .../jsons/InstantiateNs.json                  |  3 ++
 .../jsons/ScaleNs.json                        | 11 +++++
 .../jsons/TerminateNsRequest.json             |  5 ++-
 .../NSPerformanceManagementKeywords.robot     | 40 +++++++++----------
 .../environment/variables.txt                 |  8 ++--
 .../VNFPackageManagementKeywords.robot        |  4 +-
 .../environment/variables.txt                 |  8 ++--
 17 files changed, 81 insertions(+), 50 deletions(-)
 create mode 100644 SOL005/NSLifecycleManagement-API/jsons/CreateNs.json
 create mode 100644 SOL005/NSLifecycleManagement-API/jsons/InstantiateNs.json
 create mode 100644 SOL005/NSLifecycleManagement-API/jsons/ScaleNs.json

diff --git a/SOL005/NSDManagement-API/environment/nsDescriptors.txt b/SOL005/NSDManagement-API/environment/nsDescriptors.txt
index 8c4ecdf58..4956174c4 100644
--- a/SOL005/NSDManagement-API/environment/nsDescriptors.txt
+++ b/SOL005/NSDManagement-API/environment/nsDescriptors.txt
@@ -1,9 +1,9 @@
 *** Variables ***
 ${POS_FIELDS}     name=nsdOnboardingState
 ${NEG_FIELDS}     wrongName=any_value
-${nsdInfoId}    030b1c34-116a-4cfe-9226-19732c3a7b28
+${nsdInfoId}    	7abbe544-6a51-4c86-af55-3a345f80e7cc
 ${nsdInfoIdPlain}    20734bbb-abf6-4cd8-a35d-f416f95dc180
-${nsdInfoIdZip}    5548bf85-8580-4c52-90d1-13c1a7a1dcb0
+${nsdInfoIdZip}    	352fac1d-ddce-454b-b072-184cf5ed94f5
 ${nsdDownloadableZip}   f3ce866a-a935-49db-9f39-8b14b662cedc
 ${erroneous_nsdInfoId}  erroneous_nsdInfoId
 ${disabledNsdInfoId}  5a569e1d-4ffe-4e9a-8cf6-c24226651e56
diff --git a/SOL005/NSDManagement-API/environment/variables.txt b/SOL005/NSDManagement-API/environment/variables.txt
index 7d4b0a285..0501bca2d 100644
--- a/SOL005/NSDManagement-API/environment/variables.txt
+++ b/SOL005/NSDManagement-API/environment/variables.txt
@@ -3,7 +3,7 @@ ${NFVO_HOST}    172.21.248.145    # Hostname of the NFVO
 ${NFVO_PORT}    9999    # Listening port of the NFVO
 ${NFVO_SCHEMA}    https
 #auth token for OSM Access
-${AUTHORIZATION}    Bearer FJMG15bVJeJb4Y1t1fSKXFaCFUh0e8LD 
+${AUTHORIZATION}    Bearer YguA4klaSzOxwE65MJ7aAWZvkOj2gAup 
 ${CONTENT_TYPE_JSON}    application/json
 ${ACCEPT_JSON}    application/json
 ${apiRoot}        /osm/
diff --git a/SOL005/NSFaultManagement-API/Subscriptions.robot b/SOL005/NSFaultManagement-API/Subscriptions.robot
index 0fb8ac8ce..36b04350c 100644
--- a/SOL005/NSFaultManagement-API/Subscriptions.robot
+++ b/SOL005/NSFaultManagement-API/Subscriptions.robot
@@ -1,7 +1,11 @@
 *** Settings ***
 Resource    environment/variables.txt
 Resource   NSFMOperationKeywords.robot  
+<<<<<<< Updated upstream
 Library    REST     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+=======
+Library    REST     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  ssl_verify=false
+>>>>>>> Stashed changes
 Library     OperatingSystem
 Library  DependencyLibrary
 Library    JSONLibrary
diff --git a/SOL005/NSFaultManagement-API/environment/variables.txt b/SOL005/NSFaultManagement-API/environment/variables.txt
index 7f86938c5..5b0d10e77 100644
--- a/SOL005/NSFaultManagement-API/environment/variables.txt
+++ b/SOL005/NSFaultManagement-API/environment/variables.txt
@@ -1,15 +1,15 @@
 *** Variables ***
-${NFVO_HOST}      localhost    # Hostname of the VNFM
-${NFVO_PORT}      8080    # Listening port of the VNFM
+${NFVO_HOST}      172.21.248.145    # Hostname of the VNFM
+${NFVO_PORT}      9999    # Listening port of the VNFM
 ${NFVO_SCHEMA}    https
-${AUTHORIZATION}    Bearer    QWxhZGRpbjpvcGVuIHNlc2FtZQ==
+${AUTHORIZATION}    Bearer    3mT1BuYgMFj3UDqGGtj4ZTfKH74LUCLU
 ${ACCEPT}         application/json
 ${ACCEPT_JSON}         application/json
 ${AUTH_USAGE}     1
 ${alarm_filter}       nsInstanceId
 ${nsInstanceId}    007c111c-38a1-42c0-a666-7475ecb1567c
 ${invalid_alarm_filter}    badFilter 
-${apiRoot}        /
+${apiRoot}        /osm
 ${apiName}        nsfm
 ${apiVersion}     v1
 ${CONTENT_TYPE}    application/json
diff --git a/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot b/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
index 480600cca..fe061b727 100644
--- a/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
@@ -20,4 +20,4 @@ NS Instance Deletion
     DELETE IndividualNSInstance
     Check HTTP Response Status Code Is    204
     Check HTTP Response Body Json Schema Is    NsIdentifierDeletionNotification
-    Check Instance Deleted
\ No newline at end of file
+    Check Instance Deleted
diff --git a/SOL005/NSLifecycleManagement-API/NSInstances.robot b/SOL005/NSLifecycleManagement-API/NSInstances.robot
index 3d579f4cc..bf22dac23 100644
--- a/SOL005/NSLifecycleManagement-API/NSInstances.robot
+++ b/SOL005/NSLifecycleManagement-API/NSInstances.robot
@@ -1,7 +1,11 @@
 *** Settings ***
 Resource    environment/variables.txt 
 Resource   NSLCMOperationKeywords.robot   
+<<<<<<< Updated upstream
 Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=false
+=======
+Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}       ssl_verify=false
+>>>>>>> Stashed changes
 Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index a11b0047c..1b77de8b2 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -214,7 +214,8 @@ POST New nsInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/CreateNsRequest.json
+    #changed CreateNsRequest to CreateNs
+    ${body}=    Get File    jsons/CreateNs.json 
     Post    ${apiRoot}/${apiName}/${apiVersion}/ns_instances    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}     
@@ -396,7 +397,7 @@ GET Instantiate NSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/InstantiateNsRequest.json
+    ${body}=    Get File    jsons/InstantiateNs.json
     Post    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/instantiate    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -440,7 +441,7 @@ POST scale nsInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/ScaleNsRequest.json
+    ${body}=    Get File    jsons/ScaleNs.json
 	Post    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/scale    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -699,7 +700,7 @@ GET Individual NS LCM OP Occurrence
 	Set Headers  {"Accept":"${ACCEPT}"}  
 	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
 	Log    Execute Query and validate response
-	Get    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId} 	
+	Get    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId} 
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 	
diff --git a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
index 9e9870149..20d927b2e 100644
--- a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
@@ -20,6 +20,7 @@ POST Terminate a NSInstance
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location
     Check resource not_instantiated
+    Sleep    15s
     
 POST Terminate a NSInstance Conflict
     [Documentation]    Test ID: 5.3.2.7.2
diff --git a/SOL005/NSLifecycleManagement-API/environment/variables.txt b/SOL005/NSLifecycleManagement-API/environment/variables.txt
index 94a133ae4..3ce8b5edb 100644
--- a/SOL005/NSLifecycleManagement-API/environment/variables.txt
+++ b/SOL005/NSLifecycleManagement-API/environment/variables.txt
@@ -1,22 +1,22 @@
 *** Variables ***
 ${VNFM_HOST}      localhost    # Hostname of the VNFM
 ${VNFM_PORT}      8080    # Listening port of the VNFM
-${NFVO_HOST}      localhost    # Hostname of the NFVO
-${NFVO_PORT}      8081    # Listening port of the NFVO
+${NFVO_HOST}      172.21.248.145    # Hostname of the NFVO
+${NFVO_PORT}      9999    # Listening port of the NFVO
 ${VNFM_SCHEMA}    https
 ${NFVO_SCHEMA}    https
 
-${AUTHORIZATION}    Bearer    QWxhZGRpbjpvcGVuIHNlc2FtZQ==
+${AUTHORIZATION}    Bearer    kn6jROAkSsHj0Bw70j5jyJiLN8KO6xKI
 ${CONTENT_TYPE}    application/json
 ${CONTENT_TYPE_PATCH}    application/merge-patch+json
 ${ACCEPT_JSON}         application/json
 ${ACCEPT}         application/json
-${apiRoot}        /
+${apiRoot}        /osm/
 ${apiName}        nslcm
 ${apiVersion}     v1
 ${AUTH_USAGE}     1
 ${WRONG_AUTHORIZATION}    Bearer    XXXXXWRONGXXXXX
-${nsInstanceId}       6fc3539c-e602-4afa-8e13-962fb5a7d81f
+${nsInstanceId}         66f27112-8b6b-4e70-91a8-b8625a20fc8f
 ${ConflictNsInstanceId}    007c111c-e602-4afa-8e13-962fb5a7d81d
 ${nsInstanceName}    Test-nsInstance
 ${nsInstanceDescription}    description ns
@@ -28,7 +28,7 @@ ${nsPkgId_processing}    007c111c-38a1-42c0-a666-7475ecb1567c
 ${ARTIFACT_TYPE}    application/octet-stream
 ${ARTIFACT_ID}    artifactId
 ${WRONG_ACCEPT}    application/json
-${nsLcmOpOccId}    6fc3539c-e602-4afa-8e13-962fb5a7d81d
+${nsLcmOpOccId}    4f704476-6a4f-4473-be24-2868b94ac214
 ${CancelMode}    GRACEFUL
 ${NFVO_DUPLICATION}    0
 ${sub_filter}    filter
diff --git a/SOL005/NSLifecycleManagement-API/jsons/CreateNs.json b/SOL005/NSLifecycleManagement-API/jsons/CreateNs.json
new file mode 100644
index 000000000..58485d950
--- /dev/null
+++ b/SOL005/NSLifecycleManagement-API/jsons/CreateNs.json
@@ -0,0 +1,6 @@
+{
+	"nsdId": "20734bbb-abf6-4cd8-a35d-f416f95dc180",
+	"nsName": "myNS",
+	"vimAccountId": "46baa285-994b-4615-8fd1-84fff6e90832",
+	"nsDescription": "fancy router and firewall combo"
+}
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/jsons/InstantiateNs.json b/SOL005/NSLifecycleManagement-API/jsons/InstantiateNs.json
new file mode 100644
index 000000000..696945298
--- /dev/null
+++ b/SOL005/NSLifecycleManagement-API/jsons/InstantiateNs.json
@@ -0,0 +1,3 @@
+{
+    "nsFlavourId": 0
+}
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/jsons/ScaleNs.json b/SOL005/NSLifecycleManagement-API/jsons/ScaleNs.json
new file mode 100644
index 000000000..d5c8dd902
--- /dev/null
+++ b/SOL005/NSLifecycleManagement-API/jsons/ScaleNs.json
@@ -0,0 +1,11 @@
+{
+	"scaleType": "SCALE_VNF",
+	"timeout_ns_scale": 1,
+	"scaleVnfData": {
+	  "scaleVnfType": "SCALE_IN",
+	  "scaleByStepData": {
+		"scaling-group-descriptor": "myScalingGroup",
+		"member-vnf-index": "1"
+	  }
+	}
+  }
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/jsons/TerminateNsRequest.json b/SOL005/NSLifecycleManagement-API/jsons/TerminateNsRequest.json
index a65d7d3b0..4ca37f187 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/TerminateNsRequest.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/TerminateNsRequest.json
@@ -1,3 +1,4 @@
 {
-  "terminationTime": "2021-04-12T23:20:50.52Z"
-}
\ No newline at end of file
+  "timeout_ns_terminate": 1,
+  "autoremove": false
+}
diff --git a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
index fd2302fac..a4c73f1a5 100644
--- a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
+++ b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
@@ -273,7 +273,7 @@ Check HTTP Response Body Pm Job Identifier matches the requested Pm Job
 Get Individual Performance Report
     Log    Trying to get a performance report present in the NFVO
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -281,21 +281,21 @@ Get Individual Performance Report
 Get Individual Performance Report with invalid resource endpoint
     Log    Trying to get a performance report with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${erroneousReportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for Individual Performance Report
     Log    Trying to create new performance report
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for Individual Performance Report
     Log    Trying to update performance report
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -305,7 +305,7 @@ Send Put request for Individual Performance Report
     
 Send Patch request for Individual Performance Report
     Log    Trying to update performance report
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -315,7 +315,7 @@ Send Patch request for Individual Performance Report
 
 Send Delete request for Individual Performance Report
     Log    Trying to delete performance report   
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -343,7 +343,7 @@ Check Postcondition NS Individual Performance Report is Unmodified (Implicit)
 GET all Performance Thresholds
     Log    Trying to get all thresholds present in the NFVO    
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -359,7 +359,7 @@ GET Performance Thresholds with attribute-based filter
 GET Performance Thresholds with invalid attribute-based filter
     Log    Trying to get thresholds present in the NFVO with invalid filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds?${FILTER_KO}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -367,14 +367,14 @@ GET Performance Thresholds with invalid attribute-based filter
 GET NS performance Thresholds with invalid resource endpoint
     Log    Trying to get thresholds present in the NFVO with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/threshold
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post Request Create new Performance Threshold
     Log    Creating a new THreshold
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${request}=    Get File    jsons/CreateThresholdRequest.json
@@ -384,7 +384,7 @@ Send Post Request Create new Performance Threshold
 
 Send PUT Request for all Performance Thresholds
     Log    PUT THresholds
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     PUT    ${apiRoot}/${apiName}/${apiVersion}/thresholds
@@ -393,7 +393,7 @@ Send PUT Request for all Performance Thresholds
     
 Send PATCH Request for all Performance Thresholds
     Log    PUT THresholds
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     PATCH    ${apiRoot}/${apiName}/${apiVersion}/thresholds
@@ -402,7 +402,7 @@ Send PATCH Request for all Performance Thresholds
 
 Send DELETE Request for all Performance Thresholds
     Log    DELETE THresholds
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -430,7 +430,7 @@ Check HTTP Response Body Thresholds match the requested attribute-based filter
 GET Individual NS performance Threshold
     Log    Trying to get a Threhsold present in the NFVO
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -438,28 +438,28 @@ GET Individual NS performance Threshold
 GET individual NS performance Threshold with invalid resource identifier
     Log    Trying to get a Threhsold with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${erroneousThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual NS performance Threshold
     Log    Trying to delete a Threhsold in the NFVO
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual NS performance Threshold with invalid resource identifier
     Log    Trying to delete a Threhsold in the NFVO with invalid id
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${erroneousThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual NS performance Threshold
     Log    Trying to create new threshold
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${newThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -467,7 +467,7 @@ Send Post request for individual NS performance Threshold
 Send Put request for individual NS performance Threshold
     Log    Trying to PUT threshold
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -478,7 +478,7 @@ Send Put request for individual NS performance Threshold
 Send Patch request for individual NS performance Threshold
     Log    Trying to PUT threshold
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
diff --git a/SOL005/NSPerformanceManagement-API/environment/variables.txt b/SOL005/NSPerformanceManagement-API/environment/variables.txt
index 64de1566e..3fa28a915 100644
--- a/SOL005/NSPerformanceManagement-API/environment/variables.txt
+++ b/SOL005/NSPerformanceManagement-API/environment/variables.txt
@@ -1,11 +1,11 @@
 *** Variables ***
-${NFVO_HOST}      localhost    # Hostname of the NFVO
-${NFVO_PORT}      8081    # Listening port of the NFVO
+${NFVO_HOST}      172.21.248.145    # Hostname of the NFVO
+${NFVO_PORT}      9999    # Listening port of the NFVO
 ${NFVO_SCHEMA}    https
-${AUTHORIZATION}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
+${AUTHORIZATION}    Bearer ivwDluws6XVhdFqGznZiw8cK1wP67S9b
 ${CONTENT_TYPE_JSON}    application/json
 ${ACCEPT_JSON}    application/json
-${apiRoot}        /
+${apiRoot}        /osm
 ${AUTH_USAGE}     1
 ${NEG_AUTHORIZATION}    Bearer negativetoken
 ${apiVersion}     v1
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index ff83f44c6..8f9cdeb61 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -173,7 +173,7 @@ GET all VNF Packages with invalid resource endpoint
     Log    Trying to perform a GET on a erroneous URI
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_package
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${erroneousVnfPkgId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -387,7 +387,7 @@ Get VNFD in Individual VNF Package with conflict due to onboarding state
 
 Send POST Request for VNFD in individual VNF Package
     Log    Trying to perform a POST. This method should not be implemented
-    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/vnfd
     ${output}=    Output    response
diff --git a/SOL005/VNFPackageManagement-API/environment/variables.txt b/SOL005/VNFPackageManagement-API/environment/variables.txt
index 80469cdfe..aef570b42 100644
--- a/SOL005/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFPackageManagement-API/environment/variables.txt
@@ -1,12 +1,12 @@
 *** Variables ***
 
-${NFVO_HOST}      localhost    # Hostname of the NFVO
-${NFVO_PORT}      8081    # Listening port of the NFVO
+${NFVO_HOST}      172.21.248.145    # Hostname of the NFVO
+${NFVO_PORT}      9999    # Listening port of the NFVO
 ${NFVO_SCHEMA}    https
-${AUTHORIZATION}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
+${AUTHORIZATION}    Bearer Vr37Kbwr4eWZUNoSpWwy49mkxVmpmPWG
 ${CONTENT_TYPE_JSON}    application/json
 ${ACCEPT_JSON}    application/json
-${apiRoot}        /
+${apiRoot}        /osm
 ${AUTH_USAGE}     1
 ${NEG_AUTHORIZATION}    Bearer negativetoken
 ${apiVersion}     v1
-- 
GitLab


From 526c4acaa7f5f318d760555402822ecbced2c268 Mon Sep 17 00:00:00 2001
From: brydenf <frank.bryden@etsi.org>
Date: Mon, 6 Jul 2020 12:20:39 +0200
Subject: [PATCH 005/322] Removed duplicate decleration of keywords

---
 .../NSDManagement-API/NSDManagementKeywords.robot   | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index b2c513f74..2db6cd863 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -444,18 +444,6 @@ Check Response is NsdOnboardingNotification
     Log    Json Schema Validation OK
 
 
-Check Post Condition NSD Content has been Uploaded
-    Log    Checking NsdOnboardingNotification Recieved
-    Wait Until Keyword Succeeds    ${retry}    ${interval}  Check Response is NsdOnboardingNotification
-
-Check Response is NsdOnboardingNotification
-    ${response}=    Output    response body
-    Should Contain    ${response['headers']['Content-Type']}    application/json
-    ${schema} =    Catenate    SEPARATOR=    NsdOnboardingNotification    .schema.json
-    Validate Json    ${schema}    ${response['body']}
-    Log    Json Schema Validation OK
-
-
 Check Postcondition NSD Content is uploaded and available in the NFVO
     Get single file NSD Content in Plain or Zip Format
     Check HTTP Response Status Code Is    200
@@ -740,7 +728,6 @@ Get PNFD Content with conflict due to onboarding state
 
 Send PUT Request to upload PNFD Content as plain text file
     Log    Trying to perform a PUT. This method upload the content of a PNFD
-    Create Session    github         http://api.github.com
     Create Session      pnfd     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}      headers={"Accept": "${ACCEPT_PLAIN}", "Content-Type": "${ACCEPT_PLAIN}", "Authorization": "${AUTHORIZATION}"}      verify=False
     ${body}=  Get Binary File  ${contentZipFile}
     ${response}=    Put Request     pnfd     ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoUpld}/pnfd_content     data=${body}
-- 
GitLab


From b30d067e2ebd8a440f164d01010dad84b78f9fc5 Mon Sep 17 00:00:00 2001
From: brydenf <frank.bryden@etsi.org>
Date: Mon, 6 Jul 2020 12:21:06 +0200
Subject: [PATCH 006/322] Made js file into template

---
 SOL005/NSLifecycleManagement-API/jsons/CreateNs.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SOL005/NSLifecycleManagement-API/jsons/CreateNs.json b/SOL005/NSLifecycleManagement-API/jsons/CreateNs.json
index 58485d950..b014121df 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/CreateNs.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/CreateNs.json
@@ -1,6 +1,6 @@
-{
-	"nsdId": "20734bbb-abf6-4cd8-a35d-f416f95dc180",
+{{
+	"nsdId": "{nsdId}",
 	"nsName": "myNS",
 	"vimAccountId": "46baa285-994b-4615-8fd1-84fff6e90832",
 	"nsDescription": "fancy router and firewall combo"
-}
\ No newline at end of file
+}}
\ No newline at end of file
-- 
GitLab


From aacc11c9e2d7585f1cd8a5de90c7406ec75a4eb0 Mon Sep 17 00:00:00 2001
From: brydenf <frank.bryden@etsi.org>
Date: Fri, 17 Jul 2020 10:08:33 +0200
Subject: [PATCH 007/322] Templated JSON files in SOL005/ along with minor bug
 fixes

Signed-off-by: brydenf <frank.bryden@etsi.org>
---
 .../IndividualNSDescriptor.robot              |   2 +-
 .../NSDManagementKeywords.robot               |  13 ++++---
 .../environment/nsDescriptors.txt             |   8 ++---
 .../environment/pnfDescriptors.txt            |   4 +--
 .../environment/subscriptions.txt             |   3 +-
 .../environment/variables.txt                 |   3 +-
 .../NSDManagement-API/files/nsdContent.yaml   |  16 +++++++++
 SOL005/NSDManagement-API/files/nsdContent.zip | Bin 0 -> 391 bytes
 .../jsons/subscriptions.json                  |   2 +-
 .../NSFMOperationKeywords.robot               |  12 ++++---
 .../NSFaultManagement-API/Subscriptions.robot |   4 ---
 .../environment/variables.txt                 |   4 +--
 .../jsons/fmSubscriptionRequest.json          |  14 ++++----
 .../NSInstances.robot                         |   4 ---
 .../NSLCMOperationKeywords.robot              |  34 +++++++++++-------
 .../environment/variables.txt                 |  18 ++++++++--
 .../jsons/CreateNs.json                       |   6 ----
 .../jsons/CreateNsRequest.json                |  30 ++++------------
 .../jsons/HealNsRequest.json                  |   6 ++--
 .../jsons/InstantiateNs.json                  |   6 ++--
 .../jsons/LccnSubscriptionRequest.json        |  16 ++++-----
 .../jsons/ScaleNs.json                        |  22 ++++++------
 .../jsons/TerminateNsRequest.json             |   2 +-
 .../jsons/UpdateNsRequest.json                |   6 ++--
 .../jsons/scaleNsToLevelRequest.json          |   6 ++--
 .../NSPerformanceManagementKeywords.robot     |  22 +++++++-----
 .../environment/IndividualPmJob.txt           |   2 +-
 .../environment/variables.txt                 |   8 +++--
 .../jsons/CreatePmJobRequest.json             |  16 ++++-----
 .../jsons/CreateThresholdRequest.json         |  23 ++++++------
 .../jsons/subscriptions.json                  |  10 +++---
 .../VNFPackageManagementKeywords.robot        |  31 +++++++++-------
 .../environment/variables.txt                 |   2 +-
 .../environment/vnfPackageContentViaUri.txt   |   2 +-
 .../jsons/UploadVnfPkgFromUriRequest.json     |   6 ++--
 .../jsons/subscriptions.json                  |  12 +++----
 36 files changed, 203 insertions(+), 172 deletions(-)
 create mode 100644 SOL005/NSDManagement-API/files/nsdContent.yaml
 create mode 100644 SOL005/NSDManagement-API/files/nsdContent.zip
 delete mode 100644 SOL005/NSLifecycleManagement-API/jsons/CreateNs.json

diff --git a/SOL005/NSDManagement-API/IndividualNSDescriptor.robot b/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
index 2ff40359e..47a1aa7a0 100644
--- a/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
+++ b/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
@@ -94,7 +94,7 @@ Enable Individual Network Service Descriptor with conflict due to onboarding sta
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is   ProblemDetails
     
- Enable Individual Network Service Descriptor with HTTP Etag precondition failure
+Enable Individual Network Service Descriptor with HTTP Etag precondition failure
     [Documentation]    Test ID: 5.3.1.2.7
     ...    Test title:  Enable Individual Network Service Descriptor with HTTP Etag precondition failure
     ...    Test objective: The objective is to test that the retrieval of an Network Service Descriptor fails due to a precondition failure when using an uncorrect Http Etag identified.
diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index 2db6cd863..325d91c6b 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -815,7 +815,8 @@ Send Post Request for NSD Management Subscription
     Log    Trying to create a new subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    ${body}=    Get File    jsons/subscriptions.json
+    ${template}=    Get File    jsons/subscriptions.json
+    ${body}=        Format String   ${template}     notifCallbackUri=${notifCallbackUri}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${output}=    Output    response
@@ -828,7 +829,8 @@ Send Post Request for Duplicated NSD Management Subscription
     Log    Trying to create a subscription with an already created content
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    ${body}=    Get File    jsons/subscriptions.json
+    ${template}=    Get File    jsons/subscriptions.json
+    ${body}=        Format String   ${template}     notifCallbackUri=${notifCallbackUri}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${output}=    Output    response
@@ -880,6 +882,7 @@ Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
     Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
+    Log     ${response['body']}
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK  
 
@@ -895,7 +898,8 @@ Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filte
 
 Check HTTP Response Body NsdmSubscription Attributes Values Match the Issued Subscription
     Log    Check Response matches subscription
-    ${body}=    Get File    jsons/subscriptions.json
+    ${template}=    Get File    jsons/subscriptions.json
+    ${body}=        Format String   ${template}     notifCallbackUri=${notifCallbackUri}
     ${subscription}=    evaluate    json.loads('''${body}''')    json
     Should Be Equal As Strings    ${response['body']['callbackUri']}    ${subscription['callbackUri']}
 
@@ -922,7 +926,8 @@ Check Postcondition Subscription Resource Returned in Location Header Is Availab
     ${result}=    Output    response body
     Validate Json    NsdmSubscription.schema.json    ${result}
     Log    Validated NsdmSubscription schema
-    ${body}=    Get File    jsons/subscriptions.json
+    ${template}=    Get File    jsons/subscriptions.json
+    ${body}=        Format String   ${template}     notifCallbackUri=${notifCallbackUri}
     ${subscription}=    evaluate    json.loads('''${body}''')    json
     Should Be Equal    ${result['callbackUri']}    ${subscription['callbackUri']}
     Log    Validated Issued subscription is same as original
diff --git a/SOL005/NSDManagement-API/environment/nsDescriptors.txt b/SOL005/NSDManagement-API/environment/nsDescriptors.txt
index 4956174c4..72804bd3a 100644
--- a/SOL005/NSDManagement-API/environment/nsDescriptors.txt
+++ b/SOL005/NSDManagement-API/environment/nsDescriptors.txt
@@ -1,10 +1,10 @@
 *** Variables ***
 ${POS_FIELDS}     name=nsdOnboardingState
 ${NEG_FIELDS}     wrongName=any_value
-${nsdInfoId}    	7abbe544-6a51-4c86-af55-3a345f80e7cc
-${nsdInfoIdPlain}    20734bbb-abf6-4cd8-a35d-f416f95dc180
-${nsdInfoIdZip}    	352fac1d-ddce-454b-b072-184cf5ed94f5
-${nsdDownloadableZip}   f3ce866a-a935-49db-9f39-8b14b662cedc
+${nsdInfoId}    	9e708376-4f96-4972-89c2-243760626f20
+${nsdInfoIdPlain}    01872c48-3631-4060-afa8-ca7cbef8a4d8
+${nsdInfoIdZip}    	01872c48-3631-4060-afa8-ca7cbef8a4d8
+${nsdDownloadableZip}   cac6ac71-0fdf-45d1-a056-775cbb8157b5
 ${erroneous_nsdInfoId}  erroneous_nsdInfoId
 ${disabledNsdInfoId}  5a569e1d-4ffe-4e9a-8cf6-c24226651e56
 ${fields}    _links
diff --git a/SOL005/NSDManagement-API/environment/pnfDescriptors.txt b/SOL005/NSDManagement-API/environment/pnfDescriptors.txt
index 1a7d70dbc..57b78b807 100644
--- a/SOL005/NSDManagement-API/environment/pnfDescriptors.txt
+++ b/SOL005/NSDManagement-API/environment/pnfDescriptors.txt
@@ -1,8 +1,8 @@
 *** Variables ***
 ${POS_FIELDS}     name=pnfdOnboardingState
 ${NEG_FIELDS}     wrongName=any_value
-${pnfdInfoId}     3327be9e-f716-43ac-aaeb-fcd54b0a5369 #used for testing downloads
-${pnfdInfoUpld}   93c4cca6-b68b-4aa0-b06a-0e3725995585 #used for testing uploads 
+${pnfdInfoId}     b227e618-cdb9-485b-8bfe-d4b8dee8e678 #used for testing downloads
+${pnfdInfoUpld}   dd7ff0f8-0e63-41b4-a572-568d0db30153 #used for testing uploads 
 ${erroneous_pnfdInfoId}  erroneous_pnfdInfoId
 ${enabledPnfdInfoId}  40853bda-8a8f-4f63-9130-cef439f65348
 ${NFVO_FIELDS}    1
diff --git a/SOL005/NSDManagement-API/environment/subscriptions.txt b/SOL005/NSDManagement-API/environment/subscriptions.txt
index d8c041102..72c529236 100644
--- a/SOL005/NSDManagement-API/environment/subscriptions.txt
+++ b/SOL005/NSDManagement-API/environment/subscriptions.txt
@@ -1,4 +1,5 @@
 *** Variables ***
-${filter_ok}      callbackUri=http://172.22.1.7:9091/nsd/subscriptions
+${notifCallbackUri}     http://172.22.1.7:9091/nsd/subscriptions
+${filter_ok}      callbackUri=${notifCallbackUri}
 ${filter_ko}      nfvId=f9f130e4-05eb-4082-a676-4c97d13a883d    # Not existant filter attribute-based
 ${SEPERATOR}      =
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/environment/variables.txt b/SOL005/NSDManagement-API/environment/variables.txt
index 0501bca2d..f79a4d346 100644
--- a/SOL005/NSDManagement-API/environment/variables.txt
+++ b/SOL005/NSDManagement-API/environment/variables.txt
@@ -2,8 +2,7 @@
 ${NFVO_HOST}    172.21.248.145    # Hostname of the NFVO
 ${NFVO_PORT}    9999    # Listening port of the NFVO
 ${NFVO_SCHEMA}    https
-#auth token for OSM Access
-${AUTHORIZATION}    Bearer YguA4klaSzOxwE65MJ7aAWZvkOj2gAup 
+${AUTHORIZATION}    Bearer lTxE0BXRcVPjlIUwHLVH5Dtjl39sZ9qp 
 ${CONTENT_TYPE_JSON}    application/json
 ${ACCEPT_JSON}    application/json
 ${apiRoot}        /osm/
diff --git a/SOL005/NSDManagement-API/files/nsdContent.yaml b/SOL005/NSDManagement-API/files/nsdContent.yaml
new file mode 100644
index 000000000..94b9907be
--- /dev/null
+++ b/SOL005/NSDManagement-API/files/nsdContent.yaml
@@ -0,0 +1,16 @@
+nsd:nsd-catalog:
+  nsd:
+  - constituent-vnfd: []
+    description: myNSD descriptor
+    id: myNSDRevisitedA
+    name: myNSDRevisitedA
+    short-name: myNSD
+    vendor: OSM Composer
+    version: '1.0'
+    vld:
+    - id: ns_vl_u5el
+      mgmt-network: 'true'
+      name: ns_vl_u5el
+      type: ELAN
+      vim-network-name: PUBLIC
+      vnfd-connection-point-ref: []
diff --git a/SOL005/NSDManagement-API/files/nsdContent.zip b/SOL005/NSDManagement-API/files/nsdContent.zip
new file mode 100644
index 0000000000000000000000000000000000000000..7518dd85af2450c67ce648cb1a80760070040652
GIT binary patch
literal 391
zcmWIWW@Zs#U}4~35U;rv@T}Tj?;-;OLpUP?g8+jJLvE#Cu!}yJ)T>O)%?S<RWMF>x
z>T4X=yRUJj72FJrEQ&zoU?MeOqaU*&&)uI~`R1%s8&##Z@OUg;8&c}D!YcNTP~k@Z
zPW=`2@$+vhu>^nl^X7Y;+|&mvS*~xr^sVMgIRn@7<BrEeR8DoMth=OGQSm>3Ng?57
zk&KE_rN{ECWgm?n<wyrk?=^7AJ#>FZO_A95@~DYS>HM$XN}sXhjrpJyW+=WnOYU8I
zujaLTMt+*=+FHMFy+7{$rkB;@_!2ga`*Zf&m`rltBlGIJ&YAt(mb|k*rvBWr%j?RF
zJg)02X5an%skCnKR)OWbf@Q({c@I{YrrJb!rw4d5GRZOH3LFWbzZn>S;l!|{5yZj_
aDpp8Pp#@WbH!B-RJtGi?0cmNF5exwIxQKxO

literal 0
HcmV?d00001

diff --git a/SOL005/NSDManagement-API/jsons/subscriptions.json b/SOL005/NSDManagement-API/jsons/subscriptions.json
index c77b51999..92a9db1b0 100644
--- a/SOL005/NSDManagement-API/jsons/subscriptions.json
+++ b/SOL005/NSDManagement-API/jsons/subscriptions.json
@@ -1,3 +1,3 @@
 {
-	"callbackUri": "http://172.22.1.7:9091/nsd/subscriptions"
+	"callbackUri": "{notifCallbackUri}"
 }
\ No newline at end of file
diff --git a/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot b/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
index a1c10db6a..f2df28a61 100644
--- a/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
+++ b/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
@@ -7,7 +7,8 @@ Library    OperatingSystem
 #Suite Teardown    Terminate All Processes    kill=true
 Library    MockServerLibrary
 Library    Process
-Library     Collections
+Library    Collections
+Library    String
 
 *** Keywords ***
 Create Sessions
@@ -212,7 +213,8 @@ POST Subscription
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/fmSubscriptionRequest.json
+    ${template}=    Get File    jsons/fmSubscriptionRequest.json
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -223,7 +225,8 @@ Post Create subscription - DUPLICATION
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/fmSubscriptionRequest.json
+    ${template}=    Get File    jsons/fmSubscriptionRequest.json
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
@@ -234,7 +237,8 @@ Post Create subscription - NO-DUPLICATION
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/fmSubscriptionRequest.json
+    ${template}=    Get File    jsons/fmSubscriptionRequest.json
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
diff --git a/SOL005/NSFaultManagement-API/Subscriptions.robot b/SOL005/NSFaultManagement-API/Subscriptions.robot
index 36b04350c..0fb8ac8ce 100644
--- a/SOL005/NSFaultManagement-API/Subscriptions.robot
+++ b/SOL005/NSFaultManagement-API/Subscriptions.robot
@@ -1,11 +1,7 @@
 *** Settings ***
 Resource    environment/variables.txt
 Resource   NSFMOperationKeywords.robot  
-<<<<<<< Updated upstream
 Library    REST     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
-=======
-Library    REST     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  ssl_verify=false
->>>>>>> Stashed changes
 Library     OperatingSystem
 Library  DependencyLibrary
 Library    JSONLibrary
diff --git a/SOL005/NSFaultManagement-API/environment/variables.txt b/SOL005/NSFaultManagement-API/environment/variables.txt
index 5b0d10e77..f1f00fbe7 100644
--- a/SOL005/NSFaultManagement-API/environment/variables.txt
+++ b/SOL005/NSFaultManagement-API/environment/variables.txt
@@ -2,7 +2,7 @@
 ${NFVO_HOST}      172.21.248.145    # Hostname of the VNFM
 ${NFVO_PORT}      9999    # Listening port of the VNFM
 ${NFVO_SCHEMA}    https
-${AUTHORIZATION}    Bearer    3mT1BuYgMFj3UDqGGtj4ZTfKH74LUCLU
+${AUTHORIZATION}    Bearer    7EiP8HbWqpAaWVcZojq5WGm8theaCiym
 ${ACCEPT}         application/json
 ${ACCEPT_JSON}         application/json
 ${AUTH_USAGE}     1
@@ -51,8 +51,8 @@ ${response}    {}
 ${req_mock}    {}
 ${resp_mock}    {}
 
-${callback_uri}    http://localhost
 ${callback_port}    9091
+${callback_uri}    http://172.22.1.7:${callback_port}
 ${callback_endpoint}    /endpoint
 ${callback_endpoint_fwd}    /endpoint/check
 ${callback_endpoint_error}    /endpoint_404
diff --git a/SOL005/NSFaultManagement-API/jsons/fmSubscriptionRequest.json b/SOL005/NSFaultManagement-API/jsons/fmSubscriptionRequest.json
index 0f22fd8bb..e9a8b3b01 100644
--- a/SOL005/NSFaultManagement-API/jsons/fmSubscriptionRequest.json
+++ b/SOL005/NSFaultManagement-API/jsons/fmSubscriptionRequest.json
@@ -1,10 +1,10 @@
-{
-  "filter": {
-    "nsInstanceSubscriptionFilter": {
+{{
+  "filter": {{
+    "nsInstanceSubscriptionFilter": {{
       "notificationTypes": [
         "AlarmNotification"
       ]
-    }
-  },
-  "callbackUri": "http://127.0.0.1/subscribe"
-}
\ No newline at end of file
+    }}
+  }},
+  "callbackUri": "{callback_uri}{callback_endpoint}"
+}}
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/NSInstances.robot b/SOL005/NSLifecycleManagement-API/NSInstances.robot
index bf22dac23..3d579f4cc 100644
--- a/SOL005/NSLifecycleManagement-API/NSInstances.robot
+++ b/SOL005/NSLifecycleManagement-API/NSInstances.robot
@@ -1,11 +1,7 @@
 *** Settings ***
 Resource    environment/variables.txt 
 Resource   NSLCMOperationKeywords.robot   
-<<<<<<< Updated upstream
 Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=false
-=======
-Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}       ssl_verify=false
->>>>>>> Stashed changes
 Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index 1b77de8b2..26c63494e 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -7,6 +7,7 @@ Library    JSONSchemaLibrary    schemas/
 Library    OperatingSystem
 Library    MockServerLibrary
 Library    Collections
+Library    String
 
 *** Keywords ***
 Initialize System
@@ -148,7 +149,8 @@ Launch another LCM operation
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/scaleNsToLevelRequest.json
+    ${template}=    Get File    jsons/scaleNsToLevelRequest.json
+    ${body}=        Format String   ${template}     instantiationLevelId=${instantiationLevelId}
     Post    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/scale_to_level    ${body}
     Integer    response status    202
 
@@ -182,13 +184,14 @@ Check Postcondition NS Instance is deleted
 Check Postcondition NS Instance is not modified
     GET IndividualNSInstance
     ${resp_dict}=    evaluate    json.loads('''${response['body']}''')    json
-    ${body}=    Get File    jsons/CreateNsRequest.json
+    ${template}=    Get File    jsons/CreateNsRequest.json 
+    ${body}=        Format String   ${template}     nsdId=${nsdId}   nsInstanceName=${nsInstanceName}   vimAccountId=${vimAccountId}   nsInstanceDescription=${nsInstanceDescription}
     Dictionaries Should Be Equal    ${resp_dict}    ${body}    values=True
     
 Check HTTP Response Header Contains
     [Arguments]    ${HEADER_TOCHECK}
     Should Contain     ${response['headers']}    ${HEADER_TOCHECK}
-    Log    Header is present    
+    Log    Header is present
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
@@ -214,8 +217,8 @@ POST New nsInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    #changed CreateNsRequest to CreateNs
-    ${body}=    Get File    jsons/CreateNs.json 
+    ${template}=    Get File    jsons/CreateNsRequest.json 
+    ${body}=        Format String   ${template}     nsdId=${nsdId}   nsInstanceName=${nsInstanceName}   vimAccountId=${vimAccountId}   nsInstanceDescription=${nsInstanceDescription}
     Post    ${apiRoot}/${apiName}/${apiVersion}/ns_instances    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}     
@@ -397,7 +400,8 @@ GET Instantiate NSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/InstantiateNs.json
+    ${template}=    Get File    jsons/InstantiateNs.json
+    ${body}=        Format String   ${template}     nsFlavourId=${nsFlavourId}
     Post    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/instantiate    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -441,7 +445,8 @@ POST scale nsInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/ScaleNs.json
+    ${template}=    Get File    jsons/ScaleNs.json
+    ${body}=        Format String   ${template}     scaleType=${scaleType}   scaleTimeout=${scaleTimeout}   scaleVnfType=${scaleVnfType}   scaleGroupDescriptor=${scaleGroupDescriptor}   scaleMemberVnfIndex=${scaleMemberVnfIndex}
 	Post    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/scale    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -485,7 +490,8 @@ POST Update NSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/UpdateNsRequest.json
+    ${template}=    Get File    jsons/UpdateNsRequest.json
+    ${body}=        Format String   ${template}     vnfUpdateType=${vnfUpdateType}
 	Post    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/update    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -529,7 +535,8 @@ POST Heal NSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/HealNsRequest.json
+    ${template}=    Get File    jsons/HealNsRequest.json
+    ${body}=        Format String   ${template}     nsDegreeHealing=${nsDegreeHealing}
 	Post    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/heal    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -916,7 +923,8 @@ POST subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/LccnSubscriptionRequest.json
+    ${template}=    Get File    jsons/LccnSubscriptionRequest.json
+    ${body}=        Format String   ${template}     callbackUri=${callback_uri}   callbackEndpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}    
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -927,7 +935,8 @@ POST subscriptions DUPLICATION
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/LccnSubscriptionRequest.json
+    ${template}=    Get File    jsons/LccnSubscriptionRequest.json
+    ${body}=        Format String   ${template}     callbackUri=${callback_uri}   callbackEndpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}    
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -938,7 +947,8 @@ POST subscriptions NO DUPLICATION
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/LccnSubscriptionRequest.json
+    ${template}=    Get File    jsons/LccnSubscriptionRequest.json
+    ${body}=        Format String   ${template}     callbackUri=${callback_uri}   callbackEndpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}    
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
diff --git a/SOL005/NSLifecycleManagement-API/environment/variables.txt b/SOL005/NSLifecycleManagement-API/environment/variables.txt
index 3ce8b5edb..cec5cabbc 100644
--- a/SOL005/NSLifecycleManagement-API/environment/variables.txt
+++ b/SOL005/NSLifecycleManagement-API/environment/variables.txt
@@ -6,7 +6,7 @@ ${NFVO_PORT}      9999    # Listening port of the NFVO
 ${VNFM_SCHEMA}    https
 ${NFVO_SCHEMA}    https
 
-${AUTHORIZATION}    Bearer    kn6jROAkSsHj0Bw70j5jyJiLN8KO6xKI
+${AUTHORIZATION}    Bearer    RW6sV6rtFa3TUEdazW4Dyd66muED2kBA
 ${CONTENT_TYPE}    application/json
 ${CONTENT_TYPE_PATCH}    application/merge-patch+json
 ${ACCEPT_JSON}         application/json
@@ -16,11 +16,15 @@ ${apiName}        nslcm
 ${apiVersion}     v1
 ${AUTH_USAGE}     1
 ${WRONG_AUTHORIZATION}    Bearer    XXXXXWRONGXXXXX
-${nsInstanceId}         66f27112-8b6b-4e70-91a8-b8625a20fc8f
+${nsdId}                9e708376-4f96-4972-89c2-243760626f20
+${nsInstanceId}         bef2ab38-d117-4f29-bb07-0b02508575a9
 ${ConflictNsInstanceId}    007c111c-e602-4afa-8e13-962fb5a7d81d
 ${nsInstanceName}    Test-nsInstance
 ${nsInstanceDescription}    description ns
 ${nsInstanceDescription_Update}    Updated description ns
+${nsFlavourId}      0
+${nsDegreeHealing}      HEAL_RESTORE
+${vimAccountId}      46baa285-994b-4615-8fd1-84fff6e90832
 ${SINGLE_FILE_VNFD}    1    # If VNFD is PLAIN TEXT
 ${ACCEPT_PLAIN}    text/plain
 ${ACCEPT_ZIP}     application/zip
@@ -38,9 +42,17 @@ ${subscriptionId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
 ${VnfLcmOperationOccurrenceNotification}    {}
 ${VnfIdentifierCreationNotification}    {}
 ${VnfIdentifierDeletionNotification}    {}
+${vnfUpdateType}    ADD_VNF
+${instantiationLevelId}     myNextLevel
+
+${scaleType}        SCALE_VNF
+${scaleTimeout}     1
+${scaleVnfType}     SCALE_IN
+${scaleGroupDescriptor}     myScalingGroup
+${scaleMemberVnfIndex}     1
 
-${callback_uri}    http://localhost
 ${callback_port}    9091
+${callback_uri}    http://localhost:${callback_port}
 ${callback_endpoint}    /endpoint
 ${callback_endpoint_fwd}    /endpoint/check
 ${callback_endpoint_error}    /endpoint_404
diff --git a/SOL005/NSLifecycleManagement-API/jsons/CreateNs.json b/SOL005/NSLifecycleManagement-API/jsons/CreateNs.json
deleted file mode 100644
index b014121df..000000000
--- a/SOL005/NSLifecycleManagement-API/jsons/CreateNs.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{{
-	"nsdId": "{nsdId}",
-	"nsName": "myNS",
-	"vimAccountId": "46baa285-994b-4615-8fd1-84fff6e90832",
-	"nsDescription": "fancy router and firewall combo"
-}}
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/jsons/CreateNsRequest.json b/SOL005/NSLifecycleManagement-API/jsons/CreateNsRequest.json
index eb879873a..a8026a810 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/CreateNsRequest.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/CreateNsRequest.json
@@ -1,24 +1,6 @@
-{
-"CreateNsRequest": {
-		"type": "object",
-		"required": [
-			"nsdId",
-			"nsName",
-			"nsDescription"
-		],
-		"properties": {
-			"nsdId": {
-				"description": "Identifier of the NSD that defines the NS instance to be created.\n",
-				"$ref": "SOL005_def.yaml#/definitions/Identifier"
-			},
-			"nsName": {
-				"description": "Human-readable name of the NS instance to be created.\n",
-				"type": "string"
-			},
-			"nsDescription": {
-				"description": "Human-readable description of the NS instance to be created.\n",
-				"type": "string"
-			}
-		}
-	}
-}
\ No newline at end of file
+{{
+	"nsdId": "{nsdId}",
+	"nsName": "{nsInstanceName}",
+	"vimAccountId": "{vimAccountId}",
+	"nsDescription": "{nsInstanceDescription}"
+}}
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/jsons/HealNsRequest.json b/SOL005/NSLifecycleManagement-API/jsons/HealNsRequest.json
index 2922dc4a1..b8fa38ecb 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/HealNsRequest.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/HealNsRequest.json
@@ -1,3 +1,3 @@
-{
-  "degreeHealing": "HEAL_RESTORE"
-}
\ No newline at end of file
+{{
+  "degreeHealing": "{nsDegreeHealing}"
+}}
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/jsons/InstantiateNs.json b/SOL005/NSLifecycleManagement-API/jsons/InstantiateNs.json
index 696945298..60eee0859 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/InstantiateNs.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/InstantiateNs.json
@@ -1,3 +1,3 @@
-{
-    "nsFlavourId": 0
-}
\ No newline at end of file
+{{
+    "nsFlavourId": {nsFlavourId}
+}}
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/jsons/LccnSubscriptionRequest.json b/SOL005/NSLifecycleManagement-API/jsons/LccnSubscriptionRequest.json
index 091cc0cdb..4a6434f53 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/LccnSubscriptionRequest.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/LccnSubscriptionRequest.json
@@ -1,10 +1,10 @@
-{
-  "filter": {
-    "nsInstanceSubscriptionFilter": {
+{{
+  "filter": {{
+    "nsInstanceSubscriptionFilter": {{
       "nsdIds": [
-        "6fc3539c-e602-4afa-8e13-962fb5a7d81f"
+        "{nsdId}"
       ]
-    }
-  },
-  "callbackUri": "http://127.0.0.1/subscribe"
-}
\ No newline at end of file
+    }}
+  }},
+  "callbackUri": "{callbackUri}{callbackEndpoint}"
+}}
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/jsons/ScaleNs.json b/SOL005/NSLifecycleManagement-API/jsons/ScaleNs.json
index d5c8dd902..39d410cfd 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/ScaleNs.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/ScaleNs.json
@@ -1,11 +1,11 @@
-{
-	"scaleType": "SCALE_VNF",
-	"timeout_ns_scale": 1,
-	"scaleVnfData": {
-	  "scaleVnfType": "SCALE_IN",
-	  "scaleByStepData": {
-		"scaling-group-descriptor": "myScalingGroup",
-		"member-vnf-index": "1"
-	  }
-	}
-  }
\ No newline at end of file
+{{
+	"scaleType": "{scaleType}",
+	"timeout_ns_scale": {scaleTimeout},
+	"scaleVnfData": {{
+		"scaleVnfType": "{scaleVnfType}",
+		"scaleByStepData": {{
+			"scaling-group-descriptor": "{scaleGroupDescriptor}",
+			"member-vnf-index": "{scaleMemberVnfIndex}"
+		}}
+	}}
+}}
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/jsons/TerminateNsRequest.json b/SOL005/NSLifecycleManagement-API/jsons/TerminateNsRequest.json
index 4ca37f187..65e326002 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/TerminateNsRequest.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/TerminateNsRequest.json
@@ -1,4 +1,4 @@
 {
   "timeout_ns_terminate": 1,
   "autoremove": false
-}
+}
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/jsons/UpdateNsRequest.json b/SOL005/NSLifecycleManagement-API/jsons/UpdateNsRequest.json
index 64a2c0f4c..336075de4 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/UpdateNsRequest.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/UpdateNsRequest.json
@@ -1,3 +1,3 @@
-{
-	"updateType": "ADD_VNF"	
-}
\ No newline at end of file
+{{
+	"updateType": "{vnfUpdateType}"	
+}}
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/jsons/scaleNsToLevelRequest.json b/SOL005/NSLifecycleManagement-API/jsons/scaleNsToLevelRequest.json
index 1c39a7bb5..ca0ea8d3f 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/scaleNsToLevelRequest.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/scaleNsToLevelRequest.json
@@ -1,3 +1,3 @@
-{
-  "instantiationLevelId": "myNextLevel"
-}
\ No newline at end of file
+{{
+  "instantiationLevelId": "{instantiationLevelId}"
+}}
\ No newline at end of file
diff --git a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
index a4c73f1a5..48a306e04 100644
--- a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
+++ b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
@@ -89,7 +89,8 @@ Send Post Request Create new NS Performance Monitoring Job
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/CreatePmJobRequest.json
+    ${template}=    Get File    jsons/CreatePmJobRequest.json
+    ${body}=        Format String   ${template}     pmJobId=${pmJobId}
     POST    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -377,7 +378,8 @@ Send Post Request Create new Performance Threshold
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    ${request}=    Get File    jsons/CreateThresholdRequest.json
+    ${template}=    Get File    jsons/CreateThresholdRequest.json
+    ${body}=        Format String   ${template}     pmJobId=${pmJobId}
     POST    ${apiRoot}/${apiName}/${apiVersion}/thresholds    ${request}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -576,8 +578,9 @@ Send Post Request for NS Performance Subscription
     Set headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Set headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body_request}=    Get File    jsons/subscriptions.json
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body_request}
+    ${template}=    Get File    jsons/subscriptions.json
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1
@@ -597,8 +600,9 @@ Send Post Request for Duplicated NS Performance Subscription
     Set headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Set headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body_request}=    Get File    jsons/subscriptions.json
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body_request}
+    ${template}=    Get File    jsons/subscriptions.json
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT}
@@ -663,7 +667,8 @@ Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filte
 
 Check HTTP Response Body PmSubscription Attributes Values Match the Issued Subscription
     Log    Check Response matches subscription
-    ${body}=    Get File    jsons/subscriptions.json
+    ${template}=    Get File    jsons/subscriptions.json
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     ${subscription}=    evaluate    json.loads('''${body}''')    json
     Should Be Equal    ${response['body']['callbackUri']}    ${subscription['callbackUri']}
 
@@ -690,7 +695,8 @@ Check Postcondition Subscription Resource URI Returned in Location Header Is Ava
     ${result}=    Output    response body
     Validate Json    PmSubscriptions.schema.json    ${result}
     Log    Validated PmSubscriptions schema
-    ${body}=    Get File    jsons/subscriptions.json
+    ${template}=    Get File    jsons/subscriptions.json
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     ${subscription}=    evaluate    json.loads('''${body}''')    json
     Should Be Equal    ${result['callbackUri']}    ${subscription['callbackUri']}
     Log    Validated Issued subscription is same as original
diff --git a/SOL005/NSPerformanceManagement-API/environment/IndividualPmJob.txt b/SOL005/NSPerformanceManagement-API/environment/IndividualPmJob.txt
index 99a00a748..cde92cf92 100644
--- a/SOL005/NSPerformanceManagement-API/environment/IndividualPmJob.txt
+++ b/SOL005/NSPerformanceManagement-API/environment/IndividualPmJob.txt
@@ -1,5 +1,5 @@
 *** Variables ***
-${pmJobId}        29f4ff6a-be91-4ec8-856e-fcf1e2479e4e
+${pmJobId}        1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
 ${erroneousPmJobId}    erroneousPmJobId
 ${response}=    httpresponse
 ${OrigResponse}=    httpresponse
diff --git a/SOL005/NSPerformanceManagement-API/environment/variables.txt b/SOL005/NSPerformanceManagement-API/environment/variables.txt
index 3fa28a915..6b07f6ad8 100644
--- a/SOL005/NSPerformanceManagement-API/environment/variables.txt
+++ b/SOL005/NSPerformanceManagement-API/environment/variables.txt
@@ -26,5 +26,9 @@ ${sleep_interval}    20s
 ${total_polling_time}   2 min
 ${polling_interval}     10 sec
 
-
-${response}
+${performanceMetric}    cpu_util
+${thresholdType}        SIMPLE
+${thresholdValue}       10
+${hysteresis}           50
+${collectionPeriod}     10
+${reportingPeriod}      30
\ No newline at end of file
diff --git a/SOL005/NSPerformanceManagement-API/jsons/CreatePmJobRequest.json b/SOL005/NSPerformanceManagement-API/jsons/CreatePmJobRequest.json
index 75549f534..506e25475 100644
--- a/SOL005/NSPerformanceManagement-API/jsons/CreatePmJobRequest.json
+++ b/SOL005/NSPerformanceManagement-API/jsons/CreatePmJobRequest.json
@@ -1,9 +1,9 @@
-{
-	"objectInstanceIds": ["1f50d68b-82e8-4deb-bd40-c934d4d1ac0a"],
-	"criteria": {
-		"performanceMetric": [],
+{{
+	"objectInstanceIds": ["{pmJobId}"],
+	"criteria": {{
+		"performanceMetric": "{performanceMetric}",
 		"performanceMetricGroup": [],
-		"collectionPeriod": 10,
-		"reportingPeriod": 30
-	}
-}
\ No newline at end of file
+		"collectionPeriod": {collectionPeriod},
+		"reportingPeriod": {reportingPeriod}
+	}}
+}}
\ No newline at end of file
diff --git a/SOL005/NSPerformanceManagement-API/jsons/CreateThresholdRequest.json b/SOL005/NSPerformanceManagement-API/jsons/CreateThresholdRequest.json
index 1e58c2bac..e5b0b975c 100644
--- a/SOL005/NSPerformanceManagement-API/jsons/CreateThresholdRequest.json
+++ b/SOL005/NSPerformanceManagement-API/jsons/CreateThresholdRequest.json
@@ -1,12 +1,11 @@
-{
-	"objectInstanceIds" : "1f50d68b-82e8-4deb-bd40-c934d4d1ac0a",
-	"criteria" : {
-		"performanceMetric": "cpu_util",
-		"thresholdType": "SIMPLE",
-		"simpleThresholdDetails": {
-			"thresholdValue": 10,
-			"hysteresis": 50
-		}
-		
-	}
-}
\ No newline at end of file
+{{
+	"objectInstanceIds" :  "{pmJobId}",
+	"criteria" : {{
+		"performanceMetric": "{performanceMetric}",
+		"thresholdType": "{thresholdType}",
+		"simpleThresholdDetails": {{
+			"thresholdValue": {thresholdValue},
+			"hysteresis": {hysteresis}
+		}}	
+	}}
+}}
\ No newline at end of file
diff --git a/SOL005/NSPerformanceManagement-API/jsons/subscriptions.json b/SOL005/NSPerformanceManagement-API/jsons/subscriptions.json
index 6293d99d2..3ca4fc25a 100644
--- a/SOL005/NSPerformanceManagement-API/jsons/subscriptions.json
+++ b/SOL005/NSPerformanceManagement-API/jsons/subscriptions.json
@@ -1,6 +1,6 @@
-{
-	"callbackUri": "http://172.22.1.7:9091/nspm/subscriptions",
-	"filter": {
+{{
+	"callbackUri": "{callback_uri}{callback_endpoint}",
+	"filter": {{
 		"notificationTypes": ["ThresholdCrossedNotification"]
-	}
-}
\ No newline at end of file
+	}}
+}}
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 8f9cdeb61..4efc809be 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -266,7 +266,7 @@ Send PATCH to disable Individual VNF Package
     Log    Trying to perform a PATCH. As prerequisite the nsdInfo shall be in enabled operational state
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    ${body}=    Get File    jsons/NsdInfoModificationDisable.json
+    ${body}=    Get File    jsons/VnfPkgInfoModificationsDisabled.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     PATCH    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}    ${body}
     ${output}=    Output    response
@@ -281,7 +281,7 @@ Send PATCH to enable Individual VNF Package
     Log    Trying to perform a PATCH. As prerequisite the nsdInfo shall be in disabled operational state
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    ${body}=    Get File    jsons/NsdInfoModificationEnable.json
+    ${body}=    Get File    jsons/VnfPkgInfoModifications.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     PATCH    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}    ${body}
     ${output}=    Output    response
@@ -639,7 +639,8 @@ Send POST Request to upload VNF Package Content from URI
     Log    Trying to perform a POST. The POST method provides the information for the NFVO to get the content of a VNF package.
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/UploadVnfPkgFromUriRequest.json
+    ${template}=    Get File    jsons/UploadVnfPkgFromUriRequest.json
+    ${body}=        Format String   ${template}     vnfPkgUri=${vnfPkgUri}
     POST    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -648,7 +649,8 @@ Send POST Request to upload VNF Package Content from URI with conflict due to on
     Log    Trying to perform a POST. The POST method provides the information for the NFVO to get the content of a VNF package.
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/UploadVnfPkgFromUriRequest.json
+    ${template}=    Get File    jsons/UploadVnfPkgFromUriRequest.json
+    ${body}=        Format String   ${template}     vnfPkgUri=${vnfPkgUri}
     POST    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${creatingVnfPkgViaUriId}/package_content/upload_from_uri    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -728,7 +730,8 @@ Send Post Request for VNF Package Subscription
     Log    Trying to create a new subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    ${body}=    Get File    jsons/subscriptions.json
+    ${template}=    Get File    jsons/subscriptions.json
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${output}=    Output    response
@@ -740,7 +743,8 @@ Send Post Request for Duplicated VNF Package Subscription
     Log    Trying to create a subscription with an already created content
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    ${body}=    Get File    jsons/subscriptions.json
+    ${template}=    Get File    jsons/subscriptions.json
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${output}=    Output    response
@@ -776,7 +780,8 @@ Check Postcondition VNF Package Subscriptions Exists
 
 Check HTTP Response Body PkgmSubscription Attributes Values Match the Issued Subscription
     Log    Check Response matches subscription
-    ${body}=    Get File    jsons/subscriptions.json
+    ${template}=    Get File    jsons/subscriptions.json
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
     ${subscription}=    evaluate    json.loads('''${body}''')    json
     Should Be Equal    ${response['body']['callbackUri']}    ${subscription['callbackUri']}
 
@@ -806,7 +811,8 @@ Check Postcondition Subscription Resource Returned in Location Header Is Availab
     ${result}=    Output    response body
     Validate Json    PkgmSubscription.schema.json    ${result}
     Log    Validated PkgmSubscription schema
-    ${body}=    Get File    jsons/subscriptions.json
+    ${template}=    Get File    jsons/subscriptions.json
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
     ${subscription}=    evaluate    json.loads('''${body}''')    json
     Should Be Equal    ${result['callbackUri']}    ${subscription['callbackUri']}
     Log    Validated Issued subscription is same as original
@@ -849,13 +855,13 @@ Send Delete request for individual VNF Package Subscription with invalid resourc
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual VNF Package Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${newSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for individual VNF Package Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -864,7 +870,7 @@ Send Put request for individual VNF Package Subscription
     Set Suite Variable    ${response}    ${output}
     
 Send Patch request for individual VNF Package Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -928,7 +934,8 @@ Check Notification Endpoint
 
 Check HTTP Response Body Matches the Subscription
     Log    Check Response matches subscription
-    ${body}=    Get File    jsons/subscriptions.json
+    ${template}=    Get File    jsons/subscriptions.json
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
     ${subscription}=    evaluate    json.loads('''${body}''')    json
     Should Be Equal As Strings    ${response['body']['callbackUri']}    ${subscription['callbackUri']}
     
diff --git a/SOL005/VNFPackageManagement-API/environment/variables.txt b/SOL005/VNFPackageManagement-API/environment/variables.txt
index aef570b42..36cafcc88 100644
--- a/SOL005/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFPackageManagement-API/environment/variables.txt
@@ -20,8 +20,8 @@ ${testOptionalMethods}    0
 
 ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
 
-${callback_uri}    http://localhost
 ${callback_port}    9091
+${callback_uri}    http://localhost:${callback_port}
 ${callback_endpoint}    /endpoint
 ${callback_endpoint_fwd}    /endpoint/check
 ${callback_endpoint_error}    /endpoint_404
diff --git a/SOL005/VNFPackageManagement-API/environment/vnfPackageContentViaUri.txt b/SOL005/VNFPackageManagement-API/environment/vnfPackageContentViaUri.txt
index 9cb902861..53981f953 100644
--- a/SOL005/VNFPackageManagement-API/environment/vnfPackageContentViaUri.txt
+++ b/SOL005/VNFPackageManagement-API/environment/vnfPackageContentViaUri.txt
@@ -1,4 +1,4 @@
 *** Variables ***
 ${vnfPkgViaUriId}       788106a2-d692-44f3-a86d-384f0ce35e42
 ${creatingVnfPkgViaUriId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
-
+${vnfPkgUri}        http://localhost/content.zip
diff --git a/SOL005/VNFPackageManagement-API/jsons/UploadVnfPkgFromUriRequest.json b/SOL005/VNFPackageManagement-API/jsons/UploadVnfPkgFromUriRequest.json
index f76054e5f..685340204 100644
--- a/SOL005/VNFPackageManagement-API/jsons/UploadVnfPkgFromUriRequest.json
+++ b/SOL005/VNFPackageManagement-API/jsons/UploadVnfPkgFromUriRequest.json
@@ -1,3 +1,3 @@
-{
-"addressInformation": "http://localhost/content.zip"
-}
\ No newline at end of file
+{{
+    "addressInformation": "{vnfPkgUri}"
+}}
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/jsons/subscriptions.json b/SOL005/VNFPackageManagement-API/jsons/subscriptions.json
index 4314ec0ce..124004374 100644
--- a/SOL005/VNFPackageManagement-API/jsons/subscriptions.json
+++ b/SOL005/VNFPackageManagement-API/jsons/subscriptions.json
@@ -1,6 +1,6 @@
-{
-	"callbackUri": "http://127.0.0.1/subscribe",
-	"filter": {
-		"vnfPkgId":  ["491ed430-67f5-4c6c-b78e-797f5d718868"]
-	}
-}
\ No newline at end of file
+{{
+	"callbackUri": "{callback_uri}{callback_endpoint}",
+	"filter": {{
+		"vnfPkgId":  ["{vnfPkgId}"]
+	}}
+}}
\ No newline at end of file
-- 
GitLab


From afc6032a6783200761a25265ca174fb743a8dcdf Mon Sep 17 00:00:00 2001
From: Frank Bryden <Frank.Bryden@etsi.org>
Date: Fri, 24 Jul 2020 11:46:18 +0200
Subject: [PATCH 008/322] Introduced new NSLCM test to test the creation of an
 NS with a disabled NSD.

Signed-off-by: Frank Bryden <Frank.Bryden@etsi.org>
---
 SOL005/NSDManagement-API/environment/variables.txt   |  4 ++--
 .../CreateNSInstanceWorkflow.robot                   | 12 +++++++++++-
 .../NSLCMOperationKeywords.robot                     | 11 +++++++++++
 .../environment/variables.txt                        |  3 ++-
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/SOL005/NSDManagement-API/environment/variables.txt b/SOL005/NSDManagement-API/environment/variables.txt
index f79a4d346..547e487e3 100644
--- a/SOL005/NSDManagement-API/environment/variables.txt
+++ b/SOL005/NSDManagement-API/environment/variables.txt
@@ -2,7 +2,7 @@
 ${NFVO_HOST}    172.21.248.145    # Hostname of the NFVO
 ${NFVO_PORT}    9999    # Listening port of the NFVO
 ${NFVO_SCHEMA}    https
-${AUTHORIZATION}    Bearer lTxE0BXRcVPjlIUwHLVH5Dtjl39sZ9qp 
+${AUTHORIZATION}    Bearer u5JGp5D3k7m1VUlrCa39k8WX15em149q 
 ${CONTENT_TYPE_JSON}    application/json
 ${ACCEPT_JSON}    application/json
 ${apiRoot}        /osm/
@@ -14,7 +14,7 @@ ${FIELD_USAGE}    1
 ${NFVO_AUTHENTICATION}    Bearer isDGF7TiifGUgzeNb0Fls9aatfZRy4iX #never referenced
 ${NFVO_AUTH_USAGE}    1 #never refernced
 
-${MOCK_SERVER_JAR}    ../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
 
 ${callback_port}    9091
 ${callback_uri}    http://172.22.1.7:${callback_port}
diff --git a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
index 9092991e1..ae2915934 100644
--- a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
@@ -24,4 +24,14 @@ NS Instance Creation
     Check HTTP Response Body Json Schema Is    NsIdentifierCreationNotification
     Check resource not_instantiated
     
-    
\ No newline at end of file
+NS Instance Creation with DISABLED nsd
+    [Documentation]    Test ID: 5.3.2.18.2
+    ...    Test title: NS Instance Creation with DISABLED nsd
+    ...    Test objective: The objective is to test the workflow for Creating a NS instance with a disabled NSD
+    ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in disabled operational state.
+    ...    Reference: Clauses 6.4.2.3.1 and 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    POST New nsInstance with DISABLED nsd
+    Check HTTP Response Status Code Is    409
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index 26c63494e..49c77d238 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -223,6 +223,17 @@ POST New nsInstance
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}     
 
+POST New nsInstance with DISABLED nsd
+    Log    Create NS instance by POST to ${apiRoot}/${apiName}/${apiVersion}/ns_instances
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template}=    Get File    jsons/CreateNsRequest.json 
+    ${body}=        Format String   ${template}     nsdId=${disabledNsdId}   nsInstanceName=${nsInstanceName}   vimAccountId=${vimAccountId}   nsInstanceDescription=${nsInstanceDescription}
+    Post    ${apiRoot}/${apiName}/${apiVersion}/ns_instances    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}  
+
 GET NsInstances
     Log    Query NS The GET method queries information about multiple NS instances.
     Set Headers  {"Accept":"${ACCEPT}"}  
diff --git a/SOL005/NSLifecycleManagement-API/environment/variables.txt b/SOL005/NSLifecycleManagement-API/environment/variables.txt
index cec5cabbc..b9a2ab988 100644
--- a/SOL005/NSLifecycleManagement-API/environment/variables.txt
+++ b/SOL005/NSLifecycleManagement-API/environment/variables.txt
@@ -6,7 +6,7 @@ ${NFVO_PORT}      9999    # Listening port of the NFVO
 ${VNFM_SCHEMA}    https
 ${NFVO_SCHEMA}    https
 
-${AUTHORIZATION}    Bearer    RW6sV6rtFa3TUEdazW4Dyd66muED2kBA
+${AUTHORIZATION}    Bearer    v1qDEucqjIZSua6t4R40sraMZafJxEKb
 ${CONTENT_TYPE}    application/json
 ${CONTENT_TYPE_PATCH}    application/merge-patch+json
 ${ACCEPT_JSON}         application/json
@@ -17,6 +17,7 @@ ${apiVersion}     v1
 ${AUTH_USAGE}     1
 ${WRONG_AUTHORIZATION}    Bearer    XXXXXWRONGXXXXX
 ${nsdId}                9e708376-4f96-4972-89c2-243760626f20
+${disabledNsdId}        9e708376-4f96-4972-89c2-243760626f20
 ${nsInstanceId}         bef2ab38-d117-4f29-bb07-0b02508575a9
 ${ConflictNsInstanceId}    007c111c-e602-4afa-8e13-962fb5a7d81d
 ${nsInstanceName}    Test-nsInstance
-- 
GitLab


From 38600bde31afea7399d8cc487305e771fd232dd4 Mon Sep 17 00:00:00 2001
From: Frank Bryden <Frank.Bryden@etsi.org>
Date: Thu, 13 Aug 2020 10:36:30 +0200
Subject: [PATCH 009/322] More minor bug fixes

Signed-off-by: Frank Bryden <Frank.Bryden@etsi.org>
---
 .../NSDManagementKeywords.robot               | 14 ++++----
 .../schemas/NsdInfoModification.schema.json   |  8 ++---
 .../VNFPackageManagementKeywords.robot        | 34 ++++++++++---------
 .../VnfPackageChangeNotification.schema.json  |  2 +-
 4 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index 325d91c6b..35f2858e0 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -410,7 +410,7 @@ Send PUT Request to upload NSD Content as plain text file in asynchronous mode
     Log    Trying to perform a PUT. This method upload the content of a NSD
     Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_PLAIN}", "Authorization": "${AUTHORIZATION}", "Content-Type": "text/plain"}      verify=False
     ${body}=  Get File  ${contentPlainFile}
-    ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content     data=${body}
+    ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd_content     data=${body}
     Should Be Empty     ${response.text}
     ${response}=    Create Dictionary   status=${response.status_code}
     Set Suite Variable  ${response}     ${response} 
@@ -427,7 +427,7 @@ Send PUT Request to upload NSD Content as plain text file in synchronous mode
     Log    Trying to perform a PUT. This method upload the content of a NSD
     Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_PLAIN}", "Authorization": "${AUTHORIZATION}", "Content-Type": "text/plain"}      verify=False
     ${body}=  Get File  ${contentPlainFile}
-    ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content     data=${body}
+    ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd_content     data=${body}
     Should Be Empty     ${response.text}
     ${response}=    Create Dictionary   status=${response.status_code}
     Set Suite Variable  ${response}     ${response} 
@@ -450,12 +450,12 @@ Check Postcondition NSD Content is uploaded and available in the NFVO
  
 Send PUT Request to upload NSD Content with conflict due to onboarding state
     Log    Trying to perform a PUT. This method upload the content of a NSD
-    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_ZIP}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
     ${body}=  Get Binary File  ${contentZipFile}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${creatingNsdInfoId}/nsd_content    ${body}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output} 
+    ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content     data=${body}
+    Log         ${response}
+    ${response}=    Create Dictionary   status=${response.status_code}  headers=${response.headers}     body=${response.json()}
+    Set Suite Variable      ${response}     ${response}
 
 Send POST Request for NSD Content
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
diff --git a/SOL005/NSDManagement-API/schemas/NsdInfoModification.schema.json b/SOL005/NSDManagement-API/schemas/NsdInfoModification.schema.json
index c3af950e4..01296fd74 100644
--- a/SOL005/NSDManagement-API/schemas/NsdInfoModification.schema.json
+++ b/SOL005/NSDManagement-API/schemas/NsdInfoModification.schema.json
@@ -11,12 +11,8 @@
       ]
     },
     "userDefinedData": {
-      "description": "Modifications of the userDefinedData attribute in NsdInfo data type. See note. If present, these modifications shall be applied according to the rules of JSON Merge PATCH (see IETF RFC 7396 [25]).  NOTE- At least one of the attributes - nsdOperationalState and userDefinedData - shall be present.\n",
-      "type": "array",
-      "items": {
-        "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159. \n",
-        "type": "object"
-      }
+      "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159. \n",
+      "type": "object"
     }
   }
 }
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 4efc809be..1cbd72922 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -11,6 +11,7 @@ Resource          environment/vnfPackageArtifacts.txt
 Resource          environment/individualSubscription.txt
 Library           OperatingSystem
 Library           JSONLibrary
+Library           RequestsLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
 Library           Process
 Library           MockServerLibrary
@@ -503,14 +504,13 @@ Send PUT Request for individual VNF Package Content
 
 Send PUT Request to upload VNF Package Content
     Log    Trying to perform a PUT. This method upload the content of a NSD
-    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=  Get Binary File     files/vnfPackage.zip
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${newVnfPackageId}/package_content    ${body}
-    ${response}=    Output    response body
-    Should Be Empty    ${response} 
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
+    Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_ZIP}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
+    ${body}=  Get Binary File     files/hackfest_gateway_vnfd-1.0.tar.gz
+    ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${newVnfPackageId}/package_content    data=${body}
+    Should Be Empty     ${response.text}
+    ${response}=    Create Dictionary   status=${response.status_code}
+    Set Suite Variable      ${response}     ${response}
+
 
 Check Postcondition VNF Package Content is uploaded and available in the NFVO
     Log    Trying to get a VNF Package Content
@@ -521,12 +521,12 @@ Check Postcondition VNF Package Content is uploaded and available in the NFVO
  
 Send PUT Request to upload VNF Package Content with conflict due to onboarding state
     Log    Trying to perform a PUT. This method upload the content of a NSD
-    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=  Get Binary File  files/vnfPackage.zip
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${creatingVnfPackageId}/nsd_content    ${body}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output} 
+    Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_ZIP}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
+    ${body}=  Get Binary File     files/hackfest_gateway_vnfd-1.0.tar.gz
+    ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${creatingVnfPackageId}/package_content    data=${body}
+    Should Be Empty     ${response.text}
+    ${response}=    Create Dictionary   status=${response.status_code}
+    Set Suite Variable      ${response}     ${response}
  
 Send PATCH Request for individual VNF Package Content
     Log    Trying to perform a PATCH (method should not be implemented)
@@ -630,9 +630,11 @@ Send DELETE Request for individual VNF Package Artifact
 
 Check Postcondition VNF Package Artifact Exist
     Log    Checking that vnf pacakge still exists
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
 
 Send POST Request to upload VNF Package Content from URI
@@ -902,7 +904,7 @@ Create Sessions
     Create Mock Session  ${callback_uri}:${callback_port}
     
 Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
+    [Arguments]    ${expected_status}
     Should Be Equal As Strings    ${response['status']}    ${expected_status}
     Log    Status code validated
     
diff --git a/SOL005/VNFPackageManagement-API/schemas/VnfPackageChangeNotification.schema.json b/SOL005/VNFPackageManagement-API/schemas/VnfPackageChangeNotification.schema.json
index 7db3fe98c..3ba43e8df 100644
--- a/SOL005/VNFPackageManagement-API/schemas/VnfPackageChangeNotification.schema.json
+++ b/SOL005/VNFPackageManagement-API/schemas/VnfPackageChangeNotification.schema.json
@@ -1,5 +1,5 @@
 {
-  "description": "This type represents a VNF package management notification, which informs the receiver of a change of the status in an on-boarded VNF package. Only changes in the \"operationalState\" attribute of an on-boarded VNF package and the deletion of the VNF package will be reported. Change in the \"usageState\" and \"onboardingState\" attributes are not reported. The notification shall comply with the provisions defined in Table 9.5.2.9-1. The support of this notification is mandatory. The notification shall be triggered by the NFVO when there is a change in the status of an onboarded VNF package, as follows. • The \"operationalState\" attribute of a VNF package has changed, and the \"onboardingState\" attribute of the package has the value \"ONBOARDED\". • The on-boarded VNF package has been deleted.\n",
+  "description": "This type represents a VNF package management notification, which informs the receiver of a change of the status in an on-boarded VNF package. Only changes in the \"operationalState\" attribute of an on-boarded VNF package and the deletion of the VNF package will be reported. Change in the \"usageState\" and \"onboardingState\" attributes are not reported. The notification shall comply with the provisions defined in Table 9.5.2.9-1. The support of this notification is mandatory. The notification shall be triggered by the NFVO when there is a change in the status of an onboarded VNF package, as follows. The \"operationalState\" attribute of a VNF package has changed, and the \"onboardingState\" attribute of the package has the value \"ONBOARDED\". � The on-boarded VNF package has been deleted.\n",
   "type": "object",
   "required": [
     "id",
-- 
GitLab


From 4505bd1efc36aedd8d00b865082fb93085443469 Mon Sep 17 00:00:00 2001
From: Frank Bryden <Frank.Bryden@etsi.org>
Date: Mon, 24 Aug 2020 14:36:34 +0200
Subject: [PATCH 010/322] Added missing line in high-end logic. Small piece of
 logic missing in NSDManagKeywords

---
 SOL005/NSDManagement-API/IndividualNSDescriptor.robot | 1 +
 SOL005/NSDManagement-API/NSDManagementKeywords.robot  | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/SOL005/NSDManagement-API/IndividualNSDescriptor.robot b/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
index 47a1aa7a0..9fd77ae9b 100644
--- a/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
+++ b/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
@@ -66,6 +66,7 @@ Enable Individual Network Service Descriptor
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   NsdInfoModification
     Check Postcondition Network Service Descriptor is in operational state    ENABLED
+    Check PostCondition GET Individual Network Service Descriptor Information
     Check Postcondition Network Service Descriptor usage state is unmodified (Implicit)   
 
 Enable Individual Network Service Descriptor with conflict due to operational state ENABLED
diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index 35f2858e0..4172e6bed 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -1046,4 +1046,6 @@ Check PostCondition GET Individual Network Service Descriptor Information
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoId}
-    Should Be Equal As Strings     ${response['status']}    200
\ No newline at end of file
+    Should Be Equal As Strings     ${response['status']}    200
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
-- 
GitLab


From e0c1e808e7655ea0f1a74aacc99007e39a7515d3 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Mon, 31 Aug 2020 13:59:06 +0500
Subject: [PATCH 011/322] updated objective and fixed minor bugs

---
 .../ChangeExternalVNFConnectivityTask.robot         | 13 +++++++++++++
 .../ChangeVNFFlavourTask.robot                      |  2 +-
 SOL002/VNFLifecycleManagement-API/HealVNFTask.robot |  2 +-
 .../IndividualVnfLcmOperationOccurence.robot        |  6 +++---
 .../VNFLifecycleManagement-API/OperateVNFTask.robot |  4 ++--
 .../RetryOperationTask.robot                        |  8 ++++----
 .../ScaleVNFToLevelTask.robot                       |  3 +--
 .../TerminateVNFTask.robot                          |  4 ++--
 .../jsons/scaleVnfToLevelRequest.json               |  2 +-
 9 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot b/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
index 7e73154a7..54e8686ec 100644
--- a/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
@@ -68,6 +68,19 @@ DELETE Change external VNF connectivity - Method not implemented
     ...    Post-Conditions: none 
     DELETE Change External VNF Connectivity
     Check HTTP Response Status Code Is    405
+    
+POST Operate a vnfInstance Conflict (Not-Instantiated)
+    [Documentation]    Test ID: 6.3.5.10.6
+    ...    Test title: POST Operate a vnfInstance Conflict (Not-Instantiated)
+    ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set. 
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.11.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions:
+    POST Operate VNF
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is    ProblemDetails 
 
 *** Keywords ***
 Check resource existence
diff --git a/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot b/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
index a63561402..f70393324 100644
--- a/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
@@ -24,7 +24,7 @@ POST Change deployment flavour of a vnfInstance
 POST Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
     [Documentation]    Test ID: 6.3.5.6.2
     ...    Test title: POST Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
-    ...    Test objective: The objective is to test that POST method cannot trigger a change in VNF deployment flavour because of a conflict with the state of the VNF instance resource. 
+    ...    Test objective: The objective is to test that POST method cannot trigger a change in VNF deployment flavour because of a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set. 
     ...    Pre-conditions: VNF instance resource is not in NOT-INSTANTIATED state
     ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
     ...    Config ID: Config_prod_VE
diff --git a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
index b05b9eeea..724573a8e 100644
--- a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
@@ -25,7 +25,7 @@ POST Heal a vnfInstance Conflict (Not-Instantiated)
     # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
    [Documentation]    Test ID: 6.3.5.8.2
     ...    Test title: POST Heal a vnfInstance (Not-Instantiated)
-    ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
+    ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set. 
     ...    Pre-conditions: the VNF instance resource is in NOT-INSTANTIATED state
     ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
     ...    Config ID: Config_prod_VNFM
diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot b/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
index 6d7ab224d..f818c20e3 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
@@ -39,7 +39,7 @@ PUT status information about multiple VNF instances - Method not implemented
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
-    Put multiple VNF instances
+    PUT multiple vnfInstances
     Check HTTP Response Status Code Is    405
 
 PATCH status information about multiple VNF instances - Method not implemented 
@@ -51,7 +51,7 @@ PATCH status information about multiple VNF instances - Method not implemented
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none      
-    Patch multiple VNF instances
+    PATCH multiple vnfInstances
     Check HTTP Response Status Code Is    405
     
 DELETE status information about multiple VNF instances - Method not implemented 
@@ -63,5 +63,5 @@ DELETE status information about multiple VNF instances - Method not implemented
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
-    Delete multiple VNF instances
+    DELETE multiple vnfInstances
     Check HTTP Response Status Code Is    405
diff --git a/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
index 4e4c12817..5fed39874 100644
--- a/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
@@ -24,7 +24,7 @@ POST Operate a vnfInstance
 POST Operate a vnfInstance Conflict (Not-Instantiated)
     [Documentation]    Test ID: 6.3.5.9.2
     ...    Test title: POST Operate a vnfInstance Conflict (Not-Instantiated)
-    ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
+    ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set. 
     ...    Pre-conditions: the VNF instance resource is in NOT-INSTANTIATED state
     ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
     ...    Config ID: Config_prod_VE
@@ -45,7 +45,7 @@ POST Operate a vnfInstance Not Found
     ...    Applicability: none
     ...    Post-Conditions:
     POST Operate VNF
-    Check HTTP Response Status Code Is    409
+    Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails
    
 GET Operate VNFInstance - Method not implemented
diff --git a/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot b/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
index 3b85e5943..73415cd4e 100644
--- a/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
@@ -55,7 +55,7 @@ GET Retry operation task - Method not implemented
     ...    Test title: GET Retry operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.14.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.14.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -67,7 +67,7 @@ PUT Retry operation task - Method not implemented
     ...    Test title: PUT Retry operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.14.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.14.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -79,7 +79,7 @@ PATCH Retry operation task - Method not implemented
     ...    Test title: PATCH Retry operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.14.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.14.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -91,7 +91,7 @@ DELETE Retry operation task - Method not implemented
     ...    Test title: DELETE Retry operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.14.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.14.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: 
diff --git a/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
index 2964f9827..920eb313c 100644
--- a/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
@@ -21,10 +21,9 @@ POST Scale a vnfInstance to level
     Check Operation Occurrence Id
 
 POST Scale a vnfInstance to level Conflict (Not-Instantiated)
-    # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
     [Documentation]    Test ID: 6.3.5.5.2
     ...    Test title: POST Scale a vnfInstance to level Conflict (Not-Instantiated)
-    ...    Test objective: The objective is to verify that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
+    ...    Test objective: The objective is to verify that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set. 
     ...    Pre-conditions: VNF instance resource is in NOT-INSTANTIATED state
     ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
     ...    Config ID: Config_prod_VE
diff --git a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
index 96c9eb0e5..62f4f8f10 100644
--- a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
@@ -24,14 +24,14 @@ POST Terminate a vnfInstance
 POST Terminate a vnfInstance Conflict (Not-Instantiated)
     [Documentation]    Test ID: 6.3.5.7.2
     ...    Test title: POST Terminate a vnfInstance Conflict (Not-Instantiated)
-    ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
+    ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set.  
     ...    Pre-conditions:  VNF instance resource is in NOT-INSTANTIATED state
     ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: 
     POST Terminate VNF  
-    Check HTTP Response Status Code Is    202
+    Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
        
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/scaleVnfToLevelRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/scaleVnfToLevelRequest.json
index 1c39a7bb5..eeccec1d2 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/scaleVnfToLevelRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/scaleVnfToLevelRequest.json
@@ -1,3 +1,3 @@
 {
-  "instantiationLevelId": "myNextLevel"
+  "newFlavourId" : ""
 }
\ No newline at end of file
-- 
GitLab


From 05e93ed6430955a9085dfc843c7080e769bf9de4 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Mon, 31 Aug 2020 14:37:53 +0500
Subject: [PATCH 012/322] callbackUri attributed added

---
 .../VNFPerformanceManagement-API/jsons/CreatePmJobRequest.json | 3 ++-
 .../jsons/CreateThresholdRequest.json                          | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/SOL002/VNFPerformanceManagement-API/jsons/CreatePmJobRequest.json b/SOL002/VNFPerformanceManagement-API/jsons/CreatePmJobRequest.json
index 6a21ba34f..1f34fa20d 100644
--- a/SOL002/VNFPerformanceManagement-API/jsons/CreatePmJobRequest.json
+++ b/SOL002/VNFPerformanceManagement-API/jsons/CreatePmJobRequest.json
@@ -5,5 +5,6 @@
 		"performanceMetricGroup": [],
 		"collectionPeriod": 10,
 		"reportingPeriod": 30
-	}
+	},
+	"callbackuri": "127.0.0.1"
 }
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/jsons/CreateThresholdRequest.json b/SOL002/VNFPerformanceManagement-API/jsons/CreateThresholdRequest.json
index 1e58c2bac..c42c3773f 100644
--- a/SOL002/VNFPerformanceManagement-API/jsons/CreateThresholdRequest.json
+++ b/SOL002/VNFPerformanceManagement-API/jsons/CreateThresholdRequest.json
@@ -8,5 +8,6 @@
 			"hysteresis": 50
 		}
 		
-	}
+	},
+	"callbackuri": "127.0.0.1"
 }
\ No newline at end of file
-- 
GitLab


From 7ced1ad5e9f2da04f09c2567c236e64434cbf64a Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Mon, 31 Aug 2020 16:19:34 +0500
Subject: [PATCH 013/322] fix TD ids

---
 SOL003/VNFFaultManagement-API/Subscriptions.robot | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/SOL003/VNFFaultManagement-API/Subscriptions.robot b/SOL003/VNFFaultManagement-API/Subscriptions.robot
index 4063c36f4..1d1f3d25b 100644
--- a/SOL003/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL003/VNFFaultManagement-API/Subscriptions.robot
@@ -207,7 +207,7 @@ GET subscriptions - Bad Request Response too Big
     Check HTTP Response Body Json Schema Is    ProblemDetails
     
 GET Subscription with attribute-based filter "id"
-    [Documentation]    Test ID: 6.3.4.4.16
+    [Documentation]    Test ID: 7.3.5.3.16
     ...    Test title: GET Subscription with attribute-based filter "id"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "id"
     ...    Pre-conditions: 
@@ -221,7 +221,7 @@ GET Subscription with attribute-based filter "id"
     Check PostCondition HTTP Response Body Subscription Matches the requested attribute-based filter "id"
 
 Get subscriptions with filter "filter.notificationTypes"
-    [Documentation]    Test ID: 6.3.4.4.17
+    [Documentation]    Test ID: 7.3.5.3.17
     ...    Test title: GET Subscription with attribute-based filter "filter.notificationTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.notificationTypes"
     ...    Pre-conditions: 
@@ -235,7 +235,7 @@ Get subscriptions with filter "filter.notificationTypes"
     Check PostCondition HTTP Response Body Subscriptions Matches the requested attribute-based filter "filter_notificationTypes"
     
 Get subscriptions with filter "filter.faultyResourceTypes"
-    [Documentation]    Test ID: 6.3.4.4.18
+    [Documentation]    Test ID: 7.3.5.3.18
     ...    Test title: GET Subscription with attribute-based filter "filter.faultyResourceTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.faultyResourceTypes"
     ...    Pre-conditions: 
@@ -249,7 +249,7 @@ Get subscriptions with filter "filter.faultyResourceTypes"
     Check PostCondition HTTP Response Body Subscriptions Matches the requested attribute-based filter "filter_faultyResourceTypes"
     
 Get subscriptions with filter "filter.perceivedSeverities"
-    [Documentation]    Test ID: 6.3.4.4.19
+    [Documentation]    Test ID: 7.3.5.3.19
     ...    Test title: GET Subscription with attribute-based filter "filter.perceivedSeverities"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.perceivedSeverities"
     ...    Pre-conditions: 
@@ -263,7 +263,7 @@ Get subscriptions with filter "filter.perceivedSeverities"
     Check PostCondition HTTP Response Body Subscriptions Matches the requested attribute-based filter "filter_perceivedSeverities"
     
 Get subscriptions with filter "filter.eventTypes"
-    [Documentation]    Test ID: 6.3.4.4.20
+    [Documentation]    Test ID: 7.3.5.3.20
     ...    Test title: GET Subscription with attribute-based filter "filter.eventTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.eventTypes"
     ...    Pre-conditions: 
@@ -277,7 +277,7 @@ Get subscriptions with filter "filter.eventTypes"
     Check PostCondition HTTP Response Body Subscriptions Matches the requested attribute-based filter "filter_eventTypes"
     
 Get subscriptions with filter "filter.probableCauses"
-    [Documentation]    Test ID: 6.3.4.4.21
+    [Documentation]    Test ID: 7.3.5.3.21
     ...    Test title: GET Subscription with attribute-based filter "filter.probableCauses"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.probableCauses"
     ...    Pre-conditions: 
-- 
GitLab


From 65e7d8653208b49d65e03b7659fcd6e5e8853454 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 1 Sep 2020 09:46:58 +0500
Subject: [PATCH 014/322] new test cases added for Subscriptions

---
 .../Subscriptions.robot                       | 41 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
index 14c92a2ce..a2b2e6303 100644
--- a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
+++ b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
@@ -172,4 +172,43 @@ DELETE subscriptions - Method not implemented
     DELETE subscriptions
 	Check HTTP Response Status Code Is    405
 	Check Subscription resource exist
-    
\ No newline at end of file
+    
+POST Create a new Subscription - Unprocessable Entity
+    [Documentation]    Test ID: 6.3.5.17.14
+    ...    Test title: POST Create a new Subscription - Unprocessable Entity
+    ...    Test objective: The objective is to test that content type of the payload body is supported and the payload body of a request contains syntactically correct data but the data cannot be processed.
+    ...    re-conditions: none
+    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Post Create subscription
+    Check HTTP Response Status Code Is    422
+    Check HTTP Response Body Json Schema Is  ProblemDetails
+    
+GET information about multiple subscriptions to get Paged Response
+    [Documentation]    Test ID: 6.3.5.17.15
+    ...    Test title: GET information about multiple subscriptions to get Paged Response
+    ...    Test objective: The objective is to retrieve information about the subscriptions to get paged response
+    ...    Pre-conditions: 
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: 
+    ...    Post-Conditions:  
+    Get subscriptions
+    Check HTTP Response Status Code Is    200
+    Check LINK in Header 
+    
+GET information about multiple subscriptions for Bad Request Response too big
+    [Documentation]    Test ID: 6.3.5.17.16
+    ...    Test title: GET information about multiple subscriptions for Bad Request Response too big
+    ...    Test objective: The objective is to test that GET method fail retrieving status information about subscriptions when Response is too big, and perform the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: 
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: 
+    ...    Post-Conditions: 
+    Get subscriptions
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+
-- 
GitLab


From b795b06bbe53c96199d3938720cdb2648ea20c87 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 1 Sep 2020 13:02:29 +0500
Subject: [PATCH 015/322] new test cases added for IndividualPmJob

---
 .../IndividualPmJob.robot                     | 50 +++++++++++++------
 .../jsons/PMJobModification.json              |  3 ++
 2 files changed, 37 insertions(+), 16 deletions(-)
 create mode 100644 SOL002/VNFPerformanceManagement-API/jsons/PMJobModification.json

diff --git a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
index 5c49a39fe..529441010 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
@@ -1,9 +1,12 @@
 *** Settings ***
-Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt    # Generic Parameters
-Library           JSONLibrary
-Resource          environment/IndividualPmJob.txt
-Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
+Library     JSONSchemaLibrary    schemas/
+Resource    environment/variables.txt    # Generic Parameters
+Library     JSONLibrary
+Resource    environment/IndividualPmJob.txt
+Library     REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
+Library     OperatingSystem
+Library     DependencyLibrary
+
 
 *** Test Cases ***
 GET individual VNF Performance Job
@@ -77,7 +80,7 @@ PUT Individual VNF Performance Job - Method not implemented
     ...    Test title: PUT Individual VNF Performance Job - method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF Performance Monitoring Job
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Job is not modified by the operation
@@ -85,19 +88,33 @@ PUT Individual VNF Performance Job - Method not implemented
     Check HTTP Response Status Code Is    405
     Check Postcondition VNF Performance Job is Unmodified (Implicit)
 
-PATCH Individual VNF Performance Job - Method not implemented
+PATCH Individual VNF Performance Job
     [Documentation]    Test ID: 6.3.3.2.7
-    ...    Test title: PATCH Individual VNF Performance Job - method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing new VNF Performance Monitoring Job
+    ...    Test title: PATCH Individual VNF Performance Job
+    ...    Test objective: The objective is to test that PATCH method allows to modify an exsisting individual PM job resource.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
     ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Performance Job is not modified by the operation
+    ...    Post-Conditions: 
     Send Patch request for individual VNF Performance Job
-    Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Performance Job is Unmodified (Implicit)
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    PMJobModification
     
+PATCH Individual VNF Performance Job - Precondition failed
+    [Documentation]    Test ID: 6.3.3.2.8
+    ...    Test title: PATCH Individual VNF Performance Job - Precondition failed
+    ...    Test objective: The objective is to attempt to Modify an individual alarm resource, where the precondition was not met
+    ...    Pre-conditions:  A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions:  The VNF Performance Job is not modified by the operation
+    Send Patch request for individual VNF Performance Job
+    Check HTTP Response Status Code Is    412
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    Check Postcondition VNF Performance Job is Unmodified (Implicit)
+
 *** Keywords ***
 GET individual VNF Performance Job
     Log    Trying to get a Pm Job present in the NFVO Catalogue
@@ -151,10 +168,11 @@ Send Put request for individual VNF Performance Job
     Set Suite Variable    ${response}    ${output}
     
 Send Patch request for individual VNF Performance Job    
-    Log    Trying to perform a PATCH (method should not be implemented)
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+    Set Headers  {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${body}=    Get File    jsons/PMJobModification.json
+    PATCH    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}     ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
diff --git a/SOL002/VNFPerformanceManagement-API/jsons/PMJobModification.json b/SOL002/VNFPerformanceManagement-API/jsons/PMJobModification.json
new file mode 100644
index 000000000..3aeb5f91c
--- /dev/null
+++ b/SOL002/VNFPerformanceManagement-API/jsons/PMJobModification.json
@@ -0,0 +1,3 @@
+{
+	"callbackUri":"127.0.0.1"
+}
\ No newline at end of file
-- 
GitLab


From 92780b73d90fa6ff5f7520477f483bd503cef2e4 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 1 Sep 2020 13:09:25 +0500
Subject: [PATCH 016/322] new test cases added for IndividualThreshold

---
 .../IndividualThreshold.robot                 | 32 +++++++++++++------
 .../jsons/ThresholdModification.json          |  3 ++
 2 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 SOL002/VNFPerformanceManagement-API/jsons/ThresholdModification.json

diff --git a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
index 1a68cdce9..702b3f80e 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -84,17 +84,32 @@ PUT Individual Threshold - Method not implemented
     Check HTTP Response Status Code Is    405
     Check Postcondition VNF Performance Threshold is Unmodified (Implicit)
 
-PATCH Individual Threshold - Method not implemented
+PATCH Individual Threshold 
     [Documentation]    Test ID: 6.3.3.5.7
-    ...    Test title: PATCH Individual Threshold - Method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing VNF Performance threshold
+    ...    Test title: PATCH Individual Threshold 
+    ...    Test objective: The objective is to test that PATCH method allows to modify an Individual threshold resource.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
     ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Threshold is not modified by the operation
     Send Patch request for individual VNF Performance Threshold
-    Check HTTP Response Status Code Is    405
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    ThresholdModification
+    
+    
+PATCH Individual Threshold - Precondition failed
+    [Documentation]    Test ID: 6.3.3.5.8
+    ...    Test title: PATCH Individual Threshold - Preconition failed
+    ...    Test objective: The objective is to attempt to modify an individual threshold resource, where the precondition was not met.
+    ...    Pre-conditions:  A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
+    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions:  The VNF Performance Job is not modified by the operation
+    Send Patch request for individual VNF Performance Threshold
+    Check HTTP Response Status Code Is    412
+    Check HTTP Response Body Json Schema Is   ProblemDetails
     Check Postcondition VNF Performance Threshold is Unmodified (Implicit)
 
 *** Keywords ***
@@ -148,11 +163,10 @@ Send Put request for individual VNF Performance Threshold
 
 Send Patch request for individual VNF Performance Threshold
     Log    Trying to PUT threshold
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
-    ${origOutput}=    Output    response
-    Set Suite Variable    ${origResponse}    ${origOutput}
+    Set Headers  {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${body}=    Get File    jsons/ThresholdModification.json
     PATCH    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL002/VNFPerformanceManagement-API/jsons/ThresholdModification.json b/SOL002/VNFPerformanceManagement-API/jsons/ThresholdModification.json
new file mode 100644
index 000000000..3aeb5f91c
--- /dev/null
+++ b/SOL002/VNFPerformanceManagement-API/jsons/ThresholdModification.json
@@ -0,0 +1,3 @@
+{
+	"callbackUri":"127.0.0.1"
+}
\ No newline at end of file
-- 
GitLab


From fb67b6963aaa4906b0aa875753177bfddf75a3f2 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 1 Sep 2020 16:03:26 +0500
Subject: [PATCH 017/322] Updated pre-conditoin and post-condition of different
 LCM operations

---
 SOL005/NSLifecycleManagement-API/HealNSTask.robot  | 14 +++++++-------
 .../InstantiateNSTask.robot                        |  2 +-
 SOL005/NSLifecycleManagement-API/ScaleNSTask.robot | 12 ++++++------
 .../TerminateNSTask.robot                          |  4 ++--
 .../NSLifecycleManagement-API/UpdateNSTask.robot   | 12 ++++++------
 5 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/SOL005/NSLifecycleManagement-API/HealNSTask.robot b/SOL005/NSLifecycleManagement-API/HealNSTask.robot
index 379ed397b..dc237b439 100644
--- a/SOL005/NSLifecycleManagement-API/HealNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/HealNSTask.robot
@@ -12,24 +12,24 @@ POST Heal a NSInstance
     [Documentation]    Test ID: 5.3.2.6.1
     ...    Test title: POST Heal a NSInstance
     ...    Test objective: The objective is to test that POST method trigger a Heal NS instance
-    ...    Pre-conditions: resource status is not in NOT_INSTANTIATED state
+    ...    Pre-conditions: NS Instance is in INSTANTIATED state.
     ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: none
+    ...    Post-Conditions: NS instance is still in INSTANTIATED state.
     POST Heal NSInstance
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location
 
-POST Heal a NSInstance Conflict
+POST Heal a NSInstance - Conflict (Not Instantited)
     [Documentation]    Test ID: 5.3.2.6.2
-    ...    Test title: POST Heal a NSInstance Conflict
-    ...    Test objective: The objective is to test that POST method fail if NS instance is not in NOT_INSTANTIATE state 
-    ...    Pre-conditions: resource status is in NOT_INSTANTIATED state
+    ...    Test title: POST Heal a NSInstance - Conflict (Not Instantited)
+    ...    Test objective: The objective is to test that POST method fail if NS instance is in NOT_INSTANTIATE state 
+    ...    Pre-conditions: NS Instance is in NOT_INSTANTIATED state
     ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: none
+    ...    Post-Conditions: NS Instance is still in NOT_INSTANTIATED state
     POST Heal NSInstance
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
diff --git a/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot b/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot
index 0fa8de84e..ae0178684 100644
--- a/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot
@@ -12,7 +12,7 @@ POST Instantiate a nsInstance
     [Documentation]    Test ID: 5.3.2.3.1
     ...    Test title: POST Instantiate a nsInstance
     ...    Test objective: The objective is to test that POST method instantiate a new NS instance
-    ...    Pre-conditions: none
+    ...    Pre-conditions: An NS instance created and it is in NOT_INSTANTIATED state
     ...    Reference: Clause 6.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
diff --git a/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot b/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot
index 034f7af8e..8343fa87b 100644
--- a/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot
@@ -12,21 +12,21 @@ POST Scale a nsInstance
     [Documentation]    Test ID: 5.3.2.4.1
     ...    Test title: POST Scale a nsInstance
     ...    Test objective: The objective is to test that POST method scales NS instance
-    ...    Pre-conditions: the resource is in NOT_INSTANTIATED state
+    ...    Pre-conditions: NS instance is INSTANTIATED state
     ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: none
+    ...    Post-Conditions: NS instance is INSTANTIATED state and NS has been scaled
     POST scale nsInstance
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location
     Check resource existence
     
-POST Instantiate a nsInstance Conflict
+POST Scale a nsInstance - Conflict (Not Instantited)
     [Documentation]    Test ID: 5.3.2.4.2
-    ...    Test title: POST Instantiate a nsInstance Conflict
-    ...    Test objective: The objective is to test that POST method cannot scale NS instance because of conflict in resource status (i.e. because the resource is in not in NOT_INSTANTIATED state)
-    ...    Pre-conditions: the resource is in not in NOT_INSTANTIATED state
+    ...    Test title: POST Scale a nsInstance - Conflict (Not Instantited)
+    ...    Test objective: The objective is to test that POST method cannot scale NS instance because of conflict in resource status (i.e. because the resource is in  NOT_INSTANTIATED state)
+    ...    Pre-conditions: NS instance is in NOT_INSTANTIATED state.
     ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
diff --git a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
index 9e9870149..f04165ec2 100644
--- a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
@@ -21,9 +21,9 @@ POST Terminate a NSInstance
     Check HTTP Response Header Contains    Location
     Check resource not_instantiated
     
-POST Terminate a NSInstance Conflict
+POST Terminate a NSInstance - Conflict (Not Instantited)
     [Documentation]    Test ID: 5.3.2.7.2
-    ...    Test title: POST Terminate a NSInstance Conflict
+    ...    Test title: POST Terminate a NSInstance - Conflict (Not Instantited)
     ...    Test objective: The objective is to test that POST method cannot terminate the NS because of conflict in resource status (i.e. the resource is not in INSTANTIATED state) 
     ...    Pre-conditions: NS instance is in NOT_INSTANTIATED state
     ...    Reference: Clause 6.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
diff --git a/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot b/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot
index b0f3f3569..bd9ebc651 100644
--- a/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot
@@ -12,20 +12,20 @@ POST Update a NSInstance
     [Documentation]    Test ID: 5.3.2.5.1
     ...    Test title: POST Update a NSInstance
     ...    Test objective: The objective is to test that POST method update a NS instance
-    ...    Pre-conditions: an existing NS Instance 
+    ...    Pre-conditions: An NS instance is in INSTANTIATED state
     ...    Reference: Clause 6.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The  NS instance is updated on the NFVO
+    ...    Post-Conditions: The NS instance is still INSTANTIATED and updated on the NFVO
     POST Update NSInstance
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location
 
-POST Update a NSInstance Conflict
+POST Update a NSInstance - Conflict (Not Instantited)
     [Documentation]    Test ID: 5.3.2.5.2
-    ...    Test title: POST Update a NSInstance Conflict
-    ...    Test objective: The objective is to test that POST method fail if a NS Instance is not existing or is not in NOT_INSTANTIATED state
-    ...    Pre-conditions: an existing NS  Instance 
+    ...    Test title: POST Update a NSInstance - Conflict (Not Instantited)
+    ...    Test objective: The objective is to test that POST method fail if a NS Instance is not existing or is in NOT_INSTANTIATED state
+    ...    Pre-conditions: An NS instance is in INSTANTIATED state 
     ...    Reference: Clause 6.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-- 
GitLab


From 060176568a2d702022b0f53e47690d84dc0f4dcc Mon Sep 17 00:00:00 2001
From: Frank Bryden <Frank.Bryden@etsi.org>
Date: Tue, 1 Sep 2020 15:58:45 +0200
Subject: [PATCH 018/322] Fixes to various tests

Signed-off-by: Frank Bryden <Frank.Bryden@etsi.org>
---
 .../VNFPackageManagementKeywords.robot        |  3 +-
 .../NotificationEndpoint.robot                |  9 ++--
 .../CreateNSInstanceWorkflow.robot            |  4 +-
 .../DeleteNSInstanceWorkflow.robot            |  1 -
 .../NSLCMOperationKeywords.robot              | 42 ++++++++++++-------
 .../NotificationEndpoint.robot                | 12 ++++--
 .../jsons/InstantiateNs.json                  |  4 +-
 .../NSPerformanceManagementKeywords.robot     | 13 +++---
 .../Notifications.robot                       |  6 ++-
 .../IndividualVNFPackage.robot                |  2 +-
 .../Notifications.robot                       |  7 +++-
 .../VNFPackageManagementKeywords.robot        |  8 ++--
 12 files changed, 69 insertions(+), 42 deletions(-)

diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 18bd70bcf..90d2c306c 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -522,8 +522,7 @@ Send DELETE Request for VNFD in individual VNF Package
 
 Check Postcondition VNFD Exist
     Log    Checking that vnf pacakge still exists
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}, ${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
     Check HTTP Response Status Code Is    200
diff --git a/SOL005/NSFaultManagement-API/NotificationEndpoint.robot b/SOL005/NSFaultManagement-API/NotificationEndpoint.robot
index 650bb2a7a..5c97d192a 100644
--- a/SOL005/NSFaultManagement-API/NotificationEndpoint.robot
+++ b/SOL005/NSFaultManagement-API/NotificationEndpoint.robot
@@ -115,7 +115,8 @@ Configure Notification Alarm List Rebuilt Handler
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
     &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{headers} =	Create Dictionary	Content-Type=application/json
+    &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Configure Notification Alarm Handler
@@ -125,7 +126,8 @@ Configure Notification Alarm Handler
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
     &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{headers} =	Create Dictionary	Content-Type=application/json
+    &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Configure Notification Alarm Cleareance Handler
@@ -135,7 +137,8 @@ Configure Notification Alarm Cleareance Handler
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
     &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{headers} =	Create Dictionary	Content-Type=application/json
+    &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
   
 Configure Notification Forward
diff --git a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
index ae2915934..7a9e9e2e1 100644
--- a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
@@ -21,8 +21,8 @@ NS Instance Creation
     POST New nsInstance
     Check HTTP Response Status Code Is    201
     Check HTTP Response Header Contains    Location
-    Check HTTP Response Body Json Schema Is    NsIdentifierCreationNotification
-    Check resource not_instantiated
+    Check HTTP Response Body Json Schema Is    NsInstance
+    Check resource not_instantiated    1
     
 NS Instance Creation with DISABLED nsd
     [Documentation]    Test ID: 5.3.2.18.2
diff --git a/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot b/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
index fe061b727..915e8e041 100644
--- a/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
@@ -19,5 +19,4 @@ NS Instance Deletion
     Check resource not_instantiated
     DELETE IndividualNSInstance
     Check HTTP Response Status Code Is    204
-    Check HTTP Response Body Json Schema Is    NsIdentifierDeletionNotification
     Check Instance Deleted
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index 49c77d238..30952bc57 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -16,8 +16,7 @@ Initialize System
     Create Mock Session  ${callback_uri}:${callback_port} 
     
 Check Operation Occurrence Id
-    ${occid}=    Get Value From Json    ${response['headers']['Location']}  ${response}
-    Set Global Variable    @{nsLcmOpOccId}    ${occid}
+    Set Global Variable    @{nsLcmOpOccId}    ${response['headers']['Location']}
     Should Not Be Empty    ${nsLcmOpOccId}
     
 Create Sessions
@@ -84,6 +83,8 @@ Check Operation Notification
     ${json}=	Get File	schemas/${element}.schema.json
     Configure Notification Forward    ${element}    ${callback_endpoint}    ${callback_endpoint_fwd}
     Configure Notification Status Handler    ${callback_endpoint_fwd}    ${status}
+    ${BODY}=    evaluate    json.dumps(${json})    json
+    &{notification_request}=  Create Mock Request Matcher	POST  ${callback_endpoint}  body_type="JSON"    body=${BODY}
     Wait Until Keyword Succeeds    2 min   10 sec   Verify Mock Expectation    ${notification_request}
     Clear Requests    ${callback_endpoint}
     Clear Requests    ${callback_endpoint_fwd}
@@ -98,29 +99,40 @@ Configure Notification Forward
     
 Configure Notification Status Handler
     [Arguments]    ${endpoint}    ${status}=""
-    Run Keyword If   ${status}!=""  set to dictionary    ${json["notificationStatus"]}    dp=${status}    
+    ${json}=    evaluate    {"notificationStatus": {}}
+    Run Keyword If   '${status}' != ""  set to dictionary    ${json["notificationStatus"]}    dp=${status}    
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle ${endpoint}
     &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{headers} =	Create Dictionary	"Content-Type"="application/json"
+    &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}    
         
 Check resource operationState is
     [Arguments]    ${state} 
     String    ${response['body']['operationState']}   ${state}
-    
-Check resource instantiated
+
+Check resource Instantiated
+    Wait Until Keyword Succeeds    2 min   10 sec   Probe resource Instantiated
+
+Probe resource Instantiated 
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId} 
     String    response body nsState    INSTANTIATED
-    
+
 Check resource not_instantiated
+    Wait Until Keyword Succeeds    2 min   10 sec   Probe resource not_instantiated
+
+Probe resource not_instantiated
+    [Arguments]  ${fresh_resource}=0
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId} 
+    Log     ${fresh_resource}
+    ${instanceId}=  Set Variable If	    ${fresh_resource} == 0   ${nsInstanceId}   ${response['body']['id']}
+    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${instanceId}
     String    response body nsState     NOT_INSTANTIATED
 
 Check operation resource state is FAILED_TEMP    
@@ -165,7 +177,7 @@ Check Postcondition NS Instance is not created
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nonExistentNsId} 
     Integer    response status    404
     
 Check HTTP Response Status Code Is
@@ -178,7 +190,7 @@ Check Postcondition NS Instance is deleted
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${disabledNsdId} 
     Integer    response status    404
     
 Check Postcondition NS Instance is not modified
@@ -323,7 +335,7 @@ POST IndividualNSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}
+    Post    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nonExistentNsId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
@@ -412,7 +424,7 @@ GET Instantiate NSInstance
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/InstantiateNs.json
-    ${body}=        Format String   ${template}     nsFlavourId=${nsFlavourId}
+    ${body}=        Format String   ${template}     nsFlavourId=${nsFlavourId}   vimAccountId=${vimAccountId}   nsdId=${nsdId}
     Post    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/instantiate    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -935,7 +947,7 @@ POST subscriptions
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/LccnSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callbackUri=${callback_uri}   callbackEndpoint=${callback_endpoint}
+    ${body}=        Format String   ${template}     callbackUri=${callback_uri}   callbackEndpoint=${callback_endpoint}   callbackPort=${callback_port}   nsdId=${nsdId}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}    
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -947,7 +959,7 @@ POST subscriptions DUPLICATION
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/LccnSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callbackUri=${callback_uri}   callbackEndpoint=${callback_endpoint}
+    ${body}=        Format String   ${template}     callbackUri=${callback_uri}   callbackEndpoint=${callback_endpoint}   callbackPort=${callback_port}     nsdId=${nsdId}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}    
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -959,7 +971,7 @@ POST subscriptions NO DUPLICATION
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/LccnSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callbackUri=${callback_uri}   callbackEndpoint=${callback_endpoint}
+    ${body}=        Format String   ${template}     callbackUri=${callback_uri}   callbackEndpoint=${callback_endpoint}   callbackPort=${callback_port}     nsdId=${nsdId}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}    
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
diff --git a/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot b/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot
index 628bbdf57..e17087e22 100644
--- a/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot
+++ b/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot
@@ -98,7 +98,8 @@ Configure Notification NS LCM Operation Occurrence Start Handler
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
     &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{headers}=  Create Dictionary  Content-Type=application/json
+    &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Check NS LCM Operation Occurrence Result Notification Http POST Request Body Json Schema Is  
@@ -120,7 +121,8 @@ Configure Notification NS LCM Operation Occurrence Result Handler
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
     &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{headers}=  Create Dictionary  Content-Type=application/json
+    &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Check NS Identifier Creation Notification Http POST Request Body Json Schema Is  
@@ -142,7 +144,8 @@ Configure Notification NS Identifier Creation Handler
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
     &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{headers}=  Create Dictionary  Content-Type=application/json
+    &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
     
 Check NS Identifier Deletion Notification Http POST Request Body Json Schema Is  
@@ -164,7 +167,8 @@ Configure Notification NS Identifier Deletion Handler
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
     &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{headers}=  Create Dictionary  Content-Type=application/json
+    &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Check NS LCM Operation Occurrence Start Notification Http POST Request Body notificationStatus attribute Is
diff --git a/SOL005/NSLifecycleManagement-API/jsons/InstantiateNs.json b/SOL005/NSLifecycleManagement-API/jsons/InstantiateNs.json
index 60eee0859..cd352b53a 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/InstantiateNs.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/InstantiateNs.json
@@ -1,3 +1,5 @@
 {{
-    "nsFlavourId": {nsFlavourId}
+    "nsdId": "{nsdId}",
+    "nsName": "postmanNS",
+    "vimAccountId": "{vimAccountId}"
 }}
\ No newline at end of file
diff --git a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
index 48a306e04..fcf0c3523 100644
--- a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
+++ b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
@@ -352,7 +352,7 @@ GET all Performance Thresholds
 GET Performance Thresholds with attribute-based filter
     Log    Trying to get thresholds present in the NFVO with filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds?${FILTER_OK_Threshold}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -739,13 +739,13 @@ Send Delete request for individual NS Performance Subscription with invalid reso
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual NS Performance Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${newSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for individual NS Performance Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -754,7 +754,7 @@ Send Put request for individual NS Performance Subscription
     Set Suite Variable    ${response}    ${output}
     
 Send Patch request for individual NS Performance Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -798,8 +798,9 @@ Create Sessions
     
     
 Check Notification Endpoint
-    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}    
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{headers} =	Create Dictionary	Content-Type=application/json  
+    &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
     Wait Until Keyword Succeeds    ${total_polling_time}   ${polling_interval}   Verify Mock Expectation    ${notification_request}
     Clear Requests  ${callback_endpoint}
diff --git a/SOL005/NSPerformanceManagement-API/Notifications.robot b/SOL005/NSPerformanceManagement-API/Notifications.robot
index fcc032436..a24cbc2a7 100644
--- a/SOL005/NSPerformanceManagement-API/Notifications.robot
+++ b/SOL005/NSPerformanceManagement-API/Notifications.robot
@@ -87,7 +87,8 @@ Configure Notification Performance Information Available Handler
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
     &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{headers} =	Create Dictionary	Content-Type=application/json
+    &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Configure Notification Threshold Crossed Handler
@@ -97,7 +98,8 @@ Configure Notification Threshold Crossed Handler
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
     &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{headers} =	Create Dictionary	Content-Type=application/json
+    &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
   
 Configure Notification Forward
diff --git a/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot b/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot
index 8e8d887c0..bf7219775 100644
--- a/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot
+++ b/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot
@@ -121,7 +121,7 @@ DELETE Individual VNF Package
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package is not available anymore in the NFVO 
     Send DELETE Request for individual VNF Package
-    Check HTTP Response Status Code Is    405
+    Check HTTP Response Status Code Is    204
     Check Postcondition VNF Package is Deleted
 
 DELETE Individual VNF Package in operational state ENABLED
diff --git a/SOL005/VNFPackageManagement-API/Notifications.robot b/SOL005/VNFPackageManagement-API/Notifications.robot
index fefa8c79b..a83952742 100644
--- a/SOL005/VNFPackageManagement-API/Notifications.robot
+++ b/SOL005/VNFPackageManagement-API/Notifications.robot
@@ -119,8 +119,10 @@ Configure Notification Onboarding Handler
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
     &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{headers} =	Create Dictionary	Content-Type=application/json
+    &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
+    Set Suite Variable       ${notification_request}  ${notification_request}
 
 Configure Notification Delete Handler
     [Arguments]    ${endpoint}    ${type}    ${change}
@@ -129,7 +131,8 @@ Configure Notification Delete Handler
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
     &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{headers} =	Create Dictionary	Content-Type=application/json
+    &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Configure Notification Change Status Handler
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 1cbd72922..d715bcb23 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -420,10 +420,11 @@ Send DELETE Request for VNFD in individual VNF Package
 
 Check Postcondition VNFD Exist
     Log    Checking that vnf pacakge still exists
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}, ${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
     Check HTTP Response Status Code Is    200
 
 GET Individual VNF Package Content  
@@ -929,7 +930,8 @@ Check HTTP Response Body Subscription Identifier matches the requested Subscript
 
 Check Notification Endpoint
     &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}    
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{headers} =	Create Dictionary	Content-Type=application/json
+    &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
     Wait Until Keyword Succeeds    ${total_polling_time}   ${polling_interval}   Verify Mock Expectation    ${notification_request}
     Clear Requests  ${callback_endpoint}
-- 
GitLab


From 2ffbdb4151a53c880164952736ae5c96d39253ab Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 2 Sep 2020 09:06:50 +0500
Subject: [PATCH 019/322] schemas PMJobModifications and ThresholdModification
 added

---
 .../IndividualPmJob.robot                     |  2 +-
 .../IndividualThreshold.robot                 |  2 +-
 .../schemas/PMJobModifications.json           | 62 +++++++++++++++++++
 .../schemas/ThresholdModifications.json       | 62 +++++++++++++++++++
 4 files changed, 126 insertions(+), 2 deletions(-)
 create mode 100644 SOL002/VNFPerformanceManagement-API/schemas/PMJobModifications.json
 create mode 100644 SOL002/VNFPerformanceManagement-API/schemas/ThresholdModifications.json

diff --git a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
index 529441010..3729a715b 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
@@ -99,7 +99,7 @@ PATCH Individual VNF Performance Job
     ...    Post-Conditions: 
     Send Patch request for individual VNF Performance Job
     Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    PMJobModification
+    Check HTTP Response Body Json Schema Is    PMJobModifications
     
 PATCH Individual VNF Performance Job - Precondition failed
     [Documentation]    Test ID: 6.3.3.2.8
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
index 702b3f80e..9bb807520 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -95,7 +95,7 @@ PATCH Individual Threshold
     ...    Post-Conditions: The VNF Performance Threshold is not modified by the operation
     Send Patch request for individual VNF Performance Threshold
     Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    ThresholdModification
+    Check HTTP Response Body Json Schema Is    ThresholdModifications
     
     
 PATCH Individual Threshold - Precondition failed
diff --git a/SOL002/VNFPerformanceManagement-API/schemas/PMJobModifications.json b/SOL002/VNFPerformanceManagement-API/schemas/PMJobModifications.json
new file mode 100644
index 000000000..7a0962056
--- /dev/null
+++ b/SOL002/VNFPerformanceManagement-API/schemas/PMJobModifications.json
@@ -0,0 +1,62 @@
+ {
+    "description": "This type represents modifications to a PM job. It shall comply with the provisions defined in table 6.5.2.12-1.\n",
+    "type": "object",
+    "properties": {
+      "callbackUri": {
+        "description": "String formatted according to IETF RFC 3986.\n",
+        "type": "string"
+      },
+      "authentication": {
+        "type": "object",
+        "required": [
+          "authType"
+        ],
+        "properties": {
+          "authType": {
+            "description": "Defines the types of Authentication / Authorization which the API consumer is willing to accept when receiving a notification. Permitted values: * BASIC: In every HTTP request to the notification endpoint, use\n  HTTP Basic authentication with the client credentials. \n* OAUTH2_CLIENT_CREDENTIALS: In every HTTP request to the\n  notification endpoint, use an OAuth 2.0 Bearer token, obtained\n  using the client credentials grant type.\n* TLS_CERT: Every HTTP request to the notification endpoint is sent\n  over a mutually authenticated TLS session, i.e. not only the\n  server is authenticated, but also the client is authenticated\n  during the TLS tunnel setup.\n",
+            "type": "array",
+            "items": {
+              "type": "string",
+              "enum": [
+                "BASIC",
+                "OAUTH2_CLIENT_CREDENTIALS",
+                "TLS_CERT"
+              ]
+            }
+          },
+          "paramsBasic": {
+            "description": "Parameters for authentication/authorization using BASIC. Shall be present if authType is \"BASIC\" and the contained information has not been provisioned out of band. Shall be absent otherwise.\n",
+            "type": "object",
+            "properties": {
+              "userName": {
+                "description": "Username to be used in HTTP Basic authentication. Shall be present if it has not been provisioned out of band.\n",
+                "type": "string"
+              },
+              "password": {
+                "description": "Password to be used in HTTP Basic authentication. Shall be present if it has not been provisioned out of band.\n",
+                "type": "string"
+              }
+            }
+          },
+          "paramsOauth2ClientCredentials": {
+            "description": "Parameters for authentication/authorization using OAUTH2_CLIENT_CREDENTIALS. Shall be present if authType is \"OAUTH2_CLIENT_CREDENTIALS\" and the contained information has not been provisioned out of band. Shall be absent otherwise.\n",
+            "type": "object",
+            "properties": {
+              "clientId": {
+                "description": "Client identifier to be used in the access token request of the OAuth 2.0 client credentials grant type.  Shall be present if it has not been provisioned out of band. The clientId and clientPassword passed in a subscription shall not be the same as the clientId and clientPassword that are used to obtain authorization for API requests. Client credentials may differ between subscriptions. The value of clientPassword should be generated by a random process.\n",
+                "type": "string"
+              },
+              "clientPassword": {
+                "description": "Client password to be used in the access token request of the OAuth 2.0 client credentials grant type.  Shall be present if it has not been provisioned out of band. The clientId and clientPassword passed in a subscription shall not be the same as the clientId and clientPassword that are used to obtain authorization for API requests. Client credentials may differ between subscriptions. The value of clientPassword should be generated by a random process.\n",
+                "type": "string"
+              },
+              "tokenEndpoint": {
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/schemas/ThresholdModifications.json b/SOL002/VNFPerformanceManagement-API/schemas/ThresholdModifications.json
new file mode 100644
index 000000000..995cee351
--- /dev/null
+++ b/SOL002/VNFPerformanceManagement-API/schemas/ThresholdModifications.json
@@ -0,0 +1,62 @@
+ {
+    "description": "This type represents modifications to a threshold. It shall comply with the provisions defined in table 6.5.2.11-1.\n",
+    "type": "object",
+    "properties": {
+      "callbackUri": {
+        "description": "String formatted according to IETF RFC 3986.\n",
+        "type": "string"
+      },
+      "authentication": {
+        "type": "object",
+        "required": [
+          "authType"
+        ],
+        "properties": {
+          "authType": {
+            "description": "Defines the types of Authentication / Authorization which the API consumer is willing to accept when receiving a notification. Permitted values: * BASIC: In every HTTP request to the notification endpoint, use\n  HTTP Basic authentication with the client credentials. \n* OAUTH2_CLIENT_CREDENTIALS: In every HTTP request to the\n  notification endpoint, use an OAuth 2.0 Bearer token, obtained\n  using the client credentials grant type.\n* TLS_CERT: Every HTTP request to the notification endpoint is sent\n  over a mutually authenticated TLS session, i.e. not only the\n  server is authenticated, but also the client is authenticated\n  during the TLS tunnel setup.\n",
+            "type": "array",
+            "items": {
+              "type": "string",
+              "enum": [
+                "BASIC",
+                "OAUTH2_CLIENT_CREDENTIALS",
+                "TLS_CERT"
+              ]
+            }
+          },
+          "paramsBasic": {
+            "description": "Parameters for authentication/authorization using BASIC. Shall be present if authType is \"BASIC\" and the contained information has not been provisioned out of band. Shall be absent otherwise.\n",
+            "type": "object",
+            "properties": {
+              "userName": {
+                "description": "Username to be used in HTTP Basic authentication. Shall be present if it has not been provisioned out of band.\n",
+                "type": "string"
+              },
+              "password": {
+                "description": "Password to be used in HTTP Basic authentication. Shall be present if it has not been provisioned out of band.\n",
+                "type": "string"
+              }
+            }
+          },
+          "paramsOauth2ClientCredentials": {
+            "description": "Parameters for authentication/authorization using OAUTH2_CLIENT_CREDENTIALS. Shall be present if authType is \"OAUTH2_CLIENT_CREDENTIALS\" and the contained information has not been provisioned out of band. Shall be absent otherwise.\n",
+            "type": "object",
+            "properties": {
+              "clientId": {
+                "description": "Client identifier to be used in the access token request of the OAuth 2.0 client credentials grant type.  Shall be present if it has not been provisioned out of band. The clientId and clientPassword passed in a subscription shall not be the same as the clientId and clientPassword that are used to obtain authorization for API requests. Client credentials may differ between subscriptions. The value of clientPassword should be generated by a random process.\n",
+                "type": "string"
+              },
+              "clientPassword": {
+                "description": "Client password to be used in the access token request of the OAuth 2.0 client credentials grant type.  Shall be present if it has not been provisioned out of band. The clientId and clientPassword passed in a subscription shall not be the same as the clientId and clientPassword that are used to obtain authorization for API requests. Client credentials may differ between subscriptions. The value of clientPassword should be generated by a random process.\n",
+                "type": "string"
+              },
+              "tokenEndpoint": {
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
\ No newline at end of file
-- 
GitLab


From 5eae1233dc6314b29fcb45ee4ac8138390787d13 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 2 Sep 2020 09:12:32 +0500
Subject: [PATCH 020/322] new test added for subscription

---
 SOL002/VNFFaultManagement-API/Subscriptions.robot | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/SOL002/VNFFaultManagement-API/Subscriptions.robot b/SOL002/VNFFaultManagement-API/Subscriptions.robot
index 1977027d5..b77885650 100644
--- a/SOL002/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL002/VNFFaultManagement-API/Subscriptions.robot
@@ -285,6 +285,19 @@ Get subscriptions with filter "filter.probableCauses"
     Check HTTP Response Body Json Schema Is   FmSubscriptions
     Check PostCondition HTTP Response Body Subscriptions Matches the requested attribute-based filter "filter_probableCauses"
     
+POST Create a new Subscription - Unprocessable Entity
+    [Documentation]    Test ID: 6.3.4.4.21
+    ...    Test title: POST Create a new Subscription - Unprocessable Entity
+    ...    Test objective: The objective is to test that content type of the payload body is supported and the payload body of a request contains syntactically correct data but the data cannot be processed.
+    ...    re-conditions: none
+    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Post Create subscription
+    Check HTTP Response Status Code Is    422
+    Check HTTP Response Body Json Schema Is  ProblemDetails
+
 *** Keywords ***
 Post Create subscription
     Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions
-- 
GitLab


From aa04d0dc6c6d86a69380514b246b1ff31f2b6388 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 2 Sep 2020 09:26:57 +0500
Subject: [PATCH 021/322] missing and new test cases  added for subscription

---
 SOL002/VNFIndicator-API/Subscriptions.robot | 69 ++++++++++++++++++++-
 1 file changed, 67 insertions(+), 2 deletions(-)

diff --git a/SOL002/VNFIndicator-API/Subscriptions.robot b/SOL002/VNFIndicator-API/Subscriptions.robot
index fd458fbb6..1d54a66d2 100644
--- a/SOL002/VNFIndicator-API/Subscriptions.robot
+++ b/SOL002/VNFIndicator-API/Subscriptions.robot
@@ -139,8 +139,47 @@ GET VNF Indicators Subscriptions - Bad Request Response too Big
     ...    Post-Conditions: none
     Get VNF Indicators Subscriptions
     Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is   ProblemDetails    
+    Check HTTP Response Body Json Schema Is   ProblemDetails   
+    
+POST Create a new Subscription - Unprocessable Entity
+    [Documentation]    Test ID: 6.3.2.4.11
+    ...    Test title: POST Create a new Subscription - Unprocessable Entity
+    ...    Test objective: The objective is to test that content type of the payload body is supported and the payload body of a request contains syntactically correct data but the data cannot be processed.
+    ...    re-conditions: none
+    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send Post Request for VNF Indicator Subscription
+    Check HTTP Response Status Code Is    422
+    Check HTTP Response Body Json Schema Is  ProblemDetails
+ 
+Create new VNF indicator Subscription - DUPLICATION
+    [Documentation]    Test ID: 6.3.2.4.12
+    ...    Test title: POST Create a new subscription - DUPLICATION
+    ...    Test objective: The POST method creates a new subscription even if an existing subscription to same content exist
+    ...    Pre-conditions: none
+    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: SUT should support duplication of subscription creation
+    ...    Post-Conditions: in response header Location shall not be null
+    Post Create subscription - DUPLICATION
+    Check HTTP Response Status Code Is    201
+    Check HTTP Response Body Json Schema Is    VnfIndicatorSubscription
 
+Create new VNF indicator Subscription - NO-DUPLICATION
+    [Documentation]    Test ID: 6.3.2.4.13
+    ...    Test title: POST Create a new subscription - NO-DUPLICATION
+    ...    Test objective: The POST method creates a new subscription even if an existing subscription to same content exist
+    ...    Pre-conditions: none
+    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: SUT should not support duplication of subscription creation
+    ...    Post-Conditions: in response header Location shall not be null
+    Post Create subscription - NO-DUPLICATION
+    Check HTTP Response Status Code Is    303
+    Check Operation Occurrence Id
+ 
  *** Keywords ***
 Get VNF Indicators Subscriptions
     Log    Trying to get the list of subscriptions
@@ -265,4 +304,30 @@ Check Notification Endpoint
     
 Check LINK in Header
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
-    Should Not Be Empty    ${linkURL}
\ No newline at end of file
+    Should Not Be Empty    ${linkURL}
+    
+Post Create subscription - DUPLICATION
+    Log    Trying to create a subscription with an already created content
+    Pass Execution If    ${VNFM_CHECKS_NOTIF_ENDPOINT} == 0    VNFM is not permitting duplication. Skipping the test
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    ${body}=    Get File    jsons/subscriptions.json
+    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}		
+		
+Post Create subscription - NO-DUPLICATION	
+    Log    Trying to create a subscription with an already created content
+    Pass Execution If    ${VNFM_CHECKS_NOTIF_ENDPOINT} == 1    VNFM permits duplication. Skipping the test
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    ${body}=    Get File    jsons/subscriptions.json
+    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+	
+Check Operation Occurrence Id
+    ${vnfLcmOpOccId}=    Get Value From Json    ${response['headers']}    $..Location
+    Should Not Be Empty    ${vnfLcmOpOccId}
-- 
GitLab


From 381c201a848ade90f050801c18bec2a582555bab Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 2 Sep 2020 15:35:06 +0500
Subject: [PATCH 022/322] fix for issue 122

---
 SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot | 4 ++--
 SOL005/NSLifecycleManagement-API/environment/variables.txt    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index a11b0047c..298987ee8 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -163,7 +163,7 @@ Check Postcondition NS Instance is not created
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${indNSInstanceId}
     Integer    response status    404
     
 Check HTTP Response Status Code Is
@@ -308,7 +308,7 @@ POST IndividualNSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}
+    Post    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${indNSInstanceId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
diff --git a/SOL005/NSLifecycleManagement-API/environment/variables.txt b/SOL005/NSLifecycleManagement-API/environment/variables.txt
index 94a133ae4..ecaffd28a 100644
--- a/SOL005/NSLifecycleManagement-API/environment/variables.txt
+++ b/SOL005/NSLifecycleManagement-API/environment/variables.txt
@@ -17,6 +17,7 @@ ${apiVersion}     v1
 ${AUTH_USAGE}     1
 ${WRONG_AUTHORIZATION}    Bearer    XXXXXWRONGXXXXX
 ${nsInstanceId}       6fc3539c-e602-4afa-8e13-962fb5a7d81f
+${indNSInstanceId}    962fb5a7-e602-4afa-8e13-962fb5a7d81f
 ${ConflictNsInstanceId}    007c111c-e602-4afa-8e13-962fb5a7d81d
 ${nsInstanceName}    Test-nsInstance
 ${nsInstanceDescription}    description ns
-- 
GitLab


From 7229c8df5fec145ddd705d73a0641fa8c606e9c3 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Thu, 3 Sep 2020 10:22:34 +0500
Subject: [PATCH 023/322] fix for issue 121

---
 .../VNFPackageManagement-API/ApiVersion.robot |  1 -
 .../IndividualSubscription.robot              |  3 +-
 .../IndividualVNFPackage.robot                |  3 +-
 .../Subscriptions.robot                       |  3 +-
 .../VNFDInIndividualVNFPackage.robot          |  3 +-
 .../VNFPackageArtifacts.robot                 |  3 +-
 .../VNFPackageContent.robot                   |  3 +-
 .../VNFPackageContentViaURI.robot             |  3 +-
 .../VNFPackageManagementKeywords.robot        |  8 ---
 .../VNFPackages.robot                         |  1 -
 .../environment/individualSubscription.txt    |  7 ---
 .../environment/individualVnfPackage.txt      |  5 --
 .../environment/subscriptions.txt             |  7 ---
 .../environment/variables.txt                 | 49 ++++++++++++++++++-
 .../environment/vnfPackageArtifacts.txt       |  8 ---
 .../environment/vnfPackageContent.txt         | 12 -----
 .../environment/vnfPackageContentViaUri.txt   |  4 --
 .../environment/vnfPackages.txt               | 10 ----
 .../vnfdInIndividualVnfPackage.txt            | 12 -----
 19 files changed, 54 insertions(+), 91 deletions(-)
 delete mode 100644 SOL005/VNFPackageManagement-API/environment/individualSubscription.txt
 delete mode 100644 SOL005/VNFPackageManagement-API/environment/individualVnfPackage.txt
 delete mode 100644 SOL005/VNFPackageManagement-API/environment/subscriptions.txt
 delete mode 100644 SOL005/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt
 delete mode 100644 SOL005/VNFPackageManagement-API/environment/vnfPackageContent.txt
 delete mode 100644 SOL005/VNFPackageManagement-API/environment/vnfPackageContentViaUri.txt
 delete mode 100644 SOL005/VNFPackageManagement-API/environment/vnfPackages.txt
 delete mode 100644 SOL005/VNFPackageManagement-API/environment/vnfdInIndividualVnfPackage.txt

diff --git a/SOL005/VNFPackageManagement-API/ApiVersion.robot b/SOL005/VNFPackageManagement-API/ApiVersion.robot
index 787f4ccf5..609a71d1a 100644
--- a/SOL005/VNFPackageManagement-API/ApiVersion.robot
+++ b/SOL005/VNFPackageManagement-API/ApiVersion.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 
 Resource    environment/variables.txt
-
 Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=false
 Library    DependencyLibrary
 Library    JSONLibrary
diff --git a/SOL005/VNFPackageManagement-API/IndividualSubscription.robot b/SOL005/VNFPackageManagement-API/IndividualSubscription.robot
index 06b4a44c5..c72164f90 100644
--- a/SOL005/VNFPackageManagement-API/IndividualSubscription.robot
+++ b/SOL005/VNFPackageManagement-API/IndividualSubscription.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/individualSubscription.txt
+Resource          environment/variables.txt 
 Resource          VNFPackageManagementKeywords.robot
 Library           OperatingSystem
 Library           JSONLibrary
diff --git a/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot b/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot
index 8e8d887c0..f47c41c4d 100644
--- a/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot
+++ b/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/individualVnfPackage.txt
+Resource          environment/variables.txt
 Resource          VNFPackageManagementKeywords.robot    
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
diff --git a/SOL005/VNFPackageManagement-API/Subscriptions.robot b/SOL005/VNFPackageManagement-API/Subscriptions.robot
index 00d943bf7..8ca89778a 100644
--- a/SOL005/VNFPackageManagement-API/Subscriptions.robot
+++ b/SOL005/VNFPackageManagement-API/Subscriptions.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/subscriptions.txt
+Resource          environment/variables.txt
 Resource          VNFPackageManagementKeywords.robot
 Library           OperatingSystem
 Library           JSONLibrary
diff --git a/SOL005/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot b/SOL005/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
index 9ea927e29..05586203f 100644
--- a/SOL005/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
+++ b/SOL005/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/vnfdInIndividualVnfPackage.txt
+Resource          environment/variables.txt
 Resource          VNFPackageManagementKeywords.robot    
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageArtifacts.robot b/SOL005/VNFPackageManagement-API/VNFPackageArtifacts.robot
index 17fe131cf..72304b904 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageArtifacts.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageArtifacts.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/vnfPackageArtifacts.txt
+Resource          environment/variables.txt
 Resource          VNFPackageManagementKeywords.robot 
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageContent.robot b/SOL005/VNFPackageManagement-API/VNFPackageContent.robot
index 8d4248295..661a04e62 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageContent.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageContent.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/vnfPackageContent.txt
+Resource          environment/variables.txt
 Resource          VNFPackageManagementKeywords.robot    
 Library           JSONLibrary
 Library           OperatingSystem    
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageContentViaURI.robot b/SOL005/VNFPackageManagement-API/VNFPackageContentViaURI.robot
index 82ccf7e73..6369bdeeb 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageContentViaURI.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageContentViaURI.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/vnfPackageContentViaUri.txt
+Resource          environment/variables.txt
 Resource          VNFPackageManagementKeywords.robot
 Library           JSONLibrary
 Library           OperatingSystem    
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index ff83f44c6..28b292b6a 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -1,14 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/subscriptions.txt
-Resource          environment/vnfPackages.txt    # VNF Packages specific parameters
-Resource          environment/individualVnfPackage.txt
-Resource          environment/vnfdInIndividualVnfPackage.txt
-Resource          environment/vnfPackageContent.txt
-Resource          environment/vnfPackageContentViaUri.txt
-Resource          environment/vnfPackageArtifacts.txt
-Resource          environment/individualSubscription.txt
 Library           OperatingSystem
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
diff --git a/SOL005/VNFPackageManagement-API/VNFPackages.robot b/SOL005/VNFPackageManagement-API/VNFPackages.robot
index 617e627de..3cfc30de7 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackages.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackages.robot
@@ -1,5 +1,4 @@
 *** Settings ***
-Resource          environment/vnfPackages.txt    # VNF Packages specific parameters
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
 Resource          VNFPackageManagementKeywords.robot    
diff --git a/SOL005/VNFPackageManagement-API/environment/individualSubscription.txt b/SOL005/VNFPackageManagement-API/environment/individualSubscription.txt
deleted file mode 100644
index 78c7b91b4..000000000
--- a/SOL005/VNFPackageManagement-API/environment/individualSubscription.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-*** Variables ***
-${subscriptionId}    f3ae6df7-07e1-47c9-8924-9ebe10343586
-${erroneousSubscriptionId}    442e3ee5-0499-4849-9b31-eb91ce1638f1    # Not existing ID on the subscriptions
-${newSubscriptionId}    newSubsciptionId
-${response}    httpresponse
-${origResponse}    httpresponse
-
diff --git a/SOL005/VNFPackageManagement-API/environment/individualVnfPackage.txt b/SOL005/VNFPackageManagement-API/environment/individualVnfPackage.txt
deleted file mode 100644
index 23b0dd07b..000000000
--- a/SOL005/VNFPackageManagement-API/environment/individualVnfPackage.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-*** Variables ***
-${erroneousVnfPackageId}    erroneousVnfPackageId    # Given ID for vnfPkg not present in database
-${disabledVnfPackageId}    87a2c9d3-00ea-4032-8c67-a5106d001868
-${vnfPackageId}  788106a2-d692-44f3-a86d-384f0ce35e42
-${instantiatedVnfPackageId}  0b79bab50daca910b000d4f1a2b675d604257e42
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/environment/subscriptions.txt b/SOL005/VNFPackageManagement-API/environment/subscriptions.txt
deleted file mode 100644
index ca34ee831..000000000
--- a/SOL005/VNFPackageManagement-API/environment/subscriptions.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-*** Variables ***
-${filter_ok}      callbackUri=http://172.22.1.7:9091/vnfpkgm/subscriptions
-${filter_ko}      nfvId=f9f130e4-05eb-4082-a676-4c97d13a883d    # Not existant filter attribute-based
-${callbackUri}    http://172.22.1.7:9091/vnfpkgm/subscriptions
-${total_polling_time}   2 min
-${polling_interval}     10 sec
-${SEPERATOR}      =
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/environment/variables.txt b/SOL005/VNFPackageManagement-API/environment/variables.txt
index 80469cdfe..bb3a84bbe 100644
--- a/SOL005/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFPackageManagement-API/environment/variables.txt
@@ -14,7 +14,6 @@ ${apiName}        vnfpkgm
 ${FIELD_USAGE}    1
 ${NFVO_PLAIN}     1
 ${NFVO_FIELDS}    1
-${onboardingStateVnfPkgId}    788106a2-d692-44f3-a86d-384f0ce35e42    # The VNF Package is in CREATED onboardingState
 
 ${testOptionalMethods}    0
 
@@ -31,7 +30,53 @@ ${polling_interval}     10 sec
 
 ${NFVO_CHECKS_NOTIF_ENDPOINT}    1
 
-${response}
+${response}    
 
 ${notification_request}    []
 ${notification_response}    []
+
+${subscriptionId}    f3ae6df7-07e1-47c9-8924-9ebe10343586
+${erroneousSubscriptionId}    442e3ee5-0499-4849-9b31-eb91ce1638f1    # Not existing ID on the subscriptions
+${newSubscriptionId}    newSubsciptionId
+${origResponse}    httpresponse
+
+${filter_ok}      callbackUri=http://172.22.1.7:9091/vnfpkgm/subscriptions
+${filter_ko}      nfvId=f9f130e4-05eb-4082-a676-4c97d13a883d    # Not existant filter attribute-based
+${SEPERATOR}      =
+
+${erroneousVnfPackageId}    erroneousVnfPackageId    # Given ID for vnfPkg not present in database
+${disabledVnfPackageId}    87a2c9d3-00ea-4032-8c67-a5106d001868
+${vnfPackageId}  788106a2-d692-44f3-a86d-384f0ce35e42
+${instantiatedVnfPackageId}  0b79bab50daca910b000d4f1a2b675d604257e42
+
+${ACCEPT_PLAIN}    text/plain
+${ACCEPT_ZIP}     application/zip
+${CONTENT_TYPE_PLAIN}    text/plain
+${CONTENT_TYPE_ZIP}    application/zip
+${NFVO_VNFD_PLAIN}    1
+${NFVO_VNFD_ZIP}    0
+${vnfPkgPlainVNFD}    c26ad7fb-072b-48c4-a663-7d71646d9e98    # The VNF Pakcage contains a VNFD which is a Single Plain File
+${vnfPkgZipVNFD}    f5b220d4-6177-4ebb-a554-a43311e16075    # The VNF Package contains a VNFD composed by multiple files
+${erroneousVnfPkgId}    erroneousPkgId
+${onboardingStateVnfPkgId}    788106a2-d692-44f3-a86d-384f0ce35e42    # The VNF Package is in CREATED onboardingState
+
+${artifactPath}    artifactPath
+${CONTENT_TYPE_OCTET}    application/octet-stream
+${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
+${range}          bytes=0-1023
+${erroneousRange}    bytes=10000000-1000000000    # Requesting a out of range number of bytes
+${vnfPackageOctetStreamId}    octetStreamPkgId
+${vnfPkgId}       788106a2-d692-44f3-a86d-384f0ce35e42
+${length}          1024
+${creatingVnfPackageId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
+${newVnfPackageId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
+
+${POS_FILTER}     vnfdId=41fdd38a-3d4c-465c-83e0-f80e014425f8&vnfProvider=NXW    # Positive case, suing compiant fields name for filtering get request
+${NEG_FILTER}     nfvId=41fdd38a-3d4c-465c-83e0-f80e014425f8    # Negative case, using wrong name of field
+${CAN_FILTER}     1    # NFVO in able to use filters when retrieving VNF Packages
+${fields}         softwareImages,additionalArtifacts
+${BAD_AUTHORIZATION}    Bear sometoken
+${VAR_SEPERATOR}    &
+
+${vnfPkgViaUriId}       788106a2-d692-44f3-a86d-384f0ce35e42
+${creatingVnfPkgViaUriId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt b/SOL005/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt
deleted file mode 100644
index 4acfbd727..000000000
--- a/SOL005/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-*** Variables ***
-${artifactPath}    artifactPath
-${CONTENT_TYPE_OCTET}    application/octet-stream
-${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
-${range}          bytes=0-1023
-${erroneousRange}    bytes=10000000-1000000000    # Requesting a out of range number of bytes
-${erroneousVnfPkgId}    erroneousPkgId
-${vnfPackageOctetStreamId}    octetStreamPkgId
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/environment/vnfPackageContent.txt b/SOL005/VNFPackageManagement-API/environment/vnfPackageContent.txt
deleted file mode 100644
index c775a126d..000000000
--- a/SOL005/VNFPackageManagement-API/environment/vnfPackageContent.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-*** Variables ***
-${ACCEPT_ZIP}     application/zip
-${CONTENT_TYPE_ZIP}    application/zip
-${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
-${erroneousVnfPkgId}    erroneousPkgId
-${vnfPkgId}       788106a2-d692-44f3-a86d-384f0ce35e42
-${erroneousRange}    bytes=100000-1000000    # Requesting a out of range number of bytes
-${range}          bytes=0-1023
-${length}          1024
-${creatingVnfPackageId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
-${newVnfPackageId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
-
diff --git a/SOL005/VNFPackageManagement-API/environment/vnfPackageContentViaUri.txt b/SOL005/VNFPackageManagement-API/environment/vnfPackageContentViaUri.txt
deleted file mode 100644
index 9cb902861..000000000
--- a/SOL005/VNFPackageManagement-API/environment/vnfPackageContentViaUri.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-*** Variables ***
-${vnfPkgViaUriId}       788106a2-d692-44f3-a86d-384f0ce35e42
-${creatingVnfPkgViaUriId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
-
diff --git a/SOL005/VNFPackageManagement-API/environment/vnfPackages.txt b/SOL005/VNFPackageManagement-API/environment/vnfPackages.txt
deleted file mode 100644
index 8f599ef60..000000000
--- a/SOL005/VNFPackageManagement-API/environment/vnfPackages.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-*** Variables ***
-${POS_FILTER}     vnfdId=41fdd38a-3d4c-465c-83e0-f80e014425f8&vnfProvider=NXW    # Positive case, suing compiant fields name for filtering get request
-${NEG_FILTER}     nfvId=41fdd38a-3d4c-465c-83e0-f80e014425f8    # Negative case, using wrong name of field
-${CAN_FILTER}     1    # NFVO in able to use filters when retrieving VNF Packages
-${fields}         softwareImages,additionalArtifacts
-${response}       httpresponse
-${NEG_AUTHORIZATION}    Bearer negativetoken
-${BAD_AUTHORIZATION}    Bear sometoken
-${SEPERATOR}      =
-${VAR_SEPERATOR}    &
diff --git a/SOL005/VNFPackageManagement-API/environment/vnfdInIndividualVnfPackage.txt b/SOL005/VNFPackageManagement-API/environment/vnfdInIndividualVnfPackage.txt
deleted file mode 100644
index 8e228037e..000000000
--- a/SOL005/VNFPackageManagement-API/environment/vnfdInIndividualVnfPackage.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-*** Variables ***
-${ACCEPT_PLAIN}    text/plain
-${ACCEPT_ZIP}     application/zip
-${CONTENT_TYPE_PLAIN}    text/plain
-${CONTENT_TYPE_ZIP}    application/zip
-${NFVO_VNFD_PLAIN}    1
-${NFVO_VNFD_ZIP}    0
-${vnfPkgPlainVNFD}    c26ad7fb-072b-48c4-a663-7d71646d9e98    # The VNF Pakcage contains a VNFD which is a Single Plain File
-${vnfPkgZipVNFD}    f5b220d4-6177-4ebb-a554-a43311e16075    # The VNF Package contains a VNFD composed by multiple files
-${erroneousVnfPkgId}    erroneousPkgId
-${onboardingStateVnfPkgId}    788106a2-d692-44f3-a86d-384f0ce35e42    # The VNF Package is in CREATED onboardingState
-${vnfPackageId}  788106a2-d692-44f3-a86d-384f0ce35e42
-- 
GitLab


From 9b3f09f998a230f2cce31df4037e09488e415ab3 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Thu, 3 Sep 2020 13:04:48 +0500
Subject: [PATCH 024/322] new test case added for SOL003 LCM Subscrption

---
 .../Subscriptions.robot                           | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/SOL003/VNFLifecycleManagement-API/Subscriptions.robot b/SOL003/VNFLifecycleManagement-API/Subscriptions.robot
index 4e05efb62..84cc91dbe 100644
--- a/SOL003/VNFLifecycleManagement-API/Subscriptions.robot
+++ b/SOL003/VNFLifecycleManagement-API/Subscriptions.robot
@@ -200,4 +200,17 @@ GET subscriptions - Bad Request Response too Big
     ...    Post-Conditions: none 
     Get subscriptions
     Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is    ProblemDetails
\ No newline at end of file
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+    
+POST Create a new Subscription - Unprocessable Entity
+    [Documentation]    Test ID: 7.3.1.17.16
+    ...    Test title: POST Create a new Subscription - Unprocessable Entity
+    ...    Test objective: The objective is to test that content type of the payload body is supported and the payload body of a request contains syntactically correct data but the data cannot be processed.
+    ...    re-conditions: none
+    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Post Create subscription
+    Check HTTP Response Status Code Is    422
+    Check HTTP Response Body Json Schema Is  ProblemDetails
\ No newline at end of file
-- 
GitLab


From 26d949d9b3e008a1a174ea0089d2f355716bfb28 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Thu, 3 Sep 2020 13:24:19 +0500
Subject: [PATCH 025/322] new test cases added for IndividualPmJob

---
 .../IndividualPmJob.robot                     | 38 ++++++++----
 .../jsons/PmJobModifications.json             |  3 +
 .../schemas/PmJobModifications.json           | 62 +++++++++++++++++++
 3 files changed, 92 insertions(+), 11 deletions(-)
 create mode 100644 SOL003/VNFPerformanceManagement-API/jsons/PmJobModifications.json
 create mode 100644 SOL003/VNFPerformanceManagement-API/schemas/PmJobModifications.json

diff --git a/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
index 60129e126..afa7685bc 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
@@ -1,4 +1,5 @@
 *** Settings ***
+Library           OperatingSystem
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
 Library           JSONLibrary
@@ -76,7 +77,7 @@ PUT Individual VNF Performance Job - Method not implemented
     ...    Test title: PUT Individual VNF Performance Job - method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF Performance Monitoring Job
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Job is not modified by the operation
@@ -84,19 +85,32 @@ PUT Individual VNF Performance Job - Method not implemented
     Check HTTP Response Status Code Is    405
     Check Postcondition VNF Performance Job is Unmodified (Implicit)
 
-PATCH Individual VNF Performance Job - Method not implemented
+PATCH Individual VNF Performance Job
     [Documentation]    Test ID: 7.3.4.2.7
-    ...    Test title: PATCH Individual VNF Performance Job - method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing new VNF Performance Monitoring Job
+    ...    Test title: PATCH Individual VNF Performance Job
+    ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing VNF Performance Monitoring Job
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
     ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Performance Job is not modified by the operation
+    ...    Post-Conditions: 
     Send Patch request for individual VNF Performance Job
-    Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Performance Job is Unmodified (Implicit)
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    PMJobModifications
     
+PATCH Individual VNF Performance Job - Precondition failed
+    [Documentation]    Test ID: 7.3.4.2.8
+    ...    Test title: PATCH Individual VNF Performance Job - Precondition failed
+    ...    Test objective: The objective is to attempt to Modify an individual alarm resource, where the precondition was not met.
+    ...    Pre-conditions:  A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 003 [2] v2.6.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions:  The VNF Performance Job is not modified by the operation
+    Send Patch request for individual VNF Performance Job
+    Check HTTP Response Status Code Is    412
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    Check Postcondition VNF Performance Job is Unmodified (Implicit)    
 *** Keywords ***
 GET individual VNF Performance Job
     Log    Trying to get a Pm Job present in the NFVO Catalogue
@@ -150,10 +164,12 @@ Send Put request for individual VNF Performance Job
     Set Suite Variable    ${response}    ${output}
     
 Send Patch request for individual VNF Performance Job    
-    Log    Trying to perform a PATCH (method should not be implemented)
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+    Set Headers  {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${body}=    Get File    jsons/PMJobModifications.json
+    PATCH    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}     ${body}
+
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
diff --git a/SOL003/VNFPerformanceManagement-API/jsons/PmJobModifications.json b/SOL003/VNFPerformanceManagement-API/jsons/PmJobModifications.json
new file mode 100644
index 000000000..799d664ba
--- /dev/null
+++ b/SOL003/VNFPerformanceManagement-API/jsons/PmJobModifications.json
@@ -0,0 +1,3 @@
+{
+	"callbackUri":"127.0.0.3"
+}
\ No newline at end of file
diff --git a/SOL003/VNFPerformanceManagement-API/schemas/PmJobModifications.json b/SOL003/VNFPerformanceManagement-API/schemas/PmJobModifications.json
new file mode 100644
index 000000000..8da79dfe0
--- /dev/null
+++ b/SOL003/VNFPerformanceManagement-API/schemas/PmJobModifications.json
@@ -0,0 +1,62 @@
+{
+    "description": "This type represents modifications to a PM job. It shall comply with the provisions defined in table 6.5.2.12-1.\n",
+    "type": "object",
+    "properties": {
+      "callbackUri": {
+        "description": "String formatted according to IETF RFC 3986.\n",
+        "type": "string"
+      },
+      "authentication": {
+        "type": "object",
+        "required": [
+          "authType"
+        ],
+        "properties": {
+          "authType": {
+            "description": "Defines the types of Authentication / Authorization which the API consumer is willing to accept when receiving a notification. Permitted values: * BASIC: In every HTTP request to the notification endpoint, use\n  HTTP Basic authentication with the client credentials. \n* OAUTH2_CLIENT_CREDENTIALS: In every HTTP request to the\n  notification endpoint, use an OAuth 2.0 Bearer token, obtained\n  using the client credentials grant type.\n* TLS_CERT: Every HTTP request to the notification endpoint is sent\n  over a mutually authenticated TLS session, i.e. not only the\n  server is authenticated, but also the client is authenticated\n  during the TLS tunnel setup.\n",
+            "type": "array",
+            "items": {
+              "type": "string",
+              "enum": [
+                "BASIC",
+                "OAUTH2_CLIENT_CREDENTIALS",
+                "TLS_CERT"
+              ]
+            }
+          },
+          "paramsBasic": {
+            "description": "Parameters for authentication/authorization using BASIC. Shall be present if authType is \"BASIC\" and the contained information has not been provisioned out of band. Shall be absent otherwise.\n",
+            "type": "object",
+            "properties": {
+              "userName": {
+                "description": "Username to be used in HTTP Basic authentication. Shall be present if it has not been provisioned out of band.\n",
+                "type": "string"
+              },
+              "password": {
+                "description": "Password to be used in HTTP Basic authentication. Shall be present if it has not been provisioned out of band.\n",
+                "type": "string"
+              }
+            }
+          },
+          "paramsOauth2ClientCredentials": {
+            "description": "Parameters for authentication/authorization using OAUTH2_CLIENT_CREDENTIALS. Shall be present if authType is \"OAUTH2_CLIENT_CREDENTIALS\" and the contained information has not been provisioned out of band. Shall be absent otherwise.\n",
+            "type": "object",
+            "properties": {
+              "clientId": {
+                "description": "Client identifier to be used in the access token request of the OAuth 2.0 client credentials grant type.  Shall be present if it has not been provisioned out of band. The clientId and clientPassword passed in a subscription shall not be the same as the clientId and clientPassword that are used to obtain authorization for API requests. Client credentials may differ between subscriptions. The value of clientPassword should be generated by a random process.\n",
+                "type": "string"
+              },
+              "clientPassword": {
+                "description": "Client password to be used in the access token request of the OAuth 2.0 client credentials grant type.  Shall be present if it has not been provisioned out of band. The clientId and clientPassword passed in a subscription shall not be the same as the clientId and clientPassword that are used to obtain authorization for API requests. Client credentials may differ between subscriptions. The value of clientPassword should be generated by a random process.\n",
+                "type": "string"
+              },
+              "tokenEndpoint": {
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
\ No newline at end of file
-- 
GitLab


From 1df2ac74c7bda506e3ed14879e08edc34fe72c63 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Thu, 3 Sep 2020 14:59:18 +0500
Subject: [PATCH 026/322] new test cases added for IndividualThreshold

---
 .../IndividualPmJob.robot                     |  4 +-
 .../IndividualThreshold.robot                 | 34 ++++++----
 .../jsons/ThresholdModifications.json         |  3 +
 .../schemas/ThresholdModifications.json       | 62 +++++++++++++++++++
 4 files changed, 90 insertions(+), 13 deletions(-)
 create mode 100644 SOL003/VNFPerformanceManagement-API/jsons/ThresholdModifications.json
 create mode 100644 SOL003/VNFPerformanceManagement-API/schemas/ThresholdModifications.json

diff --git a/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
index afa7685bc..8c2fc2979 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
@@ -88,7 +88,7 @@ PUT Individual VNF Performance Job - Method not implemented
 PATCH Individual VNF Performance Job
     [Documentation]    Test ID: 7.3.4.2.7
     ...    Test title: PATCH Individual VNF Performance Job
-    ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing VNF Performance Monitoring Job
+    ...    Test objective: The objective is to test that PATCH method allows to modify individual performace management job
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
     ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
@@ -103,7 +103,7 @@ PATCH Individual VNF Performance Job - Precondition failed
     ...    Test title: PATCH Individual VNF Performance Job - Precondition failed
     ...    Test objective: The objective is to attempt to Modify an individual alarm resource, where the precondition was not met.
     ...    Pre-conditions:  A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 003 [2] v2.6.1
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  The VNF Performance Job is not modified by the operation
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
index 18988757a..fb40dd197 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -84,19 +84,32 @@ PUT Individual Threshold - Method not implemented
     Check HTTP Response Status Code Is    405
     Check Postcondition VNF Performance Threshold is Unmodified (Implicit)
 
-PATCH Individual Threshold - Method not implemented
+PATCH Individual Threshold
     [Documentation]    Test ID: 7.3.4.5.7
-    ...    Test title: PATCH Individual Threshold - Method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing VNF Performance threshold
+    ...    Test title: PATCH Individual Threshold
+    ...    Test objective: The objective is to test that PATCH method allows to modify an Individual threshold resource.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
     ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Performance Threshold is not modified by the operation
+    ...    Post-Conditions: 
     Send Patch request for individual VNF Performance Threshold
-    Check HTTP Response Status Code Is    405
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    ThresholdModifications
+    
+PATCH Individual Threshold - Precondition failed
+    [Documentation]    Test ID: 7.3.4.5.8
+    ...    Test title: PATCH Individual Threshold - Preconition failed
+    ...    Test objective: The objective is to attempt to modify an individual threshold resource, where the precondition was not met.
+    ...    Pre-conditions:  A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
+    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions:  The VNF Performance Job is not modified by the operation
+    Send Patch request for individual VNF Performance Threshold
+    Check HTTP Response Status Code Is    412
+    Check HTTP Response Body Json Schema Is   ProblemDetails
     Check Postcondition VNF Performance Threshold is Unmodified (Implicit)
-
 *** Keywords ***
 GET Individual VNF Performance Threshold
     Log    Trying to get a Threhsold present in the VNFM
@@ -148,11 +161,10 @@ Send Put request for individual VNF Performance Threshold
 
 Send Patch request for individual VNF Performance Threshold
     Log    Trying to PUT threshold
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
-    ${origOutput}=    Output    response
-    Set Suite Variable    ${origResponse}    ${origOutput}
+    Set Headers  {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${body}=    Get File    jsons/ThresholdModifications.json
     PATCH    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL003/VNFPerformanceManagement-API/jsons/ThresholdModifications.json b/SOL003/VNFPerformanceManagement-API/jsons/ThresholdModifications.json
new file mode 100644
index 000000000..b3f998b3f
--- /dev/null
+++ b/SOL003/VNFPerformanceManagement-API/jsons/ThresholdModifications.json
@@ -0,0 +1,3 @@
+ {
+	"callbackUri":"127.0.0.1"
+}
\ No newline at end of file
diff --git a/SOL003/VNFPerformanceManagement-API/schemas/ThresholdModifications.json b/SOL003/VNFPerformanceManagement-API/schemas/ThresholdModifications.json
new file mode 100644
index 000000000..688bbfe8a
--- /dev/null
+++ b/SOL003/VNFPerformanceManagement-API/schemas/ThresholdModifications.json
@@ -0,0 +1,62 @@
+{
+    "description": "This type represents modifications to a threshold. It shall comply with the provisions defined in table 6.5.2.11-1.\n",
+    "type": "object",
+    "properties": {
+      "callbackUri": {
+        "description": "String formatted according to IETF RFC 3986.\n",
+        "type": "string"
+      },
+      "authentication": {
+        "type": "object",
+        "required": [
+          "authType"
+        ],
+        "properties": {
+          "authType": {
+            "description": "Defines the types of Authentication / Authorization which the API consumer is willing to accept when receiving a notification. Permitted values: * BASIC: In every HTTP request to the notification endpoint, use\n  HTTP Basic authentication with the client credentials. \n* OAUTH2_CLIENT_CREDENTIALS: In every HTTP request to the\n  notification endpoint, use an OAuth 2.0 Bearer token, obtained\n  using the client credentials grant type.\n* TLS_CERT: Every HTTP request to the notification endpoint is sent\n  over a mutually authenticated TLS session, i.e. not only the\n  server is authenticated, but also the client is authenticated\n  during the TLS tunnel setup.\n",
+            "type": "array",
+            "items": {
+              "type": "string",
+              "enum": [
+                "BASIC",
+                "OAUTH2_CLIENT_CREDENTIALS",
+                "TLS_CERT"
+              ]
+            }
+          },
+          "paramsBasic": {
+            "description": "Parameters for authentication/authorization using BASIC. Shall be present if authType is \"BASIC\" and the contained information has not been provisioned out of band. Shall be absent otherwise.\n",
+            "type": "object",
+            "properties": {
+              "userName": {
+                "description": "Username to be used in HTTP Basic authentication. Shall be present if it has not been provisioned out of band.\n",
+                "type": "string"
+              },
+              "password": {
+                "description": "Password to be used in HTTP Basic authentication. Shall be present if it has not been provisioned out of band.\n",
+                "type": "string"
+              }
+            }
+          },
+          "paramsOauth2ClientCredentials": {
+            "description": "Parameters for authentication/authorization using OAUTH2_CLIENT_CREDENTIALS. Shall be present if authType is \"OAUTH2_CLIENT_CREDENTIALS\" and the contained information has not been provisioned out of band. Shall be absent otherwise.\n",
+            "type": "object",
+            "properties": {
+              "clientId": {
+                "description": "Client identifier to be used in the access token request of the OAuth 2.0 client credentials grant type.  Shall be present if it has not been provisioned out of band. The clientId and clientPassword passed in a subscription shall not be the same as the clientId and clientPassword that are used to obtain authorization for API requests. Client credentials may differ between subscriptions. The value of clientPassword should be generated by a random process.\n",
+                "type": "string"
+              },
+              "clientPassword": {
+                "description": "Client password to be used in the access token request of the OAuth 2.0 client credentials grant type.  Shall be present if it has not been provisioned out of band. The clientId and clientPassword passed in a subscription shall not be the same as the clientId and clientPassword that are used to obtain authorization for API requests. Client credentials may differ between subscriptions. The value of clientPassword should be generated by a random process.\n",
+                "type": "string"
+              },
+              "tokenEndpoint": {
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
\ No newline at end of file
-- 
GitLab


From e72e74eed247257d9ff36af30f7518028603d30a Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Thu, 3 Sep 2020 16:15:53 +0500
Subject: [PATCH 027/322] new test case and bug fix added for subsription

---
 .../Subscriptions.robot                       | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/SOL003/VNFFaultManagement-API/Subscriptions.robot b/SOL003/VNFFaultManagement-API/Subscriptions.robot
index 1d1f3d25b..f9dae5efd 100644
--- a/SOL003/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL003/VNFFaultManagement-API/Subscriptions.robot
@@ -211,7 +211,7 @@ GET Subscription with attribute-based filter "id"
     ...    Test title: GET Subscription with attribute-based filter "id"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "id"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -225,7 +225,7 @@ Get subscriptions with filter "filter.notificationTypes"
     ...    Test title: GET Subscription with attribute-based filter "filter.notificationTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.notificationTypes"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -239,7 +239,7 @@ Get subscriptions with filter "filter.faultyResourceTypes"
     ...    Test title: GET Subscription with attribute-based filter "filter.faultyResourceTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.faultyResourceTypes"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -253,7 +253,7 @@ Get subscriptions with filter "filter.perceivedSeverities"
     ...    Test title: GET Subscription with attribute-based filter "filter.perceivedSeverities"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.perceivedSeverities"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -267,7 +267,7 @@ Get subscriptions with filter "filter.eventTypes"
     ...    Test title: GET Subscription with attribute-based filter "filter.eventTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.eventTypes"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -281,7 +281,7 @@ Get subscriptions with filter "filter.probableCauses"
     ...    Test title: GET Subscription with attribute-based filter "filter.probableCauses"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.probableCauses"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -289,3 +289,16 @@ Get subscriptions with filter "filter.probableCauses"
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   FmSubscriptions
     Check PostCondition HTTP Response Body Subscriptions Matches the requested attribute-based filter "filter_probableCauses"
+
+POST Create a new Subscription - Unprocessable Entity
+    [Documentation]    Test ID: 7.3.5.3.22
+    ...    Test title: POST Create a new Subscription - Unprocessable Entity
+    ...    Test objective: The objective is to test that content type of the payload body is supported and the payload body of a request contains syntactically correct data but the data cannot be processed.
+    ...    re-conditions: none
+    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Post Subscription
+    Check HTTP Response Status Code Is    422
+    Check HTTP Response Body Json Schema Is  ProblemDetails
-- 
GitLab


From aced8e070f904107609db8c9b8697d456629973f Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Thu, 3 Sep 2020 16:29:55 +0500
Subject: [PATCH 028/322] new test case added for SOL003 VNFIndicator
 Subsriptions

---
 SOL003/VNFIndicator-API/Subscriptions.robot | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/SOL003/VNFIndicator-API/Subscriptions.robot b/SOL003/VNFIndicator-API/Subscriptions.robot
index e9eeed23f..628e3a19a 100644
--- a/SOL003/VNFIndicator-API/Subscriptions.robot
+++ b/SOL003/VNFIndicator-API/Subscriptions.robot
@@ -173,3 +173,16 @@ GET VNF Indicator Subscriptions - Bad Request Response too Big
     Get All VNF Indicators Subscriptions
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is   ProblemDetails 
+
+POST Create a new Subscription - Unprocessable Entity
+    [Documentation]    Test ID: 7.3.6.4.13
+    ...    Test title: POST Create a new Subscription - Unprocessable Entity
+    ...    Test objective: The objective is to test that content type of the payload body is supported and the payload body of a request contains syntactically correct data but the data cannot be processed.
+    ...    re-conditions: none
+    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send Post Request for VNF Indicator Subscription
+    Check HTTP Response Status Code Is    422
+    Check HTTP Response Body Json Schema Is  ProblemDetails
-- 
GitLab


From aac818c233a18ffe05dfa77fafb22e3e4129d6c3 Mon Sep 17 00:00:00 2001
From: Frank Bryden <Frank.Bryden@etsi.org>
Date: Thu, 3 Sep 2020 15:13:17 +0200
Subject: [PATCH 029/322] Added missing double quotes around Auhtorization
 header token

Signed-off-by: Frank Bryden <Frank.Bryden@etsi.org>
---
 .../IndividualReport.robot                    | 12 +++----
 .../IndividualThreshold.robot                 | 14 ++++----
 .../Thresholds.robot                          | 16 +++++-----
 .../VNFPerformanceManagementKeywords.robot    | 10 +++---
 .../VNFPackageManagementKeywords.robot        |  6 ++--
 .../IndividualReport.robot                    | 12 +++----
 .../IndividualThreshold.robot                 | 14 ++++----
 .../Thresholds.robot                          | 16 +++++-----
 .../VNFPerformanceManagementKeywords.robot    | 32 +++++++++----------
 9 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
index 9a8f99a2c..1148dffdc 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
@@ -87,7 +87,7 @@ DELETE Individual Performance Report - Method not implemented
 Get Individual Performance Report
     Log    Trying to get a performance report present in the VNFM
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -95,21 +95,21 @@ Get Individual Performance Report
 Get Individual Performance Report with invalid resource endpoint
     Log    Trying to get a performance report with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${erroneousReportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for Individual Performance Report
     Log    Trying to create new performance report
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for Individual Performance Report
     Log    Trying to update performance report
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -119,7 +119,7 @@ Send Put request for Individual Performance Report
     
 Send Patch request for Individual Performance Report
     Log    Trying to update performance report
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -129,7 +129,7 @@ Send Patch request for Individual Performance Report
 
 Send Delete request for Individual Performance Report
     Log    Trying to delete performance report   
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
index 1a68cdce9..9df58168b 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -101,7 +101,7 @@ PATCH Individual Threshold - Method not implemented
 GET Individual VNF Performance Threshold
     Log    Trying to get a Threhsold present in the VNFM
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -109,28 +109,28 @@ GET Individual VNF Performance Threshold
 GET individual VNF Performance Threshold with invalid resource identifier
     Log    Trying to get a Threhsold with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${erroneousThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual VNF Performance Threshold
     Log    Trying to delete a Threhsold in the VNFM
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual VNF Performance Threshold with invalid resource identifier
     Log    Trying to delete a Threhsold in the VNFM with invalid id
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${erroneousThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual VNF Performance Threshold
     Log    Trying to create new threshold
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${newThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -138,7 +138,7 @@ Send Post request for individual VNF Performance Threshold
 Send Put request for individual VNF Performance Threshold
     Log    Trying to PUT threshold
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -149,7 +149,7 @@ Send Put request for individual VNF Performance Threshold
 Send Patch request for individual VNF Performance Threshold
     Log    Trying to PUT threshold
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
diff --git a/SOL002/VNFPerformanceManagement-API/Thresholds.robot b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
index 50552ec4f..bcb6017f3 100644
--- a/SOL002/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
@@ -142,7 +142,7 @@ GET Performance Thresholds for Bad Request Response too big
 GET all Performance Thresholds
     Log    Trying to get all thresholds present in the VNFM    
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -150,7 +150,7 @@ GET all Performance Thresholds
 GET Performance Thresholds with attribute-based filter
     Log    Trying to get thresholds present in the VNFM with filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds?${FILTER_OK}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -158,7 +158,7 @@ GET Performance Thresholds with attribute-based filter
 GET Performance Thresholds with invalid attribute-based filter
     Log    Trying to get thresholds present in the VNFM with invalid filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds?${FILTER_KO}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -166,14 +166,14 @@ GET Performance Thresholds with invalid attribute-based filter
 GET VNF Performance Thresholds with invalid resource endpoint
     Log    Trying to get thresholds present in the VNFM with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/threshold
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post Request Create new Performance Threshold
     Log    Creating a new THreshold
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${request}=    Get File    jsons/CreateThresholdRequest.json
@@ -183,7 +183,7 @@ Send Post Request Create new Performance Threshold
 
 Send PUT Request for all Performance Thresholds
     Log    PUT THresholds
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     PUT    ${apiRoot}/${apiName}/${apiVersion}/thresholds
@@ -192,7 +192,7 @@ Send PUT Request for all Performance Thresholds
     
 Send PATCH Request for all Performance Thresholds
     Log    PUT THresholds
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     PATCH    ${apiRoot}/${apiName}/${apiVersion}/thresholds
@@ -201,7 +201,7 @@ Send PATCH Request for all Performance Thresholds
 
 Send DELETE Request for all Performance Thresholds
     Log    DELETE THresholds
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
index f131a7216..4599d7620 100644
--- a/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
+++ b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
@@ -19,7 +19,7 @@ Get all VNF Performance Subscriptions
     ...    request and response data structures, and response codes.
     Set headers    {"Accept": "application/json"}
     Set headers    {"Content-Type": "application/json"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -38,7 +38,7 @@ Get all VNF Performance Subscriptions
     ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
     ...    request and response data structures, and response codes.
     Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ok}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -58,7 +58,7 @@ Get VNF Performance Subscriptions with invalid attribute-based filters
     ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
     ...    request and response data structures, and response codes.
     Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ko}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -77,7 +77,7 @@ Get VNF Performance Subscriptions with invalid resource endpoint
     ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
     ...    request and response data structures, and response codes.
     Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/subscription
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -103,7 +103,7 @@ Send Post Request for VNF Performance Subscription
     ...    the existing subscription resource with the same filter and callbackUri).
     Set headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${body_request}=    Get File    jsons/subscriptions.json
     POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body_request}
     ${output}=    Output    response
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 90d2c306c..a9004c957 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -712,13 +712,13 @@ Send Delete request for individual VNF Package Subscription with invalid resourc
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual VNF Package Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${newSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for individual VNF Package Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -727,7 +727,7 @@ Send Put request for individual VNF Package Subscription
     Set Suite Variable    ${response}    ${output}
     
 Send Patch request for individual VNF Package Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualReport.robot b/SOL003/VNFPerformanceManagement-API/IndividualReport.robot
index 6a4de49d0..f76c30ccb 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualReport.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualReport.robot
@@ -87,7 +87,7 @@ DELETE Individual Performance Report - Method not implemented
 Get Individual Performance Report
     Log    Trying to get a performance report present in the VNFM
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -95,21 +95,21 @@ Get Individual Performance Report
 Get Individual Performance Report with invalid resource endpoint
     Log    Trying to get a performance report with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${erroneousReportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for Individual Performance Report
     Log    Trying to create new performance report
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for Individual Performance Report
     Log    Trying to update performance report
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -119,7 +119,7 @@ Send Put request for Individual Performance Report
     
 Send Patch request for Individual Performance Report
     Log    Trying to update performance report
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -129,7 +129,7 @@ Send Patch request for Individual Performance Report
 
 Send Delete request for Individual Performance Report
     Log    Trying to delete performance report   
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
index 18988757a..fa6e6cd97 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -101,7 +101,7 @@ PATCH Individual Threshold - Method not implemented
 GET Individual VNF Performance Threshold
     Log    Trying to get a Threhsold present in the VNFM
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -109,28 +109,28 @@ GET Individual VNF Performance Threshold
 GET individual VNF Performance Threshold with invalid resource identifier
     Log    Trying to get a Threhsold with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${erroneousThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual VNF Performance Threshold
     Log    Trying to delete a Threhsold in the VNFM
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual VNF Performance Threshold with invalid resource identifier
     Log    Trying to delete a Threhsold in the VNFM with invalid id
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${erroneousThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual VNF Performance Threshold
     Log    Trying to create new threshold
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${newThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -138,7 +138,7 @@ Send Post request for individual VNF Performance Threshold
 Send Put request for individual VNF Performance Threshold
     Log    Trying to PUT threshold
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -149,7 +149,7 @@ Send Put request for individual VNF Performance Threshold
 Send Patch request for individual VNF Performance Threshold
     Log    Trying to PUT threshold
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
diff --git a/SOL003/VNFPerformanceManagement-API/Thresholds.robot b/SOL003/VNFPerformanceManagement-API/Thresholds.robot
index c1d7f0471..fcdf5a5b7 100644
--- a/SOL003/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL003/VNFPerformanceManagement-API/Thresholds.robot
@@ -140,7 +140,7 @@ GET Performance Thresholds - Bad Request Response too Big
 GET all Performance Thresholds
     Log    Trying to get all thresholds present in the VNFM    
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -148,7 +148,7 @@ GET all Performance Thresholds
 GET Performance Thresholds with attribute-based filter
     Log    Trying to get thresholds present in the VNFM with filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds?${FILTER_OK}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -156,7 +156,7 @@ GET Performance Thresholds with attribute-based filter
 GET Performance Thresholds with invalid attribute-based filter
     Log    Trying to get thresholds present in the VNFM with invalid filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds?${FILTER_KO}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -164,14 +164,14 @@ GET Performance Thresholds with invalid attribute-based filter
 GET VNF Performance Thresholds with invalid resource endpoint
     Log    Trying to get thresholds present in the VNFM with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/threshold
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post Request Create new Performance Threshold
     Log    Creating a new THreshold
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${request}=    Get File    jsons/CreateThresholdRequest.json
@@ -181,7 +181,7 @@ Send Post Request Create new Performance Threshold
 
 Send PUT Request for all Performance Thresholds
     Log    PUT THresholds
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     PUT    ${apiRoot}/${apiName}/${apiVersion}/thresholds
@@ -190,7 +190,7 @@ Send PUT Request for all Performance Thresholds
     
 Send PATCH Request for all Performance Thresholds
     Log    PUT THresholds
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     PATCH    ${apiRoot}/${apiName}/${apiVersion}/thresholds
@@ -199,7 +199,7 @@ Send PATCH Request for all Performance Thresholds
 
 Send DELETE Request for all Performance Thresholds
     Log    DELETE THresholds
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL003/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot b/SOL003/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
index a7a2ac66e..01f72fce8 100644
--- a/SOL003/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
+++ b/SOL003/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
@@ -19,7 +19,7 @@ Get all VNF Performance Subscriptions
     ...    request and response data structures, and response codes.
     Set headers    {"Accept": "application/json"}
     Set headers    {"Content-Type": "application/json"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -38,7 +38,7 @@ Get all VNF Performance Subscriptions
     ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
     ...    request and response data structures, and response codes.
     Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ok}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -58,7 +58,7 @@ Get VNF Performance Subscriptions with invalid attribute-based filters
     ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
     ...    request and response data structures, and response codes.
     Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ko}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -77,7 +77,7 @@ Get VNF Performance Subscriptions with invalid resource endpoint
     ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
     ...    request and response data structures, and response codes.
     Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/subscription
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -103,7 +103,7 @@ Send Post Request for VNF Performance Subscription
     ...    the existing subscription resource with the same filter and callbackUri).
     Set headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${body_request}=    Get File    jsons/subscriptions.json
     POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body_request}
     ${output}=    Output    response
@@ -134,7 +134,7 @@ Send Post Request for Duplicated VNF Performance Subscription
     ...    the existing subscription resource with the same filter and callbackUri).
     Set headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${body_request}=    Get File    jsons/subscriptions.json
     POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body_request}
     ${output}=    Output    response
@@ -155,7 +155,7 @@ Send Post Request for Duplicated VNF Performance Subscription
 Send Put Request for VNF Performance Subscriptions
     [Documentation]    This method is not supported. When this method is requested on this resource, the VNFM shall return a "405 Method
     ...    Not Allowed" response as defined in Clause 6.4.7.3.3.
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     PUT    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -165,7 +165,7 @@ Send Put Request for VNF Performance Subscriptions
 Send Patch Request for VNF Performance Subscriptions
     [Documentation]    This method is not supported. When this method is requested on this resource, the VNFM shall return a "405 Method
     ...    Not Allowed" response as defined in Clause 6.4.7.3.4.
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     PATCH    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -175,7 +175,7 @@ Send Patch Request for VNF Performance Subscriptions
 Send Delete Request for VNF Performance Subscriptions
     [Documentation]    This method is not supported. When this method is requested on this resource, the VNFM shall return a "405 Method
     ...    Not Allowed" response as defined in Clause 6.4.7.3.5.
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -184,40 +184,40 @@ Send Delete Request for VNF Performance Subscriptions
 
 Get Individual VNF Performance Subscription
     Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 GET individual VNF Performance Subscription with invalid resource identifier
     Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual VNF Performance Subscription
     Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual VNF Performance Subscription with invalid resource identifier
     Log    Trying to delete a subscription in the VNFM with invalid id
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual VNF Performance Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${newSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for individual VNF Performance Threshold
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -226,7 +226,7 @@ Send Put request for individual VNF Performance Threshold
     Set Suite Variable    ${response}    ${output}
     
 Send Patch request for individual VNF Performance Threshold
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-- 
GitLab


From e5bf7c12f28f4aaa3acaf2d7288f690426e3a830 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Fri, 4 Sep 2020 12:12:56 +0500
Subject: [PATCH 030/322] new test case added for SOL003 VRQN Subsriptions

---
 .../Subscriptions.robot                         | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/Subscriptions.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/Subscriptions.robot
index 75c19e158..0c0a309e2 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/Subscriptions.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/Subscriptions.robot
@@ -6,8 +6,6 @@ Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 
-
-
 *** Test Cases ***
 Create new Virtualised Resources Quota Available Notification subscription
     [Documentation]    Test ID: 7.3.7.1.1
@@ -151,4 +149,17 @@ GET Virtualised Resources Quota Available Notification subscriptions - Bad Reque
     ...    Post-Conditions: none
      GET Virtualised Resources Quota Available Notification Subscriptions
     Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is    ProblemDetails
\ No newline at end of file
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+    
+Create new Virtualised Resources Quota Available Notification Subscription - Unprocessable Entity
+    [Documentation]    Test ID: 7.3.7.1.12
+    ...    Test title: Create new Virtualised Resources Quota Available Notification Subscription - Unprocessable Entity
+    ...    Test objective: The objective is to test that content type of the payload body is supported and the payload body of a request contains syntactically correct data but the data cannot be processed.
+    ...    re-conditions: none
+    ...    Reference: Clause 11.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send Post request for new Virtualised Resources Quota Available Notification subscription
+    Check HTTP Response Status Code Is    422
+    Check HTTP Response Body Json Schema Is  ProblemDetails
-- 
GitLab


From 6bd0756e09df4265ab5a0b330b13734af16fe2fb Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Mon, 7 Sep 2020 12:38:07 +0500
Subject: [PATCH 031/322] removed 406 Not Acceptable test cases

---
 .../VNFDInIndividualVNFPackage.robot          | 26 -------------------
 1 file changed, 26 deletions(-)

diff --git a/SOL003/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot b/SOL003/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
index c8f945db6..2c1fa6b2b 100644
--- a/SOL003/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
+++ b/SOL003/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
@@ -59,19 +59,6 @@ Get multi file VNFD in Individual VNF Package in Plain or Zip Format
     Check HTTP Response Status Code Is    200
     Check HTTP Response Header Content-Type Is    application/zip
 
-Get multi file VNFD in Individual VNF Package in Plain Format
-    [Documentation]    Test ID: 7.3.3.4.5
-    ...    Test title: Get multi file VNFD in Individual VNF Package in Plain Format
-    ...    Test objective: The objective is to test that the retrieval of the multi file VNFD for an individual VNF package fails when requesting it in Plain format, and perform a validation of the JSON schema validation of the failed operation HTTP response
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The VNFD is implemented as a multi file
-    ...    Post-Conditions: none
-    Get multi file VNFD in Individual VNF Package in Plain Format
-    Check HTTP Response Status Code Is    406
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-
 Get VNFD in Individual VNF Package with invalid resource identifier
     [Documentation]    Test ID: 7.3.3.4.6
     ...    Test title: Get VNFD in Individual VNF Package with invalid resource identifier
@@ -198,19 +185,6 @@ Get multi file VNFD in Individual OnBoarded VNF Package in Plain or Zip Format
     Check HTTP Response Status Code Is    200
     Check HTTP Response Header Content-Type Is    application/zip
 
-Get multi file VNFD in Individual OnBoarded VNF Package in Plain Format
-    [Documentation]    Test ID: 7.3.3.4.16
-    ...    Test title: Get multi file VNFD in Individual OnBoarded VNF Package in Plain Format
-    ...    Test objective: The objective is to test that the retrieval of the multi file VNFD for an individual OnBoarded VNF package fails when requesting it in Plain format, and perform a validation of the JSON schema validation of the failed operation HTTP response
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The VNFD is implemented as a multi file
-    ...    Post-Conditions: none
-    Get multi file VNFD in Individual OnBoarded VNF Package in Plain Format
-    Check HTTP Response Status Code Is    406
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-
 Get VNFD in Individual OnBoarded VNF Package with invalid resource identifier
     [Documentation]    Test ID: 7.3.3.4.17
     ...    Test title: Get VNFD in Individual OnBoarded VNF Package with invalid resource identifier
-- 
GitLab


From 9105303ccaa1e776c9d38991edd4b7c00165a43f Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Mon, 7 Sep 2020 14:22:20 +0500
Subject: [PATCH 032/322] new test cases added in VNFDInIndividualVNFPackage

---
 .../VNFDInIndividualVNFPackage.robot          | 26 +++++++++++++++++++
 .../VNFPackageManagementKeywords.robot        | 18 +++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/SOL003/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot b/SOL003/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
index 2c1fa6b2b..e53cb0514 100644
--- a/SOL003/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
+++ b/SOL003/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
@@ -258,3 +258,29 @@ DELETE VNFD in Individual OnBoarded VNF Package Content - Method not implemented
     Send DELETE Request for VNFD in individual OnBoarded VNF Package
     Check HTTP Response Status Code Is    405
     Check Postcondition VNFD Exist
+    
+Get multi file VNFD in Individual VNF Package with security information
+    [Documentation]    Test ID: 7.3.3.4.23
+    ...    Test title: Get multi file VNFD in Individual VNF Package with security information
+    ...    Test objective: The objective is to test the retrieval of the multi file VNFD for an individual VNF package shall include in the ZIP archive the security information when requested with "include_signature" parameter, and perform a validation that returned content is in Zip format
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The VNFD is implemented as a multi file
+    ...    Post-Conditions: none
+    Get multi file VNFD in Individual VNF Package with security information
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get multi file VNFD in Individual OnBoarded VNF Package with security information
+    [Documentation]    Test ID: 7.3.3.4.24
+    ...    Test title: Get multi file VNFD in Individual OnBoarded VNF Package with security information
+    ...    Test objective: The objective is to test the retrieval of the multi file VNFD for an individual OnBoarded VNF package shall include in the ZIP archive the security information when requested with "include_signature" parameter, and perform a validation that returned content is in Zip format
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The VNFD is implemented as a multi file
+    ...    Post-Conditions: none
+    Get multi file VNFD in Individual OnBoarded VNF Package with security information
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 18bd70bcf..d802fe53a 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -1148,3 +1148,21 @@ Check Postcondition OnBoarded VNF Package Artifact Exist
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
     Check HTTP Response Status Code Is    200
+    
+Get multi file VNFD in Individual OnBoarded VNF Package with security information
+    Log    Trying to get a VNFD from a given OnBoarded VNF Package present in the NFVO Catalogue
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/vnfd/include_signatures
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get multi file VNFD in Individual VNF Package with security information
+    Log    Trying to get a VNFD from a given VNF Package present in the NFVO Catalogue
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd/include_signatures
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
-- 
GitLab


From e76b8c9f61936bd8e6ba38002f0e89aeab4f03b3 Mon Sep 17 00:00:00 2001
From: Frank Bryden <Frank.Bryden@etsi.org>
Date: Mon, 7 Sep 2020 18:14:18 +0200
Subject: [PATCH 033/322] Replayed some changes in reverse

Signed-off-by: Frank Bryden <Frank.Bryden@etsi.org>
---
 .../environment/nsDescriptors.txt             |   9 +++----
 .../environment/pnfDescriptors.txt            |   5 ++--
 .../environment/variables.txt                 |  16 +++++------
 .../NSDManagement-API/files/nsdContent.yaml   |  16 -----------
 SOL005/NSDManagement-API/files/nsdContent.zip | Bin 391 -> 0 bytes
 .../NSDManagement-API/files/pnfdContent.zip   | Bin 0 -> 359 bytes
 .../environment/variables.txt                 |   4 +--
 .../environment/variables.txt                 |  25 +++++++++---------
 .../jsons/LccnSubscriptionRequest.json        |   2 +-
 .../environment/IndividualPmJob.txt           |   2 +-
 .../environment/notifications.txt             |   4 +--
 .../environment/reports.txt                   |   2 +-
 .../environment/variables.txt                 |  12 ++++-----
 .../environment/individualVnfPackage.txt      |   6 ++---
 .../environment/variables.txt                 |  14 +++++-----
 .../environment/vnfPackageArtifacts.txt       |   4 +--
 .../environment/vnfPackageContent.txt         |   6 ++---
 .../environment/vnfPackageContentViaUri.txt   |   2 +-
 .../vnfdInIndividualVnfPackage.txt            |   4 +--
 .../VnfPackageChangeNotification.schema.json  |   2 +-
 20 files changed, 59 insertions(+), 76 deletions(-)
 delete mode 100644 SOL005/NSDManagement-API/files/nsdContent.yaml
 delete mode 100644 SOL005/NSDManagement-API/files/nsdContent.zip
 create mode 100644 SOL005/NSDManagement-API/files/pnfdContent.zip

diff --git a/SOL005/NSDManagement-API/environment/nsDescriptors.txt b/SOL005/NSDManagement-API/environment/nsDescriptors.txt
index 72804bd3a..b16e19ee9 100644
--- a/SOL005/NSDManagement-API/environment/nsDescriptors.txt
+++ b/SOL005/NSDManagement-API/environment/nsDescriptors.txt
@@ -1,10 +1,9 @@
 *** Variables ***
 ${POS_FIELDS}     name=nsdOnboardingState
 ${NEG_FIELDS}     wrongName=any_value
-${nsdInfoId}    	9e708376-4f96-4972-89c2-243760626f20
-${nsdInfoIdPlain}    01872c48-3631-4060-afa8-ca7cbef8a4d8
-${nsdInfoIdZip}    	01872c48-3631-4060-afa8-ca7cbef8a4d8
-${nsdDownloadableZip}   cac6ac71-0fdf-45d1-a056-775cbb8157b5
+${nsdInfoId}    5a569e1d-4ffe-4e9a-8cf6-c24226651e56
+${nsdInfoIdPlain}    5a569e1d-4ffe-4e9a-8cf6-c24226651e56
+${nsdInfoIdZip}    5a569e1d-4ffe-4e9a-8cf6-c24226651e56
 ${erroneous_nsdInfoId}  erroneous_nsdInfoId
 ${disabledNsdInfoId}  5a569e1d-4ffe-4e9a-8cf6-c24226651e56
 ${fields}    _links
@@ -20,7 +19,7 @@ ${NFVO_RANGE_OK}    1
 ${range}          bytes=0-1023
 ${erroneousRange}    bytes=100000-1000000    # Requesting a out of range number of bytes
 ${onboardingStateNsdInfoId}    b992a851-08b1-45a8-9282-a5f7a7df04a6
-${contentZipFile}    files/nsdContent.tar.gz
+${contentZipFile}    files/nsdContent.zip
 ${contentPlainFile}    files/nsdContent.yaml
 ${creatingNsdInfoId}    71241932-994a-46e2-ad6c-1740674dda44
 ${NEG_AUTHORIZATION}    Bearer negativetoken
diff --git a/SOL005/NSDManagement-API/environment/pnfDescriptors.txt b/SOL005/NSDManagement-API/environment/pnfDescriptors.txt
index 57b78b807..c3bf1896b 100644
--- a/SOL005/NSDManagement-API/environment/pnfDescriptors.txt
+++ b/SOL005/NSDManagement-API/environment/pnfDescriptors.txt
@@ -1,8 +1,7 @@
 *** Variables ***
 ${POS_FIELDS}     name=pnfdOnboardingState
 ${NEG_FIELDS}     wrongName=any_value
-${pnfdInfoId}     b227e618-cdb9-485b-8bfe-d4b8dee8e678 #used for testing downloads
-${pnfdInfoUpld}   dd7ff0f8-0e63-41b4-a572-568d0db30153 #used for testing uploads 
+${pnfdInfoId}    40853bda-8a8f-4f63-9130-cef439f65348
 ${erroneous_pnfdInfoId}  erroneous_pnfdInfoId
 ${enabledPnfdInfoId}  40853bda-8a8f-4f63-9130-cef439f65348
 ${NFVO_FIELDS}    1
@@ -11,6 +10,6 @@ ${ACCEPT_PLAIN}    text/plain
 ${CONTENT_TYPE_PLAIN}    text/plain
 ${erroneous_pnfdId}    erroneousPnfdId
 ${onboardingStatePnfdId}    8ed2bf1f-f6ae-4d18-b478-bfab02fd4cd2
-${contentFilePnfd}    files/nsdContent.yaml
+${contentFilePnfd}    files/pnfdContent.zip
 ${creatingPnfdId}    2e4ce0ef-3ea8-49f9-92dd-8771866015bb
 ${userDefinedDataSet}    some
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/environment/variables.txt b/SOL005/NSDManagement-API/environment/variables.txt
index 547e487e3..2125c869c 100644
--- a/SOL005/NSDManagement-API/environment/variables.txt
+++ b/SOL005/NSDManagement-API/environment/variables.txt
@@ -1,23 +1,23 @@
 *** Variables ***
-${NFVO_HOST}    172.21.248.145    # Hostname of the NFVO
-${NFVO_PORT}    9999    # Listening port of the NFVO
+${NFVO_HOST}    localhost    # Hostname of the NFVO
+${NFVO_PORT}    8081
 ${NFVO_SCHEMA}    https
-${AUTHORIZATION}    Bearer u5JGp5D3k7m1VUlrCa39k8WX15em149q 
+${AUTHORIZATION}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 ${CONTENT_TYPE_JSON}    application/json
 ${ACCEPT_JSON}    application/json
-${apiRoot}        /osm/
+${apiRoot}        /
 ${AUTH_USAGE}     1
 ${NEG_AUTHORIZATION}    Bearer negativetoken
 ${apiVersion}     v1
 ${apiName}        nsd
 ${FIELD_USAGE}    1
-${NFVO_AUTHENTICATION}    Bearer isDGF7TiifGUgzeNb0Fls9aatfZRy4iX #never referenced
-${NFVO_AUTH_USAGE}    1 #never refernced
+${NFVO_AUTHENTICATION}    Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9
+${NFVO_AUTH_USAGE}    1
 
 ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
 
-${callback_port}    9091
-${callback_uri}    http://172.22.1.7:${callback_port}
+${callback_port}    9191
+${callback_uri}    http://172.21.248.145
 ${callback_endpoint}    /nsd/subscriptions
 ${callback_endpoint_error}    /subs_404
 ${callback_endpoint_fwd}    /endpoint/check
diff --git a/SOL005/NSDManagement-API/files/nsdContent.yaml b/SOL005/NSDManagement-API/files/nsdContent.yaml
deleted file mode 100644
index 94b9907be..000000000
--- a/SOL005/NSDManagement-API/files/nsdContent.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-nsd:nsd-catalog:
-  nsd:
-  - constituent-vnfd: []
-    description: myNSD descriptor
-    id: myNSDRevisitedA
-    name: myNSDRevisitedA
-    short-name: myNSD
-    vendor: OSM Composer
-    version: '1.0'
-    vld:
-    - id: ns_vl_u5el
-      mgmt-network: 'true'
-      name: ns_vl_u5el
-      type: ELAN
-      vim-network-name: PUBLIC
-      vnfd-connection-point-ref: []
diff --git a/SOL005/NSDManagement-API/files/nsdContent.zip b/SOL005/NSDManagement-API/files/nsdContent.zip
deleted file mode 100644
index 7518dd85af2450c67ce648cb1a80760070040652..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 391
zcmWIWW@Zs#U}4~35U;rv@T}Tj?;-;OLpUP?g8+jJLvE#Cu!}yJ)T>O)%?S<RWMF>x
z>T4X=yRUJj72FJrEQ&zoU?MeOqaU*&&)uI~`R1%s8&##Z@OUg;8&c}D!YcNTP~k@Z
zPW=`2@$+vhu>^nl^X7Y;+|&mvS*~xr^sVMgIRn@7<BrEeR8DoMth=OGQSm>3Ng?57
zk&KE_rN{ECWgm?n<wyrk?=^7AJ#>FZO_A95@~DYS>HM$XN}sXhjrpJyW+=WnOYU8I
zujaLTMt+*=+FHMFy+7{$rkB;@_!2ga`*Zf&m`rltBlGIJ&YAt(mb|k*rvBWr%j?RF
zJg)02X5an%skCnKR)OWbf@Q({c@I{YrrJb!rw4d5GRZOH3LFWbzZn>S;l!|{5yZj_
aDpp8Pp#@WbH!B-RJtGi?0cmNF5exwIxQKxO

diff --git a/SOL005/NSDManagement-API/files/pnfdContent.zip b/SOL005/NSDManagement-API/files/pnfdContent.zip
new file mode 100644
index 0000000000000000000000000000000000000000..16151601c098de41c91ba4301540a3bfb355cbdb
GIT binary patch
literal 359
zcmV-t0hs<DiwFpY4fb9F|803rQ$#L#VQp+KbYXG;?b1O@!!Q^I;GXv@a@#30WwpcJ
zbb1ix6oy_zMs2ehY?6{>bM@Dobln&e6b}l*`#>A|eo2#lR5sJu<%taUL6gfW`UT8O
zlcXKJ<B_Fo6ve}Ibega<Wog9X;fN&>VbLF0S(h6^BBQnYYTkGC<B$6%lr1xV(IR(w
zrI%TckP!KSl0qx%gj;dt=vpn>G~|-YXKq47g(~?bBXL_HB+R0sq=qjtBAW-bXbUB`
zg%PzAT7}sEYx_u>c7`asLi?n0$q%3Hi#CoPr)#cCZ8CB@yCGvOYi+sd3dXiu_2U8S
zZ=-5|`mmL<^K~^pdmnDPgUhA#8*ulg&8uJM%!>EB(stWVD_m3i_-b-K-F>@|yEk-4
zy}Q4dT#pZ1<2$N&5&A%DEqq(sMm;|DA^-pY000000000000000004lW`T+B0f0zI$
F007z4rv?B3

literal 0
HcmV?d00001

diff --git a/SOL005/NSFaultManagement-API/environment/variables.txt b/SOL005/NSFaultManagement-API/environment/variables.txt
index f1f00fbe7..87d59d8b2 100644
--- a/SOL005/NSFaultManagement-API/environment/variables.txt
+++ b/SOL005/NSFaultManagement-API/environment/variables.txt
@@ -51,8 +51,8 @@ ${response}    {}
 ${req_mock}    {}
 ${resp_mock}    {}
 
-${callback_port}    9091
-${callback_uri}    http://172.22.1.7:${callback_port}
+${callback_port}    9191
+${callback_uri}    http://172.21.248.145
 ${callback_endpoint}    /endpoint
 ${callback_endpoint_fwd}    /endpoint/check
 ${callback_endpoint_error}    /endpoint_404
diff --git a/SOL005/NSLifecycleManagement-API/environment/variables.txt b/SOL005/NSLifecycleManagement-API/environment/variables.txt
index b9a2ab988..d58f1074f 100644
--- a/SOL005/NSLifecycleManagement-API/environment/variables.txt
+++ b/SOL005/NSLifecycleManagement-API/environment/variables.txt
@@ -1,31 +1,32 @@
 *** Variables ***
 ${VNFM_HOST}      localhost    # Hostname of the VNFM
 ${VNFM_PORT}      8080    # Listening port of the VNFM
-${NFVO_HOST}      172.21.248.145    # Hostname of the NFVO
-${NFVO_PORT}      9999    # Listening port of the NFVO
+${NFVO_HOST}      localhost    # Hostname of the NFVO
+${NFVO_PORT}      8081    # Listening port of the NFVO
 ${VNFM_SCHEMA}    https
 ${NFVO_SCHEMA}    https
 
-${AUTHORIZATION}    Bearer    v1qDEucqjIZSua6t4R40sraMZafJxEKb
+${AUTHORIZATION}    Bearer    QWxhZGRpbjpvcGVuIHNlc2FtZQ==
 ${CONTENT_TYPE}    application/json
 ${CONTENT_TYPE_PATCH}    application/merge-patch+json
 ${ACCEPT_JSON}         application/json
 ${ACCEPT}         application/json
-${apiRoot}        /osm/
+${apiRoot}        /
 ${apiName}        nslcm
 ${apiVersion}     v1
 ${AUTH_USAGE}     1
 ${WRONG_AUTHORIZATION}    Bearer    XXXXXWRONGXXXXX
-${nsdId}                9e708376-4f96-4972-89c2-243760626f20
-${disabledNsdId}        9e708376-4f96-4972-89c2-243760626f20
-${nsInstanceId}         bef2ab38-d117-4f29-bb07-0b02508575a9
+${nsInstanceId}       6fc3539c-e602-4afa-8e13-962fb5a7d81f
+${nsdId}                58a7beb6-aa89-405e-bd90-7d276b967c03
+${disabledNsdId}        fca7c896-a7d0-4ff8-865e-f5c8ee2fd1c3
+${nonExistentNsId}      nonExistent
 ${ConflictNsInstanceId}    007c111c-e602-4afa-8e13-962fb5a7d81d
 ${nsInstanceName}    Test-nsInstance
 ${nsInstanceDescription}    description ns
 ${nsInstanceDescription_Update}    Updated description ns
 ${nsFlavourId}      0
 ${nsDegreeHealing}      HEAL_RESTORE
-${vimAccountId}      46baa285-994b-4615-8fd1-84fff6e90832
+${vimAccountId}      	931f6a4d-6a97-43f3-a6f0-13853ef577ea
 ${SINGLE_FILE_VNFD}    1    # If VNFD is PLAIN TEXT
 ${ACCEPT_PLAIN}    text/plain
 ${ACCEPT_ZIP}     application/zip
@@ -33,7 +34,7 @@ ${nsPkgId_processing}    007c111c-38a1-42c0-a666-7475ecb1567c
 ${ARTIFACT_TYPE}    application/octet-stream
 ${ARTIFACT_ID}    artifactId
 ${WRONG_ACCEPT}    application/json
-${nsLcmOpOccId}    4f704476-6a4f-4473-be24-2868b94ac214
+${nsLcmOpOccId}    6fc3539c-e602-4afa-8e13-962fb5a7d81d
 ${CancelMode}    GRACEFUL
 ${NFVO_DUPLICATION}    0
 ${sub_filter}    filter
@@ -61,8 +62,8 @@ ${sleep_interval}    20s
 ${total_polling_time}   2 min
 ${polling_interval}     10 sec
 
-${notification_request}    []
-${notification_response}    []
+${notification_request}    {}
+${notification_response}    {}
 
 ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
 
@@ -73,4 +74,4 @@ ${Etag_modified}=    a modified etag
 
 ${NEG_FILTER}    attribute_not_exist=some_value
 ${NEG_SELECTOR}    fields=wrong_field
-${json}    {}
\ No newline at end of file
+${json}    {"notificationStatus": ""}
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/jsons/LccnSubscriptionRequest.json b/SOL005/NSLifecycleManagement-API/jsons/LccnSubscriptionRequest.json
index 4a6434f53..d655f7ff4 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/LccnSubscriptionRequest.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/LccnSubscriptionRequest.json
@@ -6,5 +6,5 @@
       ]
     }}
   }},
-  "callbackUri": "{callbackUri}{callbackEndpoint}"
+  "callbackUri": "{callbackUri}:{callbackPort}{callbackEndpoint}"
 }}
\ No newline at end of file
diff --git a/SOL005/NSPerformanceManagement-API/environment/IndividualPmJob.txt b/SOL005/NSPerformanceManagement-API/environment/IndividualPmJob.txt
index cde92cf92..99a00a748 100644
--- a/SOL005/NSPerformanceManagement-API/environment/IndividualPmJob.txt
+++ b/SOL005/NSPerformanceManagement-API/environment/IndividualPmJob.txt
@@ -1,5 +1,5 @@
 *** Variables ***
-${pmJobId}        1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
+${pmJobId}        29f4ff6a-be91-4ec8-856e-fcf1e2479e4e
 ${erroneousPmJobId}    erroneousPmJobId
 ${response}=    httpresponse
 ${OrigResponse}=    httpresponse
diff --git a/SOL005/NSPerformanceManagement-API/environment/notifications.txt b/SOL005/NSPerformanceManagement-API/environment/notifications.txt
index cd1193ae5..33ef78e1e 100644
--- a/SOL005/NSPerformanceManagement-API/environment/notifications.txt
+++ b/SOL005/NSPerformanceManagement-API/environment/notifications.txt
@@ -1,6 +1,6 @@
 *** Variables ***
-${callback_uri}    http://localhost
-${callback_port}    9091
+${callback_uri}    http://172.21.248.145
+${callback_port}    9191
 ${callback_endpoint}    /endpoint
 ${callback_endpoint_fwd}    /endpoint/check
 ${callback_endpoint_error}    /endpoint_404
diff --git a/SOL005/NSPerformanceManagement-API/environment/reports.txt b/SOL005/NSPerformanceManagement-API/environment/reports.txt
index 6ac5f7c0b..743cbcf1b 100644
--- a/SOL005/NSPerformanceManagement-API/environment/reports.txt
+++ b/SOL005/NSPerformanceManagement-API/environment/reports.txt
@@ -1,6 +1,6 @@
 *** Variables ***
 ${pmJobId}        1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
-${reportId}       0fb4c875-e07f-46ca-a9dd-13907667a568
+${reportId}       177bc531-1fd0-4701-a3bb-8f54c3722e05
 ${erroneousReportId}    erroneousReportId
 ${newReportId}    newReportId
 ${response}=    httpresponse
diff --git a/SOL005/NSPerformanceManagement-API/environment/variables.txt b/SOL005/NSPerformanceManagement-API/environment/variables.txt
index 6b07f6ad8..c25496880 100644
--- a/SOL005/NSPerformanceManagement-API/environment/variables.txt
+++ b/SOL005/NSPerformanceManagement-API/environment/variables.txt
@@ -1,11 +1,11 @@
 *** Variables ***
-${NFVO_HOST}      172.21.248.145    # Hostname of the NFVO
-${NFVO_PORT}      9999    # Listening port of the NFVO
+${NFVO_HOST}      localhost    # Hostname of the NFVO
+${NFVO_PORT}      8081    # Listening port of the NFVO
 ${NFVO_SCHEMA}    https
-${AUTHORIZATION}    Bearer ivwDluws6XVhdFqGznZiw8cK1wP67S9b
+${AUTHORIZATION}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 ${CONTENT_TYPE_JSON}    application/json
 ${ACCEPT_JSON}    application/json
-${apiRoot}        /osm
+${apiRoot}        /
 ${AUTH_USAGE}     1
 ${NEG_AUTHORIZATION}    Bearer negativetoken
 ${apiVersion}     v1
@@ -17,8 +17,8 @@ ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.
 
 ${testOptionalMethods}    0
 
-${callback_port}    9091
-${callback_uri}    http://172.22.1.7:${callback_port}
+${callback_port}    9191
+${callback_uri}    http://172.21.248.145
 ${callback_endpoint}    /nspm/subscriptions
 ${callback_endpoint_error}    /subs_404
 ${sleep_interval}    20s
diff --git a/SOL005/VNFPackageManagement-API/environment/individualVnfPackage.txt b/SOL005/VNFPackageManagement-API/environment/individualVnfPackage.txt
index 23b0dd07b..617d28b0f 100644
--- a/SOL005/VNFPackageManagement-API/environment/individualVnfPackage.txt
+++ b/SOL005/VNFPackageManagement-API/environment/individualVnfPackage.txt
@@ -1,5 +1,5 @@
 *** Variables ***
 ${erroneousVnfPackageId}    erroneousVnfPackageId    # Given ID for vnfPkg not present in database
-${disabledVnfPackageId}    87a2c9d3-00ea-4032-8c67-a5106d001868
-${vnfPackageId}  788106a2-d692-44f3-a86d-384f0ce35e42
-${instantiatedVnfPackageId}  0b79bab50daca910b000d4f1a2b675d604257e42
\ No newline at end of file
+${disabledVnfPackageId}    ed355ce0-6263-44d2-a4ba-bdc0f454c97d
+${vnfPackageId}  75b51c1c-c723-44ba-86b0-d67c82bc1025
+${instantiatedVnfPackageId}  	01fbfb86-0074-46e5-aa40-ef5b05f7650d
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/environment/variables.txt b/SOL005/VNFPackageManagement-API/environment/variables.txt
index 36cafcc88..01e17dede 100644
--- a/SOL005/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFPackageManagement-API/environment/variables.txt
@@ -1,12 +1,12 @@
 *** Variables ***
 
-${NFVO_HOST}      172.21.248.145    # Hostname of the NFVO
-${NFVO_PORT}      9999    # Listening port of the NFVO
+${NFVO_HOST}      localhost    # Hostname of the NFVO
+${NFVO_PORT}      8081    # Listening port of the NFVO
 ${NFVO_SCHEMA}    https
-${AUTHORIZATION}    Bearer Vr37Kbwr4eWZUNoSpWwy49mkxVmpmPWG
+${AUTHORIZATION}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 ${CONTENT_TYPE_JSON}    application/json
 ${ACCEPT_JSON}    application/json
-${apiRoot}        /osm
+${apiRoot}        /
 ${AUTH_USAGE}     1
 ${NEG_AUTHORIZATION}    Bearer negativetoken
 ${apiVersion}     v1
@@ -14,14 +14,14 @@ ${apiName}        vnfpkgm
 ${FIELD_USAGE}    1
 ${NFVO_PLAIN}     1
 ${NFVO_FIELDS}    1
-${onboardingStateVnfPkgId}    788106a2-d692-44f3-a86d-384f0ce35e42    # The VNF Package is in CREATED onboardingState
+${onboardingStateVnfPkgId}   fabe092e-5f61-48b7-8feb-aac1cb39da77   # The VNF Package is in CREATED onboardingState
 
 ${testOptionalMethods}    0
 
 ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
 
+${callback_uri}    http://localhost
 ${callback_port}    9091
-${callback_uri}    http://localhost:${callback_port}
 ${callback_endpoint}    /endpoint
 ${callback_endpoint_fwd}    /endpoint/check
 ${callback_endpoint_error}    /endpoint_404
@@ -34,4 +34,4 @@ ${NFVO_CHECKS_NOTIF_ENDPOINT}    1
 ${response}
 
 ${notification_request}    []
-${notification_response}    []
+${notification_response}    {}
diff --git a/SOL005/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt b/SOL005/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt
index 4acfbd727..9631042cc 100644
--- a/SOL005/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt
+++ b/SOL005/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt
@@ -1,8 +1,8 @@
 *** Variables ***
-${artifactPath}    artifactPath
+${artifactPath}    icons/osm.png
 ${CONTENT_TYPE_OCTET}    application/octet-stream
 ${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
 ${range}          bytes=0-1023
 ${erroneousRange}    bytes=10000000-1000000000    # Requesting a out of range number of bytes
 ${erroneousVnfPkgId}    erroneousPkgId
-${vnfPackageOctetStreamId}    octetStreamPkgId
\ No newline at end of file
+${vnfPackageOctetStreamId}    01fbfb86-0074-46e5-aa40-ef5b05f7650d
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/environment/vnfPackageContent.txt b/SOL005/VNFPackageManagement-API/environment/vnfPackageContent.txt
index c775a126d..a91c6b3b2 100644
--- a/SOL005/VNFPackageManagement-API/environment/vnfPackageContent.txt
+++ b/SOL005/VNFPackageManagement-API/environment/vnfPackageContent.txt
@@ -3,10 +3,10 @@ ${ACCEPT_ZIP}     application/zip
 ${CONTENT_TYPE_ZIP}    application/zip
 ${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
 ${erroneousVnfPkgId}    erroneousPkgId
-${vnfPkgId}       788106a2-d692-44f3-a86d-384f0ce35e42
+${vnfPkgId}       01fbfb86-0074-46e5-aa40-ef5b05f7650d
 ${erroneousRange}    bytes=100000-1000000    # Requesting a out of range number of bytes
 ${range}          bytes=0-1023
 ${length}          1024
-${creatingVnfPackageId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
-${newVnfPackageId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
+${creatingVnfPackageId}   0bd11024-090e-4c4a-ab76-0119db925803
+${newVnfPackageId}   	7f8cf59f-23d4-4f04-933e-eb33ef77246a
 
diff --git a/SOL005/VNFPackageManagement-API/environment/vnfPackageContentViaUri.txt b/SOL005/VNFPackageManagement-API/environment/vnfPackageContentViaUri.txt
index 53981f953..5954dd43a 100644
--- a/SOL005/VNFPackageManagement-API/environment/vnfPackageContentViaUri.txt
+++ b/SOL005/VNFPackageManagement-API/environment/vnfPackageContentViaUri.txt
@@ -1,4 +1,4 @@
 *** Variables ***
-${vnfPkgViaUriId}       788106a2-d692-44f3-a86d-384f0ce35e42
+${vnfPkgViaUriId}       b50f305e-69e8-488d-9531-eebcc3f848a2		
 ${creatingVnfPkgViaUriId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
 ${vnfPkgUri}        http://localhost/content.zip
diff --git a/SOL005/VNFPackageManagement-API/environment/vnfdInIndividualVnfPackage.txt b/SOL005/VNFPackageManagement-API/environment/vnfdInIndividualVnfPackage.txt
index 8e228037e..493f8d89f 100644
--- a/SOL005/VNFPackageManagement-API/environment/vnfdInIndividualVnfPackage.txt
+++ b/SOL005/VNFPackageManagement-API/environment/vnfdInIndividualVnfPackage.txt
@@ -5,8 +5,8 @@ ${CONTENT_TYPE_PLAIN}    text/plain
 ${CONTENT_TYPE_ZIP}    application/zip
 ${NFVO_VNFD_PLAIN}    1
 ${NFVO_VNFD_ZIP}    0
-${vnfPkgPlainVNFD}    c26ad7fb-072b-48c4-a663-7d71646d9e98    # The VNF Pakcage contains a VNFD which is a Single Plain File
-${vnfPkgZipVNFD}    f5b220d4-6177-4ebb-a554-a43311e16075    # The VNF Package contains a VNFD composed by multiple files
+${vnfPkgPlainVNFD}    7f8cf59f-23d4-4f04-933e-eb33ef77246a    # The VNF Pakcage contains a VNFD which is a Single Plain File
+${vnfPkgZipVNFD}    b0e6425c-3e18-4d32-8b61-fb4fe34f438b    # The VNF Package contains a VNFD composed by multiple files
 ${erroneousVnfPkgId}    erroneousPkgId
 ${onboardingStateVnfPkgId}    788106a2-d692-44f3-a86d-384f0ce35e42    # The VNF Package is in CREATED onboardingState
 ${vnfPackageId}  788106a2-d692-44f3-a86d-384f0ce35e42
diff --git a/SOL005/VNFPackageManagement-API/schemas/VnfPackageChangeNotification.schema.json b/SOL005/VNFPackageManagement-API/schemas/VnfPackageChangeNotification.schema.json
index 3ba43e8df..2932cf93f 100644
--- a/SOL005/VNFPackageManagement-API/schemas/VnfPackageChangeNotification.schema.json
+++ b/SOL005/VNFPackageManagement-API/schemas/VnfPackageChangeNotification.schema.json
@@ -1,5 +1,5 @@
 {
-  "description": "This type represents a VNF package management notification, which informs the receiver of a change of the status in an on-boarded VNF package. Only changes in the \"operationalState\" attribute of an on-boarded VNF package and the deletion of the VNF package will be reported. Change in the \"usageState\" and \"onboardingState\" attributes are not reported. The notification shall comply with the provisions defined in Table 9.5.2.9-1. The support of this notification is mandatory. The notification shall be triggered by the NFVO when there is a change in the status of an onboarded VNF package, as follows. The \"operationalState\" attribute of a VNF package has changed, and the \"onboardingState\" attribute of the package has the value \"ONBOARDED\". � The on-boarded VNF package has been deleted.\n",
+  "description": "This type represents a VNF package management notification, which informs the receiver of a change of the status in an on-boarded VNF package. Only changes in the \"operationalState\" attribute of an on-boarded VNF package and the deletion of the VNF package will be reported. Change in the \"usageState\" and \"onboardingState\" attributes are not reported. The notification shall comply with the provisions defined in Table 9.5.2.9-1. The support of this notification is mandatory. The notification shall be triggered by the NFVO when there is a change in the status of an onboarded VNF package, as follows. The \"operationalState\" attribute of a VNF package has changed, and the \"onboardingState\" attribute of the package has the value \"ONBOARDED\". The on-boarded VNF package has been deleted.\n",
   "type": "object",
   "required": [
     "id",
-- 
GitLab


From 0e6b06d691fb6b904cd989efc52f5cc0b76ce7f6 Mon Sep 17 00:00:00 2001
From: Frank Bryden <Frank.Bryden@etsi.org>
Date: Mon, 7 Sep 2020 18:14:18 +0200
Subject: [PATCH 034/322] Replayed some changes in reverse

Signed-off-by: Frank Bryden <Frank.Bryden@etsi.org>
---
 .../environment/nsDescriptors.txt             |   9 +++----
 .../environment/pnfDescriptors.txt            |   5 ++--
 .../environment/variables.txt                 |  14 +++++-----
 .../NSDManagement-API/files/nsdContent.yaml   |  16 -----------
 SOL005/NSDManagement-API/files/nsdContent.zip | Bin 391 -> 0 bytes
 .../NSDManagement-API/files/pnfdContent.zip   | Bin 0 -> 359 bytes
 .../environment/variables.txt                 |  10 +++----
 .../environment/variables.txt                 |  25 +++++++++---------
 .../jsons/LccnSubscriptionRequest.json        |   2 +-
 .../environment/IndividualPmJob.txt           |   2 +-
 .../environment/notifications.txt             |   4 +--
 .../environment/reports.txt                   |   2 +-
 .../environment/variables.txt                 |   8 +++---
 .../environment/individualVnfPackage.txt      |   6 ++---
 .../environment/variables.txt                 |  14 +++++-----
 .../environment/vnfPackageArtifacts.txt       |   4 +--
 .../environment/vnfPackageContent.txt         |   2 +-
 .../environment/vnfPackageContentViaUri.txt   |   2 +-
 .../VnfPackageChangeNotification.schema.json  |   2 +-
 19 files changed, 55 insertions(+), 72 deletions(-)
 delete mode 100644 SOL005/NSDManagement-API/files/nsdContent.yaml
 delete mode 100644 SOL005/NSDManagement-API/files/nsdContent.zip
 create mode 100644 SOL005/NSDManagement-API/files/pnfdContent.zip

diff --git a/SOL005/NSDManagement-API/environment/nsDescriptors.txt b/SOL005/NSDManagement-API/environment/nsDescriptors.txt
index 72804bd3a..b16e19ee9 100644
--- a/SOL005/NSDManagement-API/environment/nsDescriptors.txt
+++ b/SOL005/NSDManagement-API/environment/nsDescriptors.txt
@@ -1,10 +1,9 @@
 *** Variables ***
 ${POS_FIELDS}     name=nsdOnboardingState
 ${NEG_FIELDS}     wrongName=any_value
-${nsdInfoId}    	9e708376-4f96-4972-89c2-243760626f20
-${nsdInfoIdPlain}    01872c48-3631-4060-afa8-ca7cbef8a4d8
-${nsdInfoIdZip}    	01872c48-3631-4060-afa8-ca7cbef8a4d8
-${nsdDownloadableZip}   cac6ac71-0fdf-45d1-a056-775cbb8157b5
+${nsdInfoId}    5a569e1d-4ffe-4e9a-8cf6-c24226651e56
+${nsdInfoIdPlain}    5a569e1d-4ffe-4e9a-8cf6-c24226651e56
+${nsdInfoIdZip}    5a569e1d-4ffe-4e9a-8cf6-c24226651e56
 ${erroneous_nsdInfoId}  erroneous_nsdInfoId
 ${disabledNsdInfoId}  5a569e1d-4ffe-4e9a-8cf6-c24226651e56
 ${fields}    _links
@@ -20,7 +19,7 @@ ${NFVO_RANGE_OK}    1
 ${range}          bytes=0-1023
 ${erroneousRange}    bytes=100000-1000000    # Requesting a out of range number of bytes
 ${onboardingStateNsdInfoId}    b992a851-08b1-45a8-9282-a5f7a7df04a6
-${contentZipFile}    files/nsdContent.tar.gz
+${contentZipFile}    files/nsdContent.zip
 ${contentPlainFile}    files/nsdContent.yaml
 ${creatingNsdInfoId}    71241932-994a-46e2-ad6c-1740674dda44
 ${NEG_AUTHORIZATION}    Bearer negativetoken
diff --git a/SOL005/NSDManagement-API/environment/pnfDescriptors.txt b/SOL005/NSDManagement-API/environment/pnfDescriptors.txt
index 57b78b807..c3bf1896b 100644
--- a/SOL005/NSDManagement-API/environment/pnfDescriptors.txt
+++ b/SOL005/NSDManagement-API/environment/pnfDescriptors.txt
@@ -1,8 +1,7 @@
 *** Variables ***
 ${POS_FIELDS}     name=pnfdOnboardingState
 ${NEG_FIELDS}     wrongName=any_value
-${pnfdInfoId}     b227e618-cdb9-485b-8bfe-d4b8dee8e678 #used for testing downloads
-${pnfdInfoUpld}   dd7ff0f8-0e63-41b4-a572-568d0db30153 #used for testing uploads 
+${pnfdInfoId}    40853bda-8a8f-4f63-9130-cef439f65348
 ${erroneous_pnfdInfoId}  erroneous_pnfdInfoId
 ${enabledPnfdInfoId}  40853bda-8a8f-4f63-9130-cef439f65348
 ${NFVO_FIELDS}    1
@@ -11,6 +10,6 @@ ${ACCEPT_PLAIN}    text/plain
 ${CONTENT_TYPE_PLAIN}    text/plain
 ${erroneous_pnfdId}    erroneousPnfdId
 ${onboardingStatePnfdId}    8ed2bf1f-f6ae-4d18-b478-bfab02fd4cd2
-${contentFilePnfd}    files/nsdContent.yaml
+${contentFilePnfd}    files/pnfdContent.zip
 ${creatingPnfdId}    2e4ce0ef-3ea8-49f9-92dd-8771866015bb
 ${userDefinedDataSet}    some
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/environment/variables.txt b/SOL005/NSDManagement-API/environment/variables.txt
index 547e487e3..fec623ced 100644
--- a/SOL005/NSDManagement-API/environment/variables.txt
+++ b/SOL005/NSDManagement-API/environment/variables.txt
@@ -1,23 +1,23 @@
 *** Variables ***
-${NFVO_HOST}    172.21.248.145    # Hostname of the NFVO
-${NFVO_PORT}    9999    # Listening port of the NFVO
+${NFVO_HOST}    localhost    # Hostname of the NFVO
+${NFVO_PORT}    8081    # Listening port of the NFVO
 ${NFVO_SCHEMA}    https
-${AUTHORIZATION}    Bearer u5JGp5D3k7m1VUlrCa39k8WX15em149q 
+${AUTHORIZATION}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 ${CONTENT_TYPE_JSON}    application/json
 ${ACCEPT_JSON}    application/json
-${apiRoot}        /osm/
+${apiRoot}        /
 ${AUTH_USAGE}     1
 ${NEG_AUTHORIZATION}    Bearer negativetoken
 ${apiVersion}     v1
 ${apiName}        nsd
 ${FIELD_USAGE}    1
-${NFVO_AUTHENTICATION}    Bearer isDGF7TiifGUgzeNb0Fls9aatfZRy4iX #never referenced
-${NFVO_AUTH_USAGE}    1 #never refernced
+${NFVO_AUTHENTICATION}    Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9
+${NFVO_AUTH_USAGE}    1
 
 ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
 
 ${callback_port}    9091
-${callback_uri}    http://172.22.1.7:${callback_port}
+${callback_uri}    http://172.21.248.145
 ${callback_endpoint}    /nsd/subscriptions
 ${callback_endpoint_error}    /subs_404
 ${callback_endpoint_fwd}    /endpoint/check
diff --git a/SOL005/NSDManagement-API/files/nsdContent.yaml b/SOL005/NSDManagement-API/files/nsdContent.yaml
deleted file mode 100644
index 94b9907be..000000000
--- a/SOL005/NSDManagement-API/files/nsdContent.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-nsd:nsd-catalog:
-  nsd:
-  - constituent-vnfd: []
-    description: myNSD descriptor
-    id: myNSDRevisitedA
-    name: myNSDRevisitedA
-    short-name: myNSD
-    vendor: OSM Composer
-    version: '1.0'
-    vld:
-    - id: ns_vl_u5el
-      mgmt-network: 'true'
-      name: ns_vl_u5el
-      type: ELAN
-      vim-network-name: PUBLIC
-      vnfd-connection-point-ref: []
diff --git a/SOL005/NSDManagement-API/files/nsdContent.zip b/SOL005/NSDManagement-API/files/nsdContent.zip
deleted file mode 100644
index 7518dd85af2450c67ce648cb1a80760070040652..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 391
zcmWIWW@Zs#U}4~35U;rv@T}Tj?;-;OLpUP?g8+jJLvE#Cu!}yJ)T>O)%?S<RWMF>x
z>T4X=yRUJj72FJrEQ&zoU?MeOqaU*&&)uI~`R1%s8&##Z@OUg;8&c}D!YcNTP~k@Z
zPW=`2@$+vhu>^nl^X7Y;+|&mvS*~xr^sVMgIRn@7<BrEeR8DoMth=OGQSm>3Ng?57
zk&KE_rN{ECWgm?n<wyrk?=^7AJ#>FZO_A95@~DYS>HM$XN}sXhjrpJyW+=WnOYU8I
zujaLTMt+*=+FHMFy+7{$rkB;@_!2ga`*Zf&m`rltBlGIJ&YAt(mb|k*rvBWr%j?RF
zJg)02X5an%skCnKR)OWbf@Q({c@I{YrrJb!rw4d5GRZOH3LFWbzZn>S;l!|{5yZj_
aDpp8Pp#@WbH!B-RJtGi?0cmNF5exwIxQKxO

diff --git a/SOL005/NSDManagement-API/files/pnfdContent.zip b/SOL005/NSDManagement-API/files/pnfdContent.zip
new file mode 100644
index 0000000000000000000000000000000000000000..16151601c098de41c91ba4301540a3bfb355cbdb
GIT binary patch
literal 359
zcmV-t0hs<DiwFpY4fb9F|803rQ$#L#VQp+KbYXG;?b1O@!!Q^I;GXv@a@#30WwpcJ
zbb1ix6oy_zMs2ehY?6{>bM@Dobln&e6b}l*`#>A|eo2#lR5sJu<%taUL6gfW`UT8O
zlcXKJ<B_Fo6ve}Ibega<Wog9X;fN&>VbLF0S(h6^BBQnYYTkGC<B$6%lr1xV(IR(w
zrI%TckP!KSl0qx%gj;dt=vpn>G~|-YXKq47g(~?bBXL_HB+R0sq=qjtBAW-bXbUB`
zg%PzAT7}sEYx_u>c7`asLi?n0$q%3Hi#CoPr)#cCZ8CB@yCGvOYi+sd3dXiu_2U8S
zZ=-5|`mmL<^K~^pdmnDPgUhA#8*ulg&8uJM%!>EB(stWVD_m3i_-b-K-F>@|yEk-4
zy}Q4dT#pZ1<2$N&5&A%DEqq(sMm;|DA^-pY000000000000000004lW`T+B0f0zI$
F007z4rv?B3

literal 0
HcmV?d00001

diff --git a/SOL005/NSFaultManagement-API/environment/variables.txt b/SOL005/NSFaultManagement-API/environment/variables.txt
index f1f00fbe7..7f86938c5 100644
--- a/SOL005/NSFaultManagement-API/environment/variables.txt
+++ b/SOL005/NSFaultManagement-API/environment/variables.txt
@@ -1,15 +1,15 @@
 *** Variables ***
-${NFVO_HOST}      172.21.248.145    # Hostname of the VNFM
-${NFVO_PORT}      9999    # Listening port of the VNFM
+${NFVO_HOST}      localhost    # Hostname of the VNFM
+${NFVO_PORT}      8080    # Listening port of the VNFM
 ${NFVO_SCHEMA}    https
-${AUTHORIZATION}    Bearer    7EiP8HbWqpAaWVcZojq5WGm8theaCiym
+${AUTHORIZATION}    Bearer    QWxhZGRpbjpvcGVuIHNlc2FtZQ==
 ${ACCEPT}         application/json
 ${ACCEPT_JSON}         application/json
 ${AUTH_USAGE}     1
 ${alarm_filter}       nsInstanceId
 ${nsInstanceId}    007c111c-38a1-42c0-a666-7475ecb1567c
 ${invalid_alarm_filter}    badFilter 
-${apiRoot}        /osm
+${apiRoot}        /
 ${apiName}        nsfm
 ${apiVersion}     v1
 ${CONTENT_TYPE}    application/json
@@ -51,8 +51,8 @@ ${response}    {}
 ${req_mock}    {}
 ${resp_mock}    {}
 
+${callback_uri}    http://localhost
 ${callback_port}    9091
-${callback_uri}    http://172.22.1.7:${callback_port}
 ${callback_endpoint}    /endpoint
 ${callback_endpoint_fwd}    /endpoint/check
 ${callback_endpoint_error}    /endpoint_404
diff --git a/SOL005/NSLifecycleManagement-API/environment/variables.txt b/SOL005/NSLifecycleManagement-API/environment/variables.txt
index b9a2ab988..d58f1074f 100644
--- a/SOL005/NSLifecycleManagement-API/environment/variables.txt
+++ b/SOL005/NSLifecycleManagement-API/environment/variables.txt
@@ -1,31 +1,32 @@
 *** Variables ***
 ${VNFM_HOST}      localhost    # Hostname of the VNFM
 ${VNFM_PORT}      8080    # Listening port of the VNFM
-${NFVO_HOST}      172.21.248.145    # Hostname of the NFVO
-${NFVO_PORT}      9999    # Listening port of the NFVO
+${NFVO_HOST}      localhost    # Hostname of the NFVO
+${NFVO_PORT}      8081    # Listening port of the NFVO
 ${VNFM_SCHEMA}    https
 ${NFVO_SCHEMA}    https
 
-${AUTHORIZATION}    Bearer    v1qDEucqjIZSua6t4R40sraMZafJxEKb
+${AUTHORIZATION}    Bearer    QWxhZGRpbjpvcGVuIHNlc2FtZQ==
 ${CONTENT_TYPE}    application/json
 ${CONTENT_TYPE_PATCH}    application/merge-patch+json
 ${ACCEPT_JSON}         application/json
 ${ACCEPT}         application/json
-${apiRoot}        /osm/
+${apiRoot}        /
 ${apiName}        nslcm
 ${apiVersion}     v1
 ${AUTH_USAGE}     1
 ${WRONG_AUTHORIZATION}    Bearer    XXXXXWRONGXXXXX
-${nsdId}                9e708376-4f96-4972-89c2-243760626f20
-${disabledNsdId}        9e708376-4f96-4972-89c2-243760626f20
-${nsInstanceId}         bef2ab38-d117-4f29-bb07-0b02508575a9
+${nsInstanceId}       6fc3539c-e602-4afa-8e13-962fb5a7d81f
+${nsdId}                58a7beb6-aa89-405e-bd90-7d276b967c03
+${disabledNsdId}        fca7c896-a7d0-4ff8-865e-f5c8ee2fd1c3
+${nonExistentNsId}      nonExistent
 ${ConflictNsInstanceId}    007c111c-e602-4afa-8e13-962fb5a7d81d
 ${nsInstanceName}    Test-nsInstance
 ${nsInstanceDescription}    description ns
 ${nsInstanceDescription_Update}    Updated description ns
 ${nsFlavourId}      0
 ${nsDegreeHealing}      HEAL_RESTORE
-${vimAccountId}      46baa285-994b-4615-8fd1-84fff6e90832
+${vimAccountId}      	931f6a4d-6a97-43f3-a6f0-13853ef577ea
 ${SINGLE_FILE_VNFD}    1    # If VNFD is PLAIN TEXT
 ${ACCEPT_PLAIN}    text/plain
 ${ACCEPT_ZIP}     application/zip
@@ -33,7 +34,7 @@ ${nsPkgId_processing}    007c111c-38a1-42c0-a666-7475ecb1567c
 ${ARTIFACT_TYPE}    application/octet-stream
 ${ARTIFACT_ID}    artifactId
 ${WRONG_ACCEPT}    application/json
-${nsLcmOpOccId}    4f704476-6a4f-4473-be24-2868b94ac214
+${nsLcmOpOccId}    6fc3539c-e602-4afa-8e13-962fb5a7d81d
 ${CancelMode}    GRACEFUL
 ${NFVO_DUPLICATION}    0
 ${sub_filter}    filter
@@ -61,8 +62,8 @@ ${sleep_interval}    20s
 ${total_polling_time}   2 min
 ${polling_interval}     10 sec
 
-${notification_request}    []
-${notification_response}    []
+${notification_request}    {}
+${notification_response}    {}
 
 ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
 
@@ -73,4 +74,4 @@ ${Etag_modified}=    a modified etag
 
 ${NEG_FILTER}    attribute_not_exist=some_value
 ${NEG_SELECTOR}    fields=wrong_field
-${json}    {}
\ No newline at end of file
+${json}    {"notificationStatus": ""}
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/jsons/LccnSubscriptionRequest.json b/SOL005/NSLifecycleManagement-API/jsons/LccnSubscriptionRequest.json
index 4a6434f53..d655f7ff4 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/LccnSubscriptionRequest.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/LccnSubscriptionRequest.json
@@ -6,5 +6,5 @@
       ]
     }}
   }},
-  "callbackUri": "{callbackUri}{callbackEndpoint}"
+  "callbackUri": "{callbackUri}:{callbackPort}{callbackEndpoint}"
 }}
\ No newline at end of file
diff --git a/SOL005/NSPerformanceManagement-API/environment/IndividualPmJob.txt b/SOL005/NSPerformanceManagement-API/environment/IndividualPmJob.txt
index cde92cf92..99a00a748 100644
--- a/SOL005/NSPerformanceManagement-API/environment/IndividualPmJob.txt
+++ b/SOL005/NSPerformanceManagement-API/environment/IndividualPmJob.txt
@@ -1,5 +1,5 @@
 *** Variables ***
-${pmJobId}        1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
+${pmJobId}        29f4ff6a-be91-4ec8-856e-fcf1e2479e4e
 ${erroneousPmJobId}    erroneousPmJobId
 ${response}=    httpresponse
 ${OrigResponse}=    httpresponse
diff --git a/SOL005/NSPerformanceManagement-API/environment/notifications.txt b/SOL005/NSPerformanceManagement-API/environment/notifications.txt
index cd1193ae5..33ef78e1e 100644
--- a/SOL005/NSPerformanceManagement-API/environment/notifications.txt
+++ b/SOL005/NSPerformanceManagement-API/environment/notifications.txt
@@ -1,6 +1,6 @@
 *** Variables ***
-${callback_uri}    http://localhost
-${callback_port}    9091
+${callback_uri}    http://172.21.248.145
+${callback_port}    9191
 ${callback_endpoint}    /endpoint
 ${callback_endpoint_fwd}    /endpoint/check
 ${callback_endpoint_error}    /endpoint_404
diff --git a/SOL005/NSPerformanceManagement-API/environment/reports.txt b/SOL005/NSPerformanceManagement-API/environment/reports.txt
index 6ac5f7c0b..66d8761ae 100644
--- a/SOL005/NSPerformanceManagement-API/environment/reports.txt
+++ b/SOL005/NSPerformanceManagement-API/environment/reports.txt
@@ -1,6 +1,6 @@
 *** Variables ***
-${pmJobId}        1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
 ${reportId}       0fb4c875-e07f-46ca-a9dd-13907667a568
+${reportId}       177bc531-1fd0-4701-a3bb-8f54c3722e05
 ${erroneousReportId}    erroneousReportId
 ${newReportId}    newReportId
 ${response}=    httpresponse
diff --git a/SOL005/NSPerformanceManagement-API/environment/variables.txt b/SOL005/NSPerformanceManagement-API/environment/variables.txt
index 6b07f6ad8..ca012fa80 100644
--- a/SOL005/NSPerformanceManagement-API/environment/variables.txt
+++ b/SOL005/NSPerformanceManagement-API/environment/variables.txt
@@ -1,11 +1,11 @@
 *** Variables ***
-${NFVO_HOST}      172.21.248.145    # Hostname of the NFVO
-${NFVO_PORT}      9999    # Listening port of the NFVO
+${NFVO_HOST}      localhost    # Hostname of the NFVO
+${NFVO_PORT}      8081    # Listening port of the NFVO
 ${NFVO_SCHEMA}    https
-${AUTHORIZATION}    Bearer ivwDluws6XVhdFqGznZiw8cK1wP67S9b
+${AUTHORIZATION}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 ${CONTENT_TYPE_JSON}    application/json
 ${ACCEPT_JSON}    application/json
-${apiRoot}        /osm
+${apiRoot}        /
 ${AUTH_USAGE}     1
 ${NEG_AUTHORIZATION}    Bearer negativetoken
 ${apiVersion}     v1
diff --git a/SOL005/VNFPackageManagement-API/environment/individualVnfPackage.txt b/SOL005/VNFPackageManagement-API/environment/individualVnfPackage.txt
index 23b0dd07b..617d28b0f 100644
--- a/SOL005/VNFPackageManagement-API/environment/individualVnfPackage.txt
+++ b/SOL005/VNFPackageManagement-API/environment/individualVnfPackage.txt
@@ -1,5 +1,5 @@
 *** Variables ***
 ${erroneousVnfPackageId}    erroneousVnfPackageId    # Given ID for vnfPkg not present in database
-${disabledVnfPackageId}    87a2c9d3-00ea-4032-8c67-a5106d001868
-${vnfPackageId}  788106a2-d692-44f3-a86d-384f0ce35e42
-${instantiatedVnfPackageId}  0b79bab50daca910b000d4f1a2b675d604257e42
\ No newline at end of file
+${disabledVnfPackageId}    ed355ce0-6263-44d2-a4ba-bdc0f454c97d
+${vnfPackageId}  75b51c1c-c723-44ba-86b0-d67c82bc1025
+${instantiatedVnfPackageId}  	01fbfb86-0074-46e5-aa40-ef5b05f7650d
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/environment/variables.txt b/SOL005/VNFPackageManagement-API/environment/variables.txt
index 36cafcc88..01e17dede 100644
--- a/SOL005/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFPackageManagement-API/environment/variables.txt
@@ -1,12 +1,12 @@
 *** Variables ***
 
-${NFVO_HOST}      172.21.248.145    # Hostname of the NFVO
-${NFVO_PORT}      9999    # Listening port of the NFVO
+${NFVO_HOST}      localhost    # Hostname of the NFVO
+${NFVO_PORT}      8081    # Listening port of the NFVO
 ${NFVO_SCHEMA}    https
-${AUTHORIZATION}    Bearer Vr37Kbwr4eWZUNoSpWwy49mkxVmpmPWG
+${AUTHORIZATION}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 ${CONTENT_TYPE_JSON}    application/json
 ${ACCEPT_JSON}    application/json
-${apiRoot}        /osm
+${apiRoot}        /
 ${AUTH_USAGE}     1
 ${NEG_AUTHORIZATION}    Bearer negativetoken
 ${apiVersion}     v1
@@ -14,14 +14,14 @@ ${apiName}        vnfpkgm
 ${FIELD_USAGE}    1
 ${NFVO_PLAIN}     1
 ${NFVO_FIELDS}    1
-${onboardingStateVnfPkgId}    788106a2-d692-44f3-a86d-384f0ce35e42    # The VNF Package is in CREATED onboardingState
+${onboardingStateVnfPkgId}   fabe092e-5f61-48b7-8feb-aac1cb39da77   # The VNF Package is in CREATED onboardingState
 
 ${testOptionalMethods}    0
 
 ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
 
+${callback_uri}    http://localhost
 ${callback_port}    9091
-${callback_uri}    http://localhost:${callback_port}
 ${callback_endpoint}    /endpoint
 ${callback_endpoint_fwd}    /endpoint/check
 ${callback_endpoint_error}    /endpoint_404
@@ -34,4 +34,4 @@ ${NFVO_CHECKS_NOTIF_ENDPOINT}    1
 ${response}
 
 ${notification_request}    []
-${notification_response}    []
+${notification_response}    {}
diff --git a/SOL005/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt b/SOL005/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt
index 4acfbd727..9631042cc 100644
--- a/SOL005/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt
+++ b/SOL005/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt
@@ -1,8 +1,8 @@
 *** Variables ***
-${artifactPath}    artifactPath
+${artifactPath}    icons/osm.png
 ${CONTENT_TYPE_OCTET}    application/octet-stream
 ${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
 ${range}          bytes=0-1023
 ${erroneousRange}    bytes=10000000-1000000000    # Requesting a out of range number of bytes
 ${erroneousVnfPkgId}    erroneousPkgId
-${vnfPackageOctetStreamId}    octetStreamPkgId
\ No newline at end of file
+${vnfPackageOctetStreamId}    01fbfb86-0074-46e5-aa40-ef5b05f7650d
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/environment/vnfPackageContent.txt b/SOL005/VNFPackageManagement-API/environment/vnfPackageContent.txt
index c775a126d..18bad0ece 100644
--- a/SOL005/VNFPackageManagement-API/environment/vnfPackageContent.txt
+++ b/SOL005/VNFPackageManagement-API/environment/vnfPackageContent.txt
@@ -3,7 +3,7 @@ ${ACCEPT_ZIP}     application/zip
 ${CONTENT_TYPE_ZIP}    application/zip
 ${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
 ${erroneousVnfPkgId}    erroneousPkgId
-${vnfPkgId}       788106a2-d692-44f3-a86d-384f0ce35e42
+${vnfPkgId}       01fbfb86-0074-46e5-aa40-ef5b05f7650d
 ${erroneousRange}    bytes=100000-1000000    # Requesting a out of range number of bytes
 ${range}          bytes=0-1023
 ${length}          1024
diff --git a/SOL005/VNFPackageManagement-API/environment/vnfPackageContentViaUri.txt b/SOL005/VNFPackageManagement-API/environment/vnfPackageContentViaUri.txt
index 53981f953..c0f12465d 100644
--- a/SOL005/VNFPackageManagement-API/environment/vnfPackageContentViaUri.txt
+++ b/SOL005/VNFPackageManagement-API/environment/vnfPackageContentViaUri.txt
@@ -1,4 +1,4 @@
 *** Variables ***
-${vnfPkgViaUriId}       788106a2-d692-44f3-a86d-384f0ce35e42
+${vnfPkgViaUriId}       788106a2-d692-44f3-a86d-384f0ce35e42		
 ${creatingVnfPkgViaUriId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
 ${vnfPkgUri}        http://localhost/content.zip
diff --git a/SOL005/VNFPackageManagement-API/schemas/VnfPackageChangeNotification.schema.json b/SOL005/VNFPackageManagement-API/schemas/VnfPackageChangeNotification.schema.json
index 3ba43e8df..2932cf93f 100644
--- a/SOL005/VNFPackageManagement-API/schemas/VnfPackageChangeNotification.schema.json
+++ b/SOL005/VNFPackageManagement-API/schemas/VnfPackageChangeNotification.schema.json
@@ -1,5 +1,5 @@
 {
-  "description": "This type represents a VNF package management notification, which informs the receiver of a change of the status in an on-boarded VNF package. Only changes in the \"operationalState\" attribute of an on-boarded VNF package and the deletion of the VNF package will be reported. Change in the \"usageState\" and \"onboardingState\" attributes are not reported. The notification shall comply with the provisions defined in Table 9.5.2.9-1. The support of this notification is mandatory. The notification shall be triggered by the NFVO when there is a change in the status of an onboarded VNF package, as follows. The \"operationalState\" attribute of a VNF package has changed, and the \"onboardingState\" attribute of the package has the value \"ONBOARDED\". � The on-boarded VNF package has been deleted.\n",
+  "description": "This type represents a VNF package management notification, which informs the receiver of a change of the status in an on-boarded VNF package. Only changes in the \"operationalState\" attribute of an on-boarded VNF package and the deletion of the VNF package will be reported. Change in the \"usageState\" and \"onboardingState\" attributes are not reported. The notification shall comply with the provisions defined in Table 9.5.2.9-1. The support of this notification is mandatory. The notification shall be triggered by the NFVO when there is a change in the status of an onboarded VNF package, as follows. The \"operationalState\" attribute of a VNF package has changed, and the \"onboardingState\" attribute of the package has the value \"ONBOARDED\". The on-boarded VNF package has been deleted.\n",
   "type": "object",
   "required": [
     "id",
-- 
GitLab


From da3aeb89d4dfa097d50019c5b2f1b3da09e7032a Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 8 Sep 2020 12:29:33 +0500
Subject: [PATCH 035/322] new test cases added in VNFpackageArtifact

---
 .../VNFPackageArtifacts.robot                 | 77 +++++++++++++++++++
 .../VNFPackageManagementKeywords.robot        | 46 +++++++++++
 .../environment/vnfPackageArtifacts.txt       |  1 +
 3 files changed, 124 insertions(+)

diff --git a/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot b/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot
index d4b7ce998..b505314c8 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot
@@ -281,3 +281,80 @@ DELETE Individual OnBoarded VNF Package Artifact - Method not implemented
     Check HTTP Response Status Code Is    405
     Check Postcondition OnBoarded VNF Package Artifact Exist
 
+GET Individual VNF Package Artifact with security information
+    [Documentation]    Test ID: 7.3.3.5.23
+    ...    Test title: GET Individual VNF Package Artifact with security information
+    ...    Test objective: The objective is to test the retrieval of an individual VNF package artifact shall include in the ZIP archive the security information when requested with "include_signature" parameter 
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NFVO cannot determine the content type of the artifact
+    ...    Post-Conditions: none
+    GET Individual VNF Package Artifact with security information
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+
+GET Individual OnBoarded VNF Package Artifact with security information
+    [Documentation]    Test ID: 7.3.3.5.24
+    ...    Test title: GET Individual OnBoarded VNF Package Artifact with security information
+    ...    Test objective: The objective is to test the retrieval of an individual OnBoarded VNF package artifact shall include in the ZIP archive the security information when requested with "include_signature" parameter 
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NFVO cannot determine the content type of the artifact
+    ...    Post-Conditions: none
+    GET Individual OnBoarded VNF Package Artifact with security information 
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+GET Individual VNF Package Artifact with encrypted artifact
+    [Documentation]    Test ID: 7.3.3.5.25
+    ...    Test title: GET Individual VNF Package Artifact with encrypted artifact
+    ...    Test objective: The objective is to test the retrieval of an individual VNF package artifact shall include an encrypted artifact 
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NFVO cannot determine the content type of the artifact
+    ...    Post-Conditions: none
+    GET Individual VNF Package Artifact with encrypted artifact
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/cms
+
+GET Individual OnBoarded VNF Package Artifact with encrypted artifact
+    [Documentation]    Test ID: 7.3.3.5.26
+    ...    Test title: GET Individual OnBoarded VNF Package Artifact with encrypted artifact
+    ...    Test objective: The objective is to test the retrieval of an individual OnBoarded VNF package artifact shall include an encrypted artifact 
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NFVO cannot determine the content type of the artifact
+    ...    Post-Conditions: none
+    GET Individual OnBoarded VNF Package Artifact with encrypted artifact 
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/cms
+    
+GET Individual VNF Package Artifact - Not Acceptable
+    [Documentation]    Test ID: 7.3.3.5.27
+    ...    Test title: GET Individual VNF Package Artifact with invalid Range Request
+    ...    Test objective: The objective is to test that the retrieval of an individual VNF package artifact fails when related request contained an "Accept" header not compatible with the Content type "application/zip" but the "include_signatures" flag was provided
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none      
+    GET Individual VNF Package Artifact with incompatable header
+    Check HTTP Response Status Code Is    406
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+GET Individual OnBoarded VNF Package Artifact - Not Acceptable
+    [Documentation]    Test ID: 7.3.3.5.28
+    ...    Test title: GET Individual OnBoarded VNF Package Artifact with invalid Range Request
+    ...    Test objective: The objective is to test that the retrieval of an individual OnBoarded VNF package artifact fails when related request contained an "Accept" header not compatible with the Content type "application/zip" but the "include_signatures" flag was provided
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none      
+    GET Individual OnBoarded VNF Package Artifact with incompatable header
+    Check HTTP Response Status Code Is    406
+    Check HTTP Response Body Json Schema Is   ProblemDetails
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index d802fe53a..4c351fada 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -1166,3 +1166,49 @@ Get multi file VNFD in Individual VNF Package with security information
     GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
+    
+GET Individual VNF Package Artifact with security information 
+    Log    Trying to get a VNF Package Artifact
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vndId}/artifacts/${artifactPath}/include_signatures
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+GET Individual OnBoarded VNF Package Artifact with security information  
+    Log    Trying to get a VNF Package Artifact
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}/include_signatures
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+GET Individual VNF Package Artifact with encrypted artifact
+    Log    Trying to get a VNF Package Artifact
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vndEncryptedArtifactID}/artifacts/${artifactPath}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+GET Individual OnBoarded VNF Package Artifact with encrypted artifact
+    Log    Trying to get a VNF Package Artifact
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndEncryptedArtifactID}/artifacts/${artifactPath}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+GET Individual VNF Package Artifact with incompatable header
+    Log    Trying to get a VNF Package Artifact
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vndId}/artifacts/${artifactPath}/include_signatures
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+GET Individual OnBoarded VNF Package Artifact with incompatable header  
+    Log    Trying to get a VNF Package Artifact
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}/include_signatures
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt b/SOL003/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt
index d18ef5961..9560a81a2 100644
--- a/SOL003/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt
+++ b/SOL003/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt
@@ -7,3 +7,4 @@ ${erroneousRange}    bytes=10000000-1000000000    # Requesting a out of range nu
 ${erroneousVnfPkgId}    erroneousPkgId
 ${vnfPackageOctetStreamId}    octetStreamPkgId
 ${vnfdOctetStreamId}    octetStreamVnfdId
+${vndEncryptedArtifactID}    encryptedId
\ No newline at end of file
-- 
GitLab


From 08d342f011b7c884682651eec578afdba208a213 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 8 Sep 2020 12:34:34 +0500
Subject: [PATCH 036/322] new test case added for subscription

---
 SOL003/VNFPackageManagement-API/Subscriptions.robot | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/SOL003/VNFPackageManagement-API/Subscriptions.robot b/SOL003/VNFPackageManagement-API/Subscriptions.robot
index bc60615dc..84f5e5242 100644
--- a/SOL003/VNFPackageManagement-API/Subscriptions.robot
+++ b/SOL003/VNFPackageManagement-API/Subscriptions.robot
@@ -176,4 +176,17 @@ Get VNF Package Subscriptions - Bad Request Response too Big
     ...    Post-Conditions: none
     Get all VNF Package Subscriptions
     Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+Get VNF Package Subscriptions - Unprocessable Entity
+    [Documentation]    Test ID: 7.3.3.6.13
+    ...    Test title: Get VNF Package Subscriptions - Unprocessable Entity
+    ...    Test objective: The objective is to test that content type of the payload body is supported and the payload body of a request contains syntactically correct data but the data cannot be processed., and perform the JSON schema validation of the failed operation HTTP response. 
+    ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
+    ...    Reference: Clause 10.4.7.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get all VNF Package Subscriptions
+    Check HTTP Response Status Code Is    422
     Check HTTP Response Body Json Schema Is   ProblemDetails
\ No newline at end of file
-- 
GitLab


From e70762eead03e0e842f6d040135c0c185edc17eb Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 9 Sep 2020 16:21:18 +0500
Subject: [PATCH 037/322] added new resource ManifestInIndividualVNFPackage

---
 .../ManifestInIndividualVNFPackage.robot      | 208 ++++++++++++++++++
 .../VNFPackageManagementKeywords.robot        | 118 +++++++++-
 2 files changed, 325 insertions(+), 1 deletion(-)
 create mode 100644 SOL003/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot

diff --git a/SOL003/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot b/SOL003/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot
new file mode 100644
index 000000000..7651a8e81
--- /dev/null
+++ b/SOL003/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot
@@ -0,0 +1,208 @@
+*** Settings ***
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt
+Resource          VNFPackageManagementKeywords.robot 
+Library           JSONLibrary
+Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+
+*** Test Cases ***
+Get Manifest in Individual VNF Package
+    [Documentation]    Test ID: 7.3.3.9.1
+    ...    Test title: Get Manifest in Individual VNF Package
+    ...    Test objective: The objective is to test that the Get request read the content of manifest within a NVF Package and perform a validation that returned content is in plain text format
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Manifest in Individual VNF Package
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    text/plain
+    
+Get Manifest in Individual VNF Package with security information
+    [Documentation]    Test ID: 7.3.3.9.2
+    ...    Test title: Get Manifest in Individual VNF Package with security information
+    ...    Test objective: The objective is to test the retrieval of manifest for an individual VNF package shall also security certificates when requested with "include_signature" parameter, and perform a validation that returned content is in Zip format
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Manifest in Individual VNF Package with security information
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get Manifest in Individual VNF Package - Not acceptable
+    [Documentation]    Test ID: 7.3.3.9.3
+    ...    Test title: Get Manifest in Individual VNF Package - Not acceptable
+    ...    Test objective: The objective is to test that retriveal of the of manifest for an individual VNF package fails when request contained an "Accept" header not compatible with the Content type "application/zip" but the "include_signatures" flag was provided, and perform a validation of the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Manifest in Individual VNF Package
+    Check HTTP Response Status Code Is    406
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+
+Get Manifest in Individual VNF Package - Conflict
+    [Documentation]    Test ID: 7.3.3.9.4
+    ...    Test title: Get Manifest in Individual VNF Package - Conflict
+    ...    Test objective: The objective is to test that the retrieval of the manifest for an individual VNF package fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: The onboarding state of the VNF package for which the VNFD is requested is different from ONBOARDED.
+    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Get Manifest in Individual VNF Package with conflict due to onboarding state
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+POST Manifest in Individual VNF Package - Method not implemented
+    [Documentation]    Test ID: 7.3.3.9.5
+    ...    Test title: POST Manifest in Individual VNF Package - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not allowed to create new resource
+    ...    Pre-conditions: none
+    ...    Reference: Clause 10.4.4a.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send POST Request for Manifest in individual VNF Package
+    Check HTTP Response Status Code Is    405
+
+PUT Manifest in Individual VNF Package - Method not implemented
+    [Documentation]    Test ID: 7.3.3.9.6
+    ...    Test title: PUT Manifest in Individual VNF Package - Method not implemented
+    ...    Test objective: The objective is to test that PUT method is not allowed to modify resource
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.4a.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PUT Request for Manifest in individual VNF Package
+    Check HTTP Response Status Code Is    405
+
+PATCH Manifest in Individual VNF Package - Method not implemented
+    [Documentation]    Test ID: 7.3.3.9.7
+    ...    Test title: PATCH Manifest in Individual VNF Package - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to update resource
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.4a.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PATCH Request for Manifest in individual VNF Package
+    Check HTTP Response Status Code Is    405
+
+DELETE Manifest in Individual VNF Package - Method not implemented
+    [Documentation]    Test ID: 7.3.3.9.8
+    ...    Test title: DELETE Manifest in Individual VNF Package - Method not implemented
+    ...    Test objective: The objective is to test that DELETE  method is not allowed to delete resource
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.4a.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: Resource is not deleted by the failed operation
+    Send DELETE Request for Manifest in individual VNF Package
+    Check HTTP Response Status Code Is    405
+    
+
+Get Manifest in Individual OnBoarded VNF Package
+    [Documentation]    Test ID: 7.3.3.9.9
+    ...    Test title: Get Manifest in Individual OnBoarded VNF Package
+    ...    Test objective: The objective is to test that the Get request read the content of manifest within a OnBoarded NVF Package and perform a validation that returned content is in plain text format
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Manifest in Individual OnBoarded VNF Package
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    text/plain
+    
+Get Manifest in Individual OnBoarded VNF Package with security information
+    [Documentation]    Test ID: 7.3.3.9.10
+    ...    Test title: Get Manifest in Individual OnBoarded VNF Package with security information
+    ...    Test objective: The objective is to test the retrieval of manifest for an individual OnBoarded VNF package shall also security certificates when requested with "include_signature" parameter, and perform a validation that returned content is in Zip format
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Manifest in Individual OnBoarded VNF Package with security information
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get Manifest in Individual OnBoarded VNF Package - Not acceptable
+    [Documentation]    Test ID: 7.3.3.9.11
+    ...    Test title: Get Manifest in Individual OnBoarded VNF Package - Not acceptable
+    ...    Test objective: The objective is to test that retriveal of the of manifest for an individual OnBoarded VNF package fails when request contained an "Accept" header not compatible with the Content type "application/zip" but the "include_signatures" flag was provided, and perform a validation of the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Manifest in Individual OnBoarded VNF Package
+    Check HTTP Response Status Code Is    406
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+
+Get Manifest in Individual OnBoarded VNF Package - Conflict
+    [Documentation]    Test ID: 7.3.3.9.12
+    ...    Test title: Get Manifest in Individual OnBoarded VNF Package - Conflict
+    ...    Test objective: The objective is to test that the retrieval of the manifest for an individual OnBoarded VNF package fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: The onboarding state of the VNF package for which the VNFD is requested is different from ONBOARDED.
+    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Get Manifest in Individual OnBoarded VNF Package with conflict due to onboarding state
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+POST Manifest in Individual OnBoarded VNF Package - Method not implemented
+    [Documentation]    Test ID: 7.3.3.9.13
+    ...    Test title: POST Manifest in Individual OnBoarded VNF Package - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not allowed to create new resource
+    ...    Pre-conditions: none
+    ...    Reference: Clause 10.4.4a.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send POST Request for Manifest in individual OnBoarded VNF Package
+    Check HTTP Response Status Code Is    405
+
+PUT Manifest in Individual OnBoarded VNF Package - Method not implemented
+    [Documentation]    Test ID: 7.3.3.9.14
+    ...    Test title: PUT Manifest in Individual OnBoarded VNF Package - Method not implemented
+    ...    Test objective: The objective is to test that PUT method is not allowed to modify resource
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.4a.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PUT Request for Manifest in individual OnBoarded VNF Package
+    Check HTTP Response Status Code Is    405
+
+PATCH Manifest in Individual OnBoarded VNF Package - Method not implemented
+    [Documentation]    Test ID: 7.3.3.9.15
+    ...    Test title: PATCH Manifest in Individual OnBoarded VNF Package - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to update resource
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.4a.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PATCH Request for Manifest in individual OnBoarded VNF Package
+    Check HTTP Response Status Code Is    405
+
+DELETE Manifest in Individual OnBoarded VNF Package - Method not implemented
+    [Documentation]    Test ID: 7.3.3.9.16
+    ...    Test title: DELETE Manifest in Individual OnBoarded VNF Package - Method not implemented
+    ...    Test objective: The objective is to test that DELETE  method is not allowed to delete resource
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.4a.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: Resource is not deleted by the failed operation
+    Send DELETE Request for Manifest in individual OnBoarded VNF Package
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 4c351fada..b62728994 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -1211,4 +1211,120 @@ GET Individual OnBoarded VNF Package Artifact with incompatable header
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}/include_signatures
     ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
\ No newline at end of file
+    Set Suite Variable    ${response}    ${output}
+    
+Get Manifest in Individual VNF Package
+    Log    Trying to get content of manifest file from a given VNF Package present in the NFVO Catalogue
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get Manifest in Individual VNF Package with security information
+    Log    Trying to get a manifest from a given VNF Package present in the NFVO Catalogue with security certificates
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/manifest/include_signatures
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get Manifest in Individual VNF Package with conflict due to onboarding state
+    Log    Trying to get a manifest from a given VNF Package present in the NFVO Catalogue
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${onboardingStateVnfPkgId}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Send POST Request for Manifest in individual VNF Package
+    Log    Trying to perform a POST. This method should not be implemented
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    POST    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
+
+Send PUT Request for Manifest in individual VNF Package
+    Log    Trying to perform a PUT. This method should not be implemented
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    PUT    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
+    
+Send PATCH Request for Manifest in individual VNF Package
+    Log    Trying to perform a PATCH. This method should not be implemented
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    PATCH    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
+
+Send DELETE Request for Manifest in individual VNF Package
+    Log    Trying to perform a DELETE. This method should not be implemented
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
+    
+Get Manifest in Individual OnBoarded VNF Package
+    Log    Trying to get content of manifest file from a given OnBoarded VNF Package present in the NFVO Catalogue
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get Manifest in Individual OnBoarded VNF Package with security information
+    Log    Trying to get a manifest from a given OnBoarded VNF Package present in the NFVO Catalogue with security certificates
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndIdZipVnfd}/manifest/include_signatures
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get Manifest in Individual OnBoarded VNF Package with conflict due to onboarding state
+    Log    Trying to get a manifest from a given OnBoarded VNF Package present in the NFVO Catalogue
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${onboardingStateVnfdId}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Send POST Request for Manifest in individual OnBoarded VNF Package
+    Log    Trying to perform a POST. This method should not be implemented
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    POST    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
+
+Send PUT Request for Manifest in individual OnBoarded VNF Package
+    Log    Trying to perform a PUT. This method should not be implemented
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    PUT    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
+    
+Send PATCH Request for Manifest in individual OnBoarded VNF Package
+    Log    Trying to perform a PATCH. This method should not be implemented
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    PATCH    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
+
+Send DELETE Request for Manifest in individual OnBoarded VNF Package
+    Log    Trying to perform a DELETE. This method should not be implemented
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    DELETE    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
\ No newline at end of file
-- 
GitLab


From 9a3d00dca507226cc41eb6c9a26f7377952be789 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Mon, 21 Sep 2020 10:07:49 +0500
Subject: [PATCH 038/322] fix IDs conflict

---
 ...ot => IndividualVNFPackageArtifacts.robot} |  0
 .../ManifestInIndividualVNFPackage.robot      | 32 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)
 rename SOL003/VNFPackageManagement-API/{VNFPackageArtifacts.robot => IndividualVNFPackageArtifacts.robot} (100%)

diff --git a/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot b/SOL003/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot
similarity index 100%
rename from SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot
rename to SOL003/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot
diff --git a/SOL003/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot b/SOL003/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot
index 7651a8e81..9b7347bda 100644
--- a/SOL003/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot
+++ b/SOL003/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot
@@ -7,7 +7,7 @@ Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_veri
 
 *** Test Cases ***
 Get Manifest in Individual VNF Package
-    [Documentation]    Test ID: 7.3.3.9.1
+    [Documentation]    Test ID: 7.3.3.10.1
     ...    Test title: Get Manifest in Individual VNF Package
     ...    Test objective: The objective is to test that the Get request read the content of manifest within a NVF Package and perform a validation that returned content is in plain text format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
@@ -20,7 +20,7 @@ Get Manifest in Individual VNF Package
     Check HTTP Response Header Content-Type Is    text/plain
     
 Get Manifest in Individual VNF Package with security information
-    [Documentation]    Test ID: 7.3.3.9.2
+    [Documentation]    Test ID: 7.3.3.10.2
     ...    Test title: Get Manifest in Individual VNF Package with security information
     ...    Test objective: The objective is to test the retrieval of manifest for an individual VNF package shall also security certificates when requested with "include_signature" parameter, and perform a validation that returned content is in Zip format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
@@ -33,7 +33,7 @@ Get Manifest in Individual VNF Package with security information
     Check HTTP Response Header Content-Type Is    application/zip
     
 Get Manifest in Individual VNF Package - Not acceptable
-    [Documentation]    Test ID: 7.3.3.9.3
+    [Documentation]    Test ID: 7.3.3.10.3
     ...    Test title: Get Manifest in Individual VNF Package - Not acceptable
     ...    Test objective: The objective is to test that retriveal of the of manifest for an individual VNF package fails when request contained an "Accept" header not compatible with the Content type "application/zip" but the "include_signatures" flag was provided, and perform a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
@@ -46,7 +46,7 @@ Get Manifest in Individual VNF Package - Not acceptable
     Check HTTP Response Body Json Schema Is   ProblemDetails
 
 Get Manifest in Individual VNF Package - Conflict
-    [Documentation]    Test ID: 7.3.3.9.4
+    [Documentation]    Test ID: 7.3.3.10.4
     ...    Test title: Get Manifest in Individual VNF Package - Conflict
     ...    Test objective: The objective is to test that the retrieval of the manifest for an individual VNF package fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the VNF package for which the VNFD is requested is different from ONBOARDED.
@@ -59,7 +59,7 @@ Get Manifest in Individual VNF Package - Conflict
     Check HTTP Response Body Json Schema Is   ProblemDetails
     
 POST Manifest in Individual VNF Package - Method not implemented
-    [Documentation]    Test ID: 7.3.3.9.5
+    [Documentation]    Test ID: 7.3.3.10.5
     ...    Test title: POST Manifest in Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new resource
     ...    Pre-conditions: none
@@ -71,7 +71,7 @@ POST Manifest in Individual VNF Package - Method not implemented
     Check HTTP Response Status Code Is    405
 
 PUT Manifest in Individual VNF Package - Method not implemented
-    [Documentation]    Test ID: 7.3.3.9.6
+    [Documentation]    Test ID: 7.3.3.10.6
     ...    Test title: PUT Manifest in Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify resource
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
@@ -83,7 +83,7 @@ PUT Manifest in Individual VNF Package - Method not implemented
     Check HTTP Response Status Code Is    405
 
 PATCH Manifest in Individual VNF Package - Method not implemented
-    [Documentation]    Test ID: 7.3.3.9.7
+    [Documentation]    Test ID: 7.3.3.10.7
     ...    Test title: PATCH Manifest in Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update resource
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
@@ -95,7 +95,7 @@ PATCH Manifest in Individual VNF Package - Method not implemented
     Check HTTP Response Status Code Is    405
 
 DELETE Manifest in Individual VNF Package - Method not implemented
-    [Documentation]    Test ID: 7.3.3.9.8
+    [Documentation]    Test ID: 7.3.3.10.8
     ...    Test title: DELETE Manifest in Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that DELETE  method is not allowed to delete resource
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
@@ -108,7 +108,7 @@ DELETE Manifest in Individual VNF Package - Method not implemented
     
 
 Get Manifest in Individual OnBoarded VNF Package
-    [Documentation]    Test ID: 7.3.3.9.9
+    [Documentation]    Test ID: 7.3.3.10.9
     ...    Test title: Get Manifest in Individual OnBoarded VNF Package
     ...    Test objective: The objective is to test that the Get request read the content of manifest within a OnBoarded NVF Package and perform a validation that returned content is in plain text format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
@@ -121,7 +121,7 @@ Get Manifest in Individual OnBoarded VNF Package
     Check HTTP Response Header Content-Type Is    text/plain
     
 Get Manifest in Individual OnBoarded VNF Package with security information
-    [Documentation]    Test ID: 7.3.3.9.10
+    [Documentation]    Test ID: 7.3.3.10.10
     ...    Test title: Get Manifest in Individual OnBoarded VNF Package with security information
     ...    Test objective: The objective is to test the retrieval of manifest for an individual OnBoarded VNF package shall also security certificates when requested with "include_signature" parameter, and perform a validation that returned content is in Zip format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
@@ -134,7 +134,7 @@ Get Manifest in Individual OnBoarded VNF Package with security information
     Check HTTP Response Header Content-Type Is    application/zip
     
 Get Manifest in Individual OnBoarded VNF Package - Not acceptable
-    [Documentation]    Test ID: 7.3.3.9.11
+    [Documentation]    Test ID: 7.3.3.10.11
     ...    Test title: Get Manifest in Individual OnBoarded VNF Package - Not acceptable
     ...    Test objective: The objective is to test that retriveal of the of manifest for an individual OnBoarded VNF package fails when request contained an "Accept" header not compatible with the Content type "application/zip" but the "include_signatures" flag was provided, and perform a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
@@ -147,7 +147,7 @@ Get Manifest in Individual OnBoarded VNF Package - Not acceptable
     Check HTTP Response Body Json Schema Is   ProblemDetails
 
 Get Manifest in Individual OnBoarded VNF Package - Conflict
-    [Documentation]    Test ID: 7.3.3.9.12
+    [Documentation]    Test ID: 7.3.3.10.12
     ...    Test title: Get Manifest in Individual OnBoarded VNF Package - Conflict
     ...    Test objective: The objective is to test that the retrieval of the manifest for an individual OnBoarded VNF package fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the VNF package for which the VNFD is requested is different from ONBOARDED.
@@ -160,7 +160,7 @@ Get Manifest in Individual OnBoarded VNF Package - Conflict
     Check HTTP Response Body Json Schema Is   ProblemDetails
     
 POST Manifest in Individual OnBoarded VNF Package - Method not implemented
-    [Documentation]    Test ID: 7.3.3.9.13
+    [Documentation]    Test ID: 7.3.3.10.13
     ...    Test title: POST Manifest in Individual OnBoarded VNF Package - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new resource
     ...    Pre-conditions: none
@@ -172,7 +172,7 @@ POST Manifest in Individual OnBoarded VNF Package - Method not implemented
     Check HTTP Response Status Code Is    405
 
 PUT Manifest in Individual OnBoarded VNF Package - Method not implemented
-    [Documentation]    Test ID: 7.3.3.9.14
+    [Documentation]    Test ID: 7.3.3.10.14
     ...    Test title: PUT Manifest in Individual OnBoarded VNF Package - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify resource
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
@@ -184,7 +184,7 @@ PUT Manifest in Individual OnBoarded VNF Package - Method not implemented
     Check HTTP Response Status Code Is    405
 
 PATCH Manifest in Individual OnBoarded VNF Package - Method not implemented
-    [Documentation]    Test ID: 7.3.3.9.15
+    [Documentation]    Test ID: 7.3.3.10.15
     ...    Test title: PATCH Manifest in Individual OnBoarded VNF Package - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update resource
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
@@ -196,7 +196,7 @@ PATCH Manifest in Individual OnBoarded VNF Package - Method not implemented
     Check HTTP Response Status Code Is    405
 
 DELETE Manifest in Individual OnBoarded VNF Package - Method not implemented
-    [Documentation]    Test ID: 7.3.3.9.16
+    [Documentation]    Test ID: 7.3.3.10.16
     ...    Test title: DELETE Manifest in Individual OnBoarded VNF Package - Method not implemented
     ...    Test objective: The objective is to test that DELETE  method is not allowed to delete resource
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-- 
GitLab


From 044e3aa0236113e6c83152620b7b81d35cb93b0e Mon Sep 17 00:00:00 2001
From: frankbryden <frank.bryden@gmail.com>
Date: Fri, 18 Sep 2020 17:06:36 +0200
Subject: [PATCH 039/322] Fixed issues as per MR comments

Signed-off-by: frankbryden <frank.bryden@gmail.com>
---
 SOL005/NSDManagement-API/IndividualNSDescriptor.robot         | 1 -
 SOL005/NSDManagement-API/NSDManagementKeywords.robot          | 1 +
 .../NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot  | 4 ++--
 .../NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot  | 2 +-
 SOL005/NSLifecycleManagement-API/TerminateNSTask.robot        | 1 -
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/SOL005/NSDManagement-API/IndividualNSDescriptor.robot b/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
index 9fd77ae9b..47a1aa7a0 100644
--- a/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
+++ b/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
@@ -66,7 +66,6 @@ Enable Individual Network Service Descriptor
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   NsdInfoModification
     Check Postcondition Network Service Descriptor is in operational state    ENABLED
-    Check PostCondition GET Individual Network Service Descriptor Information
     Check Postcondition Network Service Descriptor usage state is unmodified (Implicit)   
 
 Enable Individual Network Service Descriptor with conflict due to operational state ENABLED
diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index 4172e6bed..eb27f2b78 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -223,6 +223,7 @@ Check Postcondition Network Service Descriptor is in operational state
 
 Check Postcondition Network Service Descriptor usage state is unmodified (Implicit)
     Log    Checking postcondition use status
+    Check PostCondition GET Individual Network Service Descriptor Information
     Should Be Equal As Strings   ${response['body']['nsdUsageState']}    ${usageState} 
 
 Send PATCH to enable Individual Network Service Descriptor
diff --git a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
index 7a9e9e2e1..f2b9dad22 100644
--- a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
@@ -24,9 +24,9 @@ NS Instance Creation
     Check HTTP Response Body Json Schema Is    NsInstance
     Check resource not_instantiated    1
     
-NS Instance Creation with DISABLED nsd
+NS Instance Creation with DISABLED Network Service Descriptor
     [Documentation]    Test ID: 5.3.2.18.2
-    ...    Test title: NS Instance Creation with DISABLED nsd
+    ...    Test title: NS Instance Creation with DISABLED Network Service Descriptor
     ...    Test objective: The objective is to test the workflow for Creating a NS instance with a disabled NSD
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in disabled operational state.
     ...    Reference: Clauses 6.4.2.3.1 and 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
diff --git a/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot b/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
index 915e8e041..21767cc17 100644
--- a/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
@@ -19,4 +19,4 @@ NS Instance Deletion
     Check resource not_instantiated
     DELETE IndividualNSInstance
     Check HTTP Response Status Code Is    204
-    Check Instance Deleted
+    Check Postcondition NS instance is deleted
diff --git a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
index 20d927b2e..9e9870149 100644
--- a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
@@ -20,7 +20,6 @@ POST Terminate a NSInstance
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location
     Check resource not_instantiated
-    Sleep    15s
     
 POST Terminate a NSInstance Conflict
     [Documentation]    Test ID: 5.3.2.7.2
-- 
GitLab


From bc3466f5325923d59767ad2533f590e673b9c961 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Thu, 24 Sep 2020 11:13:57 +0500
Subject: [PATCH 040/322] test cases added for VNF Package Artifacts

---
 .../IndividualVNFPackageArtifacts.robot       |   2 +-
 .../VNFPackageArtifacts.robot                 | 200 ++++++++++++++++++
 .../VNFPackageManagementKeywords.robot        | 126 ++++++++++-
 .../environment/variables.txt                 |   5 +-
 .../environment/vnfPackageContent.txt         |   2 +-
 5 files changed, 330 insertions(+), 5 deletions(-)
 create mode 100644 SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot

diff --git a/SOL003/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot b/SOL003/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot
index b505314c8..4339f3777 100644
--- a/SOL003/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot
+++ b/SOL003/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot
@@ -142,7 +142,7 @@ DELETE Individual VNF Package Artifact - Method not implemented
     ...    Post-Conditions: The VNF Package artifact is not deleted by the failed operation
     Send DELETE Request for individual VNF Package Artifact
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Package Artifact Exist
+    Check Postcondition Individual VNF Package Artifact Exist
 
 GET Individual OnBoarded VNF Package Artifact
     [Documentation]    Test ID: 7.3.3.5.12
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot b/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot
new file mode 100644
index 000000000..8f2828904
--- /dev/null
+++ b/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot
@@ -0,0 +1,200 @@
+*** Settings ***
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt
+Resource          VNFPackageManagementKeywords.robot 
+Library           JSONLibrary
+Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+
+*** Test Cases ***
+Get VNF Package Artifact
+    [Documentation]    Test ID: 7.3.3.11.1
+    ...    Test title: Get VNF Package Artifact
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully, and perform a validation that returned content is in Zip format
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get VNF Package Artifact with "exclude_all_mano_artifacts" parameter
+    [Documentation]    Test ID: 7.3.3.11.2
+    ...    Test title: Get VNF Package Artifact with "exclude_all_mano_artifacts" parameter
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and it doesnot contain additional MANO artifacts  when requested with "exclude_all_mano_artifacts" parameter
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with exclude_all_mano_artifacts parameter
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get VNF Package Artifact with "exclude_all_non_mano_artifacts" parameter
+    [Documentation]    Test ID: 7.3.3.11.3
+    ...    Test title: Get VNF Package Artifact with "exclude_all_non_mano_artifacts" parameter
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and it doesnot contain non-MANO Artifacts when requested with "exclude_all_non_mano_artifacts" parameter
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with exclude_all_non_mano_artifacts parameter
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get VNF Package Artifact with "select_non_mano_artifact_sets" parameter
+    [Documentation]    Test ID: 7.3.3.11.4
+    ...    Test title: Get VNF Package Artifact with "select_non_mano_artifact_sets" parameter
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and also contain non_MANO artifacts set when requested with "select_non_mano_artifact_sets" parameter
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with select_non_mano_artifact_sets parameter
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get VNF Package Artifact with "include_signatures" parameter
+    [Documentation]    Test ID: 7.3.3.11.5
+    ...    Test title: Get VNF Package Artifact with "include_signatures" parameter
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and also contain security certificates when requested with "include_signature" parameter, and perform a validation that returned content is in Zip format
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with include_signatures parameter
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get VNF Package Artifact with Range Request and NFVO supporting Range Requests
+    [Documentation]    Test ID: 7.3.3.11.6
+    ...    Test title: Get VNF Package Artifact with Range Request and NFVO supporting Range Requests
+    ...    Test objective: The objective is to test the GET request read the whole content of the archive containing the artifact files successfully when using a range request to return single range of bytes from the file, with the NFVO supporting it. The test also perform a validation that returned content matches the issued range
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with Range Request
+    Check HTTP Response Status Code Is    206
+    Check HTTP Response Header Content-Range Is Present and Matches the requested range
+    Check HTTP Response Header Content-Length Is Present and Matches the requested range length
+    
+Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "select_non_mano_artifact_sets"
+    [Documentation]    Test ID: 7.3.3.11.7
+    ...    Test title: Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "select_non_mano_artifact_sets"
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when both "exclude_all_non_mano_artifacts" and "select_non_mano_artifact_sets" are present in request
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with exclude_all_non_mano_artifacts and select_non_mano_artifact_sets
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "exclude_all_mano_artifacts"
+    [Documentation]    Test ID: 7.3.3.11.8
+    ...    Test title: Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "exclude_all_mano_artifactss"
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when both "exclude_all_non_mano_artifacts" and "exclude_all_mano_artifacts" are present in request
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with exclude_all_non_mano_artifacts and exclude_all_mano_artifacts
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+Get VNF Package Artifact with invalid URI parameters undifend select_non_mano_artifact_sets
+    [Documentation]    Test ID: 7.3.3.11.9
+    ...    Test title: Get VNF Package Artifact with invalid URI parameters undefined select_non_mano_artifact_sets
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when one or more value provided in "select_non_mano_artifact_sets" are not provided in Manifest.
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with select_non_mano_artifact_sets parameter
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+
+Get VNF Package Artifact with conflict due to onboarding state
+    [Documentation]    Test ID: 7.3.3.11.10
+    ...    Test title: Get VNF Package Artifact with conflict due to onboarding state
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: The onboarding state of the VNF package for which the content is requested is different from ONBOARDED.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none   
+    GET Artifact of VNF Package in onboarding state different from ONBOARDED
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+GET VNF Package Artifact with invalid Range Request
+    [Documentation]    Test ID: 7.3.3.11.11
+    ...    Test title: GET VNF Package Artifact with invalid Range Request
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when using a range request that does not match any available byte range in the file.
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
+    ...    Post-Conditions: none      
+    GET VNF Package Artifact with invalid Range Request
+    Check HTTP Response Status Code Is    416
+    
+POST VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 7.3.3.11.12
+    ...    Test title: POST VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not allowed to create new VNF Package artifact
+    ...    Pre-conditions: none
+    ...    Reference: Clause 10.4.5a.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send POST Request for VNF Package Artifact
+    Check HTTP Response Status Code Is    405
+
+PUT VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 7.3.3.11.13
+    ...    Test title: PUT VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNF Package artifact
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PUT Request for VNF Package Artifact
+    Check HTTP Response Status Code Is    405
+
+PATCH VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 7.3.3.11.14
+    ...    Test title: PATCH VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that PATCH  method is not allowed to update a VNF Package artifact
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PATCH Request for VNF Package Artifact
+    Check HTTP Response Status Code Is    405
+
+DELETE VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 7.3.3.11.15
+    ...    Test title: DELETE VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNF Package artifact
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: The VNF Package artifact is not deleted by the failed operation
+    Send DELETE Request for VNF Package Artifact
+    Check HTTP Response Status Code Is    405
+    Check Postcondition VNF Package Artifact Exist
+    
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index b62728994..1038eebb2 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -607,7 +607,7 @@ Send DELETE Request for individual VNF Package Artifact
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
-Check Postcondition VNF Package Artifact Exist
+Check Postcondition Individual VNF Package Artifact Exist
     Log    Checking that vnf pacakge still exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
@@ -1327,4 +1327,126 @@ Send DELETE Request for Manifest in individual OnBoarded VNF Package
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/manifest
     ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output} 
\ No newline at end of file
+    Set Suite Variable    ${response}    ${output} 
+    
+Get Artifact in VNF Package
+    Log    Trying to get Artifact in VNF Package
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get Artifact in VNF Package with exclude_all_mano_artifacts parameter
+    Log    Trying to get Artifact in VNF Package with exclude_all_mano_artifacts
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_mano_artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get Artifact in VNF Package with exclude_all_non_mano_artifacts parameter
+    Log    Trying to get Artifact in VNF Package with security certificates
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get Artifact in VNF Package with select_non_mano_artifact_sets parameter
+    Log    Trying to get Artifact in VNF Package with security certificates
+    Pass Execution If    ${NFVO_non-MANO_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/select_non_mano_artifact_sets=${non_mano_artifact_sets}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get Artifact in VNF Package with include_signatures parameter
+    Log    Trying to get Artifact in VNF Package with security certificates
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/include_signatures
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get Artifact in VNF Package with Range Request
+    Log    Trying to get an Artifact using RANGE Header and using an NFVO that can handle it
+    Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
+    Set Headers    {"Range": "${range}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get Artifact in VNF Package with exclude_all_non_mano_artifacts and select_non_mano_artifact_sets
+    Log    Trying to get Artifact in VNF Package 
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&select_non_mano_artifact_sets=${non_mano_artifact_sets}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get Artifact in VNF Package with exclude_all_non_mano_artifacts and exclude_all_mano_artifacts
+    Log    Trying to get Artifact in VNF Package 
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&exclude_all_non_mano_artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+GET Artifact of VNF Package in onboarding state different from ONBOARDED
+    Log    Trying to get a VNF Package artifact present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${onboardingStateVnfPkgId}/artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+GET VNF Package Artifact with invalid Range Request
+    Log    Trying to get a range of bytes of the limit of the VNF Package
+    Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Set Headers    {"Range": "${erroneousRange}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Send POST Request for VNF Package Artifact
+    Log    Trying to perform a POST (method should not be implemented)
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    POST    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Send PUT Request for VNF Package Artifact
+    Log    Trying to perform a PUT (method should not be implemented)
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    PUT    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+ 
+Send PATCH Request for VNF Package Artifact
+    Log    Trying to perform a PATCH (method should not be implemented)
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    PATCH    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Send DELETE Request for VNF Package Artifact
+    Log    Trying to perform a DELETE (method should not be implemented)
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Check Postcondition VNF Package Artifact Exist
+    Log    Checking that vnf pacakge still exists
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    Check HTTP Response Status Code Is    200
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/environment/variables.txt b/SOL003/VNFPackageManagement-API/environment/variables.txt
index 460aa79d1..3ee43c2d6 100644
--- a/SOL003/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL003/VNFPackageManagement-API/environment/variables.txt
@@ -37,4 +37,7 @@ ${polling_interval}     10 sec
 
 
 ${notification_request}    []
-${notification_response}    []
\ No newline at end of file
+${notification_response}    []
+
+${NFVO_non-MANO_OK}    1    # If 1 means that non-MANO artifacts are supported by the NFVO
+${non_mano_artifact_sets}    
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/environment/vnfPackageContent.txt b/SOL003/VNFPackageManagement-API/environment/vnfPackageContent.txt
index 1fd004bfd..a79a251ee 100644
--- a/SOL003/VNFPackageManagement-API/environment/vnfPackageContent.txt
+++ b/SOL003/VNFPackageManagement-API/environment/vnfPackageContent.txt
@@ -5,4 +5,4 @@ ${range}          bytes=0-1023
 ${length}          1024
 ${erroneousRange}    bytes=10000000-1000000000    # Requesting a out of range number of bytes
 ${erroneousVnfPkgId}    erroneousPkgId
-${CONTENT_TYPE_ZIP}    application/zip
+${CONTENT_TYPE_ZIP}    application/zip
\ No newline at end of file
-- 
GitLab


From 3c79b042b92619f0c5a04c0b992dd058895b46cb Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Fri, 25 Sep 2020 11:34:23 +0500
Subject: [PATCH 041/322] test cases added for OnBoarded VNF Package Artifacts

---
 .../IndividualVNFPackageArtifacts.robot       |   2 +-
 .../VNFPackageArtifacts.robot                 | 191 ++++++++++++++++++
 .../VNFPackageManagementKeywords.robot        | 128 +++++++++++-
 3 files changed, 319 insertions(+), 2 deletions(-)

diff --git a/SOL003/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot b/SOL003/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot
index 4339f3777..323aa3c22 100644
--- a/SOL003/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot
+++ b/SOL003/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot
@@ -279,7 +279,7 @@ DELETE Individual OnBoarded VNF Package Artifact - Method not implemented
     ...    Post-Conditions: The VNF Package artifact is not deleted by the failed operation
     Send DELETE Request for individual OnBoarded VNF Package Artifact
     Check HTTP Response Status Code Is    405
-    Check Postcondition OnBoarded VNF Package Artifact Exist
+    Check Postcondition Individual OnBoarded VNF Package Artifact Exist
 
 GET Individual VNF Package Artifact with security information
     [Documentation]    Test ID: 7.3.3.5.23
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot b/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot
index 8f2828904..c4c3b9496 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot
@@ -198,3 +198,194 @@ DELETE VNF Package Artifact - Method not implemented
     Check HTTP Response Status Code Is    405
     Check Postcondition VNF Package Artifact Exist
     
+Get OnBoarded VNF Package Artifact
+    [Documentation]    Test ID: 7.3.3.11.16
+    ...    Test title: Get OnBoarded VNF Package Artifact
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the OnBoarded VNF Package Artifact files successfully, and perform a validation that returned content is in Zip format
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in OnBoarded VNF Package
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get OnBoarded VNF Package Artifact with "exclude_all_mano_artifacts" parameter
+    [Documentation]    Test ID: 7.3.3.11.17
+    ...    Test title: Get OnBoarded VNF Package Artifact with "exclude_all_mano_artifacts" parameter
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the OnBoarded VNF Package Artifact files successfully and it doesnot contain additional MANO artifacts  when requested with "exclude_all_mano_artifacts" parameter
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in OnBoarded VNF Package with exclude_all_mano_artifacts parameter
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get OnBoarded VNF Package Artifact with "exclude_all_non_mano_artifacts" parameter
+    [Documentation]    Test ID: 7.3.3.11.18
+    ...    Test title: Get OnBoarded VNF Package Artifact with "exclude_all_non_mano_artifacts" parameter
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the OnBoarded VNF Package artifact files successfully and it doesnot contain non-MANO Artifacts when requested with "exclude_all_non_mano_artifacts" parameter
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in OnBoarded VNF Package with exclude_all_non_mano_artifacts parameter
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get OnBoarded VNF Package Artifact with "select_non_mano_artifact_sets" parameter
+    [Documentation]    Test ID: 7.3.3.11.19
+    ...    Test title: Get OnBoarded VNF Package Artifact with "select_non_mano_artifact_sets" parameter
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the OnBoarded VNF Package artifact files successfully and also contain non_MANO artifacts set when requested with "select_non_mano_artifact_sets" parameter
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in OnBoarded VNF Package with select_non_mano_artifact_sets parameter
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get OnBoarded VNF Package Artifact with "include_signatures" parameter
+    [Documentation]    Test ID: 7.3.3.11.20
+    ...    Test title: Get OnBoarded VNF Package Artifact with "include_signatures" parameter
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the OnBoarded VNF Package artifact files successfully and also contain security certificates when requested with "include_signature" parameter, and perform a validation that returned content is in Zip format
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in OnBoarded VNF Package with include_signatures parameter
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get OnBoarded VNF Package Artifact with Range Request and NFVO supporting Range Requests
+    [Documentation]    Test ID: 7.3.3.11.21
+    ...    Test title: Get OnBoarded VNF Package Artifact with Range Request and NFVO supporting Range Requests
+    ...    Test objective: The objective is to test the GET request read the whole content of the archive containing the OnBoarded VNF Package artifact files successfully when using a range request to return single range of bytes from the file, with the NFVO supporting it. The test also perform a validation that returned content matches the issued range
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
+    ...    Post-Conditions: none
+    Get Artifact in OnBoarded VNF Package with Range Request
+    Check HTTP Response Status Code Is    206
+    Check HTTP Response Header Content-Range Is Present and Matches the requested range
+    Check HTTP Response Header Content-Length Is Present and Matches the requested range length
+    
+Get OnBoarded VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "select_non_mano_artifact_sets"
+    [Documentation]    Test ID: 7.3.3.11.22
+    ...    Test title: Get OnBoarded VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "select_non_mano_artifact_sets"
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the OnBoarded VNF Package artifact files fails when both "exclude_all_non_mano_artifacts" and "select_non_mano_artifact_sets" are present in request
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in OnBoarded VNF Package with exclude_all_non_mano_artifacts and select_non_mano_artifact_sets
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+Get OnBoarded VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "exclude_all_mano_artifacts"
+    [Documentation]    Test ID: 7.3.3.11.23
+    ...    Test title: Get OnBoarded VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "exclude_all_mano_artifactss"
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the OnBoarded VNF Package artifact files fails when both "exclude_all_non_mano_artifacts" and "exclude_all_mano_artifacts" are present in request
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in OnBoarded VNF Package with exclude_all_non_mano_artifacts and exclude_all_mano_artifacts
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+Get OnBoarded VNF Package Artifact with invalid URI parameters undifend select_non_mano_artifact_sets
+    [Documentation]    Test ID: 7.3.3.11.24
+    ...    Test title: Get OnBoarded VNF Package Artifact with invalid URI parameters undefined select_non_mano_artifact_sets
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the OnBoarded VNF Package artifact files fails when one or more value provided in "select_non_mano_artifact_sets" are not provided in Manifest.
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in OnBoarded VNF Package with select_non_mano_artifact_sets parameter
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+
+Get OnBoarded VNF Package Artifact with conflict due to onboarding state
+    [Documentation]    Test ID: 7.3.3.11.25
+    ...    Test title: Get OnBoarded VNF Package Artifact with conflict due to onboarding state
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the OnBoarded VNF Package artifact files fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: The onboarding state of the VNF package for which the content is requested is different from ONBOARDED.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none   
+    GET Artifact of OnBoarded VNF Package in onboarding state different from ONBOARDED
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+GET OnBoarded VNF Package Artifact with invalid Range Request
+    [Documentation]    Test ID: 7.3.3.11.26
+    ...    Test title: GET OnBoarded VNF Package Artifact with invalid Range Request
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the OnBoarded VNF Package artifact files fails when using a range request that does not match any available byte range in the file.
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
+    ...    Post-Conditions: none      
+    GET OnBoarded VNF Package Artifact with invalid Range Request
+    Check HTTP Response Status Code Is    416
+    
+POST OnBoarded VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 7.3.3.11.27
+    ...    Test title: POST OnBoarded VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not allowed to create new VNF Package artifact
+    ...    Pre-conditions: none
+    ...    Reference: Clause 10.4.5a.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send POST Request for OnBoarded VNF Package Artifact
+    Check HTTP Response Status Code Is    405
+
+PUT OnBoarded VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 7.3.3.11.28
+    ...    Test title: PUT OnBoarded VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNF Package artifact
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PUT Request for OnBoarded VNF Package Artifact
+    Check HTTP Response Status Code Is    405
+
+PATCH OnBoarded VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 7.3.3.11.29
+    ...    Test title: PATCH OnBoarded VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that PATCH  method is not allowed to update a VNF Package artifact
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PATCH Request for OnBoarded VNF Package Artifact
+    Check HTTP Response Status Code Is    405
+
+DELETE OnBoarded VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 7.3.3.11.30
+    ...    Test title: DELETE OnBoarded VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNF Package artifact
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: The VNF Package artifact is not deleted by the failed operation
+    Send DELETE Request for OnBoarded VNF Package Artifact
+    Check HTTP Response Status Code Is    405
+    Check Postcondition OnBoarded VNF Package Artifact Exist
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 1038eebb2..b11233ee0 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -1142,7 +1142,7 @@ Send DELETE Request for individual OnBoarded VNF Package Artifact
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
-Check Postcondition OnBoarded VNF Package Artifact Exist
+Check Postcondition Individual OnBoarded VNF Package Artifact Exist
     Log    Checking that vnf pacakge still exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
@@ -1449,4 +1449,130 @@ Check Postcondition VNF Package Artifact Exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    Check HTTP Response Status Code Is    200
+ 
+
+
+   
+
+Get Artifact in OnBoarded VNF Package
+    Log    Trying to get Artifact in OnBoarded VNF Package
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get Artifact in OnBoarded VNF Package with exclude_all_mano_artifacts parameter
+    Log    Trying to get Artifact in OnBoarded VNF Package with exclude_all_mano_artifacts
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts/exclude_all_mano_artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get Artifact in OnBoarded VNF Package with exclude_all_non_mano_artifacts parameter
+    Log    Trying to get Artifact in OnBoarded VNF Package with security certificates
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get Artifact in OnBoarded VNF Package with select_non_mano_artifact_sets parameter
+    Log    Trying to get Artifact in OnBoarded VNF Package with security certificates
+    Pass Execution If    ${NFVO_non-MANO_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts/select_non_mano_artifact_sets=${non_mano_artifact_sets}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get Artifact in OnBoarded VNF Package with include_signatures parameter
+    Log    Trying to get Artifact in OnBoarded VNF Package with security certificates
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts/include_signatures
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get Artifact in OnBoarded VNF Package with Range Request
+    Log    Trying to get an Artifact using RANGE Header and using an NFVO that can handle it
+    Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
+    Set Headers    {"Range": "${range}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get Artifact in OnBoarded VNF Package with exclude_all_non_mano_artifacts and select_non_mano_artifact_sets
+    Log    Trying to get Artifact in OnBoarded VNF Package 
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&select_non_mano_artifact_sets=${non_mano_artifact_sets}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get Artifact in OnBoarded VNF Package with exclude_all_non_mano_artifacts and exclude_all_mano_artifacts
+    Log    Trying to get Artifact in OnBoarded VNF Package 
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&exclude_all_non_mano_artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+GET Artifact of OnBoarded VNF Package in onboarding state different from ONBOARDED
+    Log    Trying to get a OnBoarded VNF Package artifact present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${onboardingStateVnfPkgId}/artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+GET OnBoarded VNF Package Artifact with invalid Range Request
+    Log    Trying to get a range of bytes of the limit of the OnBoarded VNF Package
+    Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Set Headers    {"Range": "${erroneousRange}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Send POST Request for OnBoarded VNF Package Artifact
+    Log    Trying to perform a POST (method should not be implemented)
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    POST    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Send PUT Request for OnBoarded VNF Package Artifact
+    Log    Trying to perform a PUT (method should not be implemented)
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    PUT    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+ 
+Send PATCH Request for OnBoarded VNF Package Artifact
+    Log    Trying to perform a PATCH (method should not be implemented)
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    PATCH    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Send DELETE Request for OnBoarded VNF Package Artifact
+    Log    Trying to perform a DELETE (method should not be implemented)
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    DELETE    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Check Postcondition OnBoarded VNF Package Artifact Exist
+    Log    Checking that OnBoarded vnf pacakge still exists
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
     Check HTTP Response Status Code Is    200
\ No newline at end of file
-- 
GitLab


From aa8b4dce7c4ea6f6bc59cd2808364befd456311e Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Fri, 25 Sep 2020 11:35:28 +0500
Subject: [PATCH 042/322] extra spaces removed

---
 .../VNFPackageManagementKeywords.robot                        | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index b11233ee0..5e8ec3024 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -1451,10 +1451,6 @@ Check Postcondition VNF Package Artifact Exist
     GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
     Check HTTP Response Status Code Is    200
  
-
-
-   
-
 Get Artifact in OnBoarded VNF Package
     Log    Trying to get Artifact in OnBoarded VNF Package
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-- 
GitLab


From a500c144e5087019a1cb0ff6f049fe7e785cb2a1 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Mon, 28 Sep 2020 13:36:10 +0500
Subject: [PATCH 043/322] reference updated

---
 .../ApiVersion.robot                          | 20 ++++++------
 .../CancelOperationTask.robot                 | 14 ++++----
 .../ChangeExternalVNFConnectivityTask.robot   | 12 +++----
 .../ChangeVNFFlavourTask.robot                | 14 ++++----
 .../FailOperationTask.robot                   | 14 ++++----
 .../HealVNFTask.robot                         | 14 ++++----
 .../IndividualSubscription.robot              | 10 +++---
 .../IndividualVNFInstance.robot               | 16 +++++-----
 .../IndividualVnfLcmOperationOccurence.robot  | 10 +++---
 .../InstantiateVNFTask.robot                  | 12 +++----
 .../NotificationEndpoint.robot                |  8 ++---
 .../OperateVNFTask.robot                      | 14 ++++----
 .../RetryOperationTask.robot                  | 14 ++++----
 .../RollbackOperationTask.robot               | 14 ++++----
 .../ScaleVNFTask.robot                        | 14 ++++----
 .../ScaleVNFToLevelTask.robot                 | 14 ++++----
 .../Subscriptions.robot                       | 32 +++++++++----------
 .../TerminateVNFTask.robot                    | 12 +++----
 .../VNFInstances.robot                        | 22 ++++++-------
 .../VnfLcmOperationOccurences.robot           | 26 +++++++--------
 20 files changed, 153 insertions(+), 153 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/ApiVersion.robot b/SOL002/VNFLifecycleManagement-API/ApiVersion.robot
index d3ea1bbe4..076343d82 100644
--- a/SOL002/VNFLifecycleManagement-API/ApiVersion.robot
+++ b/SOL002/VNFLifecycleManagement-API/ApiVersion.robot
@@ -11,7 +11,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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -23,7 +23,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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -36,7 +36,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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -48,7 +48,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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -60,7 +60,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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -72,7 +72,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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -84,7 +84,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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -97,7 +97,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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -109,7 +109,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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -121,7 +121,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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
index 2709d940c..2ca0d781f 100644
--- a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
@@ -14,7 +14,7 @@ Post Cancel operation task
     ...    Test title: POST Cancel operation task
     ...    Test objective: The POST method initiates cancelling an ongoing VNF lifecycle operation while it is being executed or rolled back, i.e. the "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state.
     ...    Pre-conditions: the "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state.
-    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -27,7 +27,7 @@ Post Cancel operation task Conflict
     ...    Test title: POST Cancel operation task Conflict
     ...    Test objective: The POST method is NOT cancelling an ongoing VNF lifecycle operation due to the fact that the VNF instance resource is not in STARTING, PROCESSING or ROLLING_BACK state
     ...    Pre-conditions: operation is not in STARTING, PROCESSING or ROLLING_BACK state
-    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -41,7 +41,7 @@ Post Cancel operation task Not Found
     ...    Test title: POST Cancel operation task
     ...    Test objective: The objective is to test that POST method cannot cancel a VNF lifecycle operation because the resource is not found
     ...    Pre-conditions: 
-    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -53,7 +53,7 @@ GET Cancel operation task - Method not implemented
     ...    Test title: GET Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.17.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.17.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -65,7 +65,7 @@ PUT Cancel operation task - Method not implemented
     ...    Test title: PUT Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.17.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.17.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -77,7 +77,7 @@ PATCH Cancel operation task - Method not implemented
     ...    Test title: PATCH Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.17.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.17.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -89,7 +89,7 @@ DELETE Cancel operation task - Method not implemented
     ...    Test title: DELETE Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.17.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.17.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot b/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
index 54e8686ec..d8ad9fb08 100644
--- a/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
@@ -13,7 +13,7 @@ POST Change external VNF connectivity
     ...    Test title: POST Change external VNF connectivity
     ...    Test objective: The objective is to test that POST method trigger a change in VNF external connectivity
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.11.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null         
@@ -26,7 +26,7 @@ GET Change external VNF connectivity - Method not implemented
     ...    Test title: GET Change external VNF connectivity - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.11.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -38,7 +38,7 @@ PUT Change external VNF connectivity - Method not implemented
     ...    Test title: PUT Change external VNF connectivity - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.11.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -50,7 +50,7 @@ PATCH Change external VNF connectivity - Method not implemented
     ...    Test title: PATCH Change external VNF connectivity - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.11.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -62,7 +62,7 @@ DELETE Change external VNF connectivity - Method not implemented
     ...    Test title: DELETE Change external VNF connectivity - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.11.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -74,7 +74,7 @@ POST Operate a vnfInstance Conflict (Not-Instantiated)
     ...    Test title: POST Operate a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set. 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.11.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions:
diff --git a/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot b/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
index f70393324..3d662724c 100644
--- a/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
@@ -13,7 +13,7 @@ POST Change deployment flavour of a vnfInstance
     ...    Test title: POST Change deployment flavour of a vnfInstance
     ...    Test objective: The objective is to test that POST method trigger a change in VNF deployment flavour
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null  
@@ -26,7 +26,7 @@ POST Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
     ...    Test title: POST Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to test that POST method cannot trigger a change in VNF deployment flavour because of a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set. 
     ...    Pre-conditions: VNF instance resource is not in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -40,7 +40,7 @@ POST Change deployment flavour of a vnfInstance Not Found
     ...    Test title: POST Change deployment flavour of a vnfInstance Not Found
     ...    Test objective: The objective is to test that POST method cannot trigger a change in VNF deployment flavour because the VNF instance resource is not found. 
     ...    Pre-conditions: VNF instance resource is not in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -54,7 +54,7 @@ GET Change deployment flavour VNFInstance - Method not implemented
     ...    Test title: GET Change deployment flavour VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -66,7 +66,7 @@ PUT Change deployment flavour VNFInstance - Method not implemented
     ...    Test title: PUT Change deployment flavour VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.7.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -78,7 +78,7 @@ PATCH Change deployment flavour VNFInstance - Method not implemented
     ...    Test title: PATCH Change deployment flavour VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.7.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -90,7 +90,7 @@ DELETE Change deployment flavour VNFInstance - Method not implemented
     ...    Test title: DELETE Change deployment flavour VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.7.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot b/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
index bbd7011d8..f1ebf86ce 100644
--- a/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
@@ -12,7 +12,7 @@ POST Fail operation task
     ...    Test title: POST Fail operation task
     ...    Test objective: The objective is to test that POST method mark as "finally failed" a VNF lifecycle operation if that operation has experienced a temporary failure
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -27,7 +27,7 @@ POST Fail operation task Conflict (Not-FAILED_TEMP)
     ...    Test title: POST Fail operation task Conflict (Not-FAILED_TEMP)
     ...    Test objective: The objective is to test that POST method cannot mark as "finally failed" a VNF lifecycle operation if that operation has experienced a temporary failure
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none     
@@ -41,7 +41,7 @@ POST Fail operation task Not Found
     ...    Test title: POST Fail operation task Not Found
     ...    Test objective: The objective is to test that POST method cannot mark as "finally failed" a VNF lifecycle operation because the operation is not supported
     ...    Pre-conditions: 
-    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -53,7 +53,7 @@ GET Fail operation task - Method not implemented
     ...    Test title: GET Fail operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.16.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.16.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -65,7 +65,7 @@ PUT Fail operation task - Method not implemented
     ...    Test title: PUT Fail operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.16.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.16.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -77,7 +77,7 @@ PATCH Fail operation task - Method not implemented
     ...    Test title: PATCH Fail operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.16.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.16.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -89,7 +89,7 @@ DELETE Fail operation task - Method not implemented
     ...    Test title: DELETE Fail operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.16.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.16.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: VNF instance not deleted
diff --git a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
index 724573a8e..cddaa37ba 100644
--- a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
@@ -13,7 +13,7 @@ POST Heal a vnfInstance
     ...    Test title: POST Heal a vnfInstance
     ...    Test objective: The objective is to test that POST method heal a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -27,7 +27,7 @@ POST Heal a vnfInstance Conflict (Not-Instantiated)
     ...    Test title: POST Heal a vnfInstance (Not-Instantiated)
     ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set. 
     ...    Pre-conditions: the VNF instance resource is in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -41,7 +41,7 @@ POST Heal a vnfInstance Not Found
     ...    Test title: POST Heal a vnfInstance Not Found
     ...    Test objective: The objective is to test that the operation cannot be executed because the VNF instance resource is not found. 
     ...    Pre-conditions: the VNF instance resource is not existing
-    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -54,7 +54,7 @@ GET Heal VNFInstance - Method not implemented
     ...    Test title: GET Heal a vnfInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.9.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -66,7 +66,7 @@ PUT Heal VNFInstance - Method not implemented
     ...    Test title: PUT Heal a vnfInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.9.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:
@@ -78,7 +78,7 @@ PATCH Heal VNFInstance - Method not implemented
     ...    Test title: PATCH Heal a vnfInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.9.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:
@@ -90,7 +90,7 @@ DELETE Heal VNFInstance - Method not implemented
     ...    Test title: DELETE Heal a vnfInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.9.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:
diff --git a/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot b/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot
index 887c31e3d..f5a3692d6 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot
@@ -11,7 +11,7 @@ POST Individual Subscription - Method not implemented
     ...    Test title: POST Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.19.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.19.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -23,7 +23,7 @@ GET Individual Subscription
     ...    Test title: GET Individual Subscription
     ...    Test objective: The objective is to test the Get individual subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.19.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.19.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -36,7 +36,7 @@ PUT an individual subscription - Method not implemented
     ...    Test title: PUT Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.19.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.19.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -48,7 +48,7 @@ PATCH an individual subscription - Method not implemented
     ...    Test title: PATCH Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.19.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.19.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -60,7 +60,7 @@ DELETE an individual subscription
     ...    Test title: DELETE Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.19.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.19.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index b4c84b814..bb34332ff 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
@@ -18,7 +18,7 @@ POST Individual VNFInstance - Method not implemented
     ...    Test title: POST Individual VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -30,7 +30,7 @@ GET Information about an individual VNF Instance
     ...    Test title: GET Information about an individual VNF Instance
     ...    Test objective: The objective is to create a new VNF instance resource
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -43,7 +43,7 @@ PUT Individual VNFInstance - Method not implemented
     ...    Test title: PUT Individual VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: VNF instance not modified
@@ -55,7 +55,7 @@ PATCH Individual VNFInstance
     ...    Test title: PATCH Individual VNFInstance
     ...    Test objective: This method modifies an individual VNF instance resource
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: VNF instance modified
@@ -68,7 +68,7 @@ PATCH Individual VNFInstance Precondition failed
     ...    Test title: PATCH Individual VNFInstance Precondition failed
     ...    Test objective: The objective is to create a new VNF instance resource
     ...    Pre-conditions:  A precondition given in an HTTP request header is not fulfilled. Typically, this is due to an ETag mismatch, indicating that the resource was modified by another entity
-    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: VNF instance not modified
@@ -81,7 +81,7 @@ PATCH Individual VNFInstance Conflict
     ...    Test title: PATCH Individual VNFInstance Conflict
     ...    Test objective: The objective is to verify that modification operation cannot be executed currently, due to a conflict with the state of the VNF instance resource because another LCM Operation is ongoing. 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: VNF instance not modified
@@ -94,7 +94,7 @@ DELETE Individual VNFInstance
     ...    Test title: DELETE Individual VNFInstance
     ...    Test objective: The objective is to delete a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: VNF instance deleted
@@ -106,7 +106,7 @@ DELETE Individual VNFInstance Conflict
     ...    Test title: DELETE Individual VNFInstance Conflict
     ...    Test objective: The objective is to verify that The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource.
     ...    Pre-conditions: VNF instance resource is in INSTANTIATED state
-    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot b/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
index f818c20e3..a083f949b 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
@@ -10,7 +10,7 @@ Post Individual VNF LCM OP occurrences - Method not implemented
     ...    Test title: Post Individual VNF LCM OP occurrences - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.13.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -22,7 +22,7 @@ Get status information about multiple VNF instances
     ...    Test title: Get status information about multiple VNF instances
     ...    Test objective: The objective is to test that this method retrieve status information about a VNF lifecycle management operation occurrence 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -35,7 +35,7 @@ PUT status information about multiple VNF instances - Method not implemented
     ...    Test title: PUT status information about multiple VNF instances - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.13.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -47,7 +47,7 @@ PATCH status information about multiple VNF instances - Method not implemented
     ...    Test title: PATCH status information about multiple VNF instances - Method not implemented 
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.13.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none      
@@ -59,7 +59,7 @@ DELETE status information about multiple VNF instances - Method not implemented
     ...    Test title: DELETE status information about multiple VNF instances - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.13.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
diff --git a/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
index d1b1078b7..01dd6a03e 100644
--- a/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
@@ -15,7 +15,7 @@ POST Instantiate a vnfInstance
     ...    Test title: POST Instantiate a vnfInstance
     ...    Test objective: The objective is to instantiate a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -28,7 +28,7 @@ POST Instantiate a vnfInstance Conflict
     ...    Test title: POST Instantiate a vnfInstance Conflict
     ...    Test objective: The objective is to verify that the instantiation of the vnf cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
     ...    Pre-conditions: VNF instance resource is in INSTANTIATED state
-    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -41,7 +41,7 @@ GET Instantiate VNFInstance - Method not implemented
     ...    Test title: GET Instantiate VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions:  
-    ...    Reference: Clause 5.4.4.3.2  - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.4.3.2  - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -53,7 +53,7 @@ PUT Instantiate VNFInstance - Method not implemented
     ...    Test title: PUT Instantiate VNFInstance  - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions:  
-    ...    Reference: Clause 5.4.4.3.3  - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.4.3.3  - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: VNF instance not modified
@@ -65,7 +65,7 @@ PATCH Instantiate VNFInstance - Method not implemented
     ...    Test title: PATCH Instantiate VNFInstance  - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions:  
-    ...    Reference: Clause 5.4.4.3.4  - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.4.3.4  - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: VNF instance not modified
@@ -77,7 +77,7 @@ DELETE Instantiate VNFInstance - Method not implemented
     ...    Test title: DELETE Instantiate VNFInstance  - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions:  
-    ...    Reference: Clause 5.4.4.3.5  - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.4.3.5  - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: VNF instance not deleted
diff --git a/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot b/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
index 9dcee2844..6a3ecfce5 100644
--- a/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
+++ b/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
@@ -13,7 +13,7 @@ VNF LCM Operation Occurrence Start Notification
     ...    Test title: VNF LCM Operation Occurrence Start Notification
     ...    Test objective: The objective is to test the dispatch of VNF LCM Operation Occurrence Start Notification when a new VNF LCM operation is started in the VNFM, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system. 
     ...    Pre-conditions: A subscription for VNF LCM Operation Occurrence notifications is available in the VNFM.
-    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -27,7 +27,7 @@ VNF LCM Operation Occurrence Result Notification
     ...    Test title: VNF LCM Operation Occurrence Result Notification
     ...    Test objective: The objective is to test the dispatch of VNF LCM Operation Occurrence Result Notification when a VNF LCM operation is completed in the VNFM, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: An VNF LCM operation is in progress, and a subscription for VNF LCM Operation Occurrence notifications is available in the VNFM.
-    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -41,7 +41,7 @@ VNF Identifier Creation Notification
     ...    Test title: VNF Identifier Creation Notification
     ...    Test objective: The objective is to test the dispatch of VNF Identifier Creation Notification when a new VNF instance resource is created in the VNFM, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A subscription for VNF identifier creation notifications is available in the VNFM.
-    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -54,7 +54,7 @@ VNF Identifier Deletion Notification
     ...    Test title: VNF Identifier Deletion Notification
     ...    Test objective: The objective is to test the dispatch of VNF Identifier Deletion Notification when a VNF instance resource is deleted in the VNFM, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF instance resource is created, and a subscription for VNF identifier creation notifications is available in the VNFM.
-    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
index 5fed39874..88aa95920 100644
--- a/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
@@ -13,7 +13,7 @@ POST Operate a vnfInstance
     ...    Test title: POST Operate a vnfInstance
     ...    Test objective: The objective is to test that POST method operate a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -26,7 +26,7 @@ POST Operate a vnfInstance Conflict (Not-Instantiated)
     ...    Test title: POST Operate a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set. 
     ...    Pre-conditions: the VNF instance resource is in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions:
@@ -40,7 +40,7 @@ POST Operate a vnfInstance Not Found
     ...    Test title: POST Operate a vnfInstance Not Found
     ...    Test objective: The objective is to test that the operation cannot be executed currently, because the resource is not existing
     ...    Pre-conditions: the VNF instance resource is in  not existing
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions:
@@ -53,7 +53,7 @@ GET Operate VNFInstance - Method not implemented
     ...    Test title: GET Operate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.10.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.10.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions:
@@ -65,7 +65,7 @@ PUT Operate VNFInstance - Method not implemented
     ...    Test title: PUT Operate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.10.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.10.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions:
@@ -77,7 +77,7 @@ PATCH Operate VNFInstance - Method not implemented
     ...    Test title: PATCH Operate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.10.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.10.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions:
@@ -89,7 +89,7 @@ DELETE Operate VNFInstance - Method not implemented
     ...    Test title: DELETE Operate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.10.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.10.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions:
diff --git a/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot b/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
index 73415cd4e..d1e1aca15 100644
--- a/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
@@ -14,7 +14,7 @@ POST Retry operation task
     ...    Test title: POST Retry operation task
     ...    Test objective: The objective is to test that POST method The POST method initiates retrying a VNF lifecycle operation if that operation has experienced a temporary failure
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -28,7 +28,7 @@ POST Retry operation task Conflict (Not-FAILED_TEMP)
     ...    Test title: POST Retry operation task Conflict (Not-FAILED_TEMP)
     ...    Test objective: The objective is to test that the retry operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. (i.e. the VNF instance resource is not in FAILED_TEMP state)
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -43,7 +43,7 @@ POST Retry operation task Not Found
     ...    Test title: POST Retry operation task Not Found
     ...    Test objective: The objective is to test that the retry operation cannot be executed because the operation is not supported
     ...    Pre-conditions: 
-    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -55,7 +55,7 @@ GET Retry operation task - Method not implemented
     ...    Test title: GET Retry operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.14.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.14.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -67,7 +67,7 @@ PUT Retry operation task - Method not implemented
     ...    Test title: PUT Retry operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.14.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.14.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -79,7 +79,7 @@ PATCH Retry operation task - Method not implemented
     ...    Test title: PATCH Retry operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.14.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.14.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -91,7 +91,7 @@ DELETE Retry operation task - Method not implemented
     ...    Test title: DELETE Retry operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.14.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.14.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: 
diff --git a/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot b/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
index 50e8a469c..d9513b7ff 100644
--- a/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
@@ -14,7 +14,7 @@ POST Rollback operation task
     ...    Test title: POST Rollback operation task
     ...    Test objective: The objective is to test that POST method The POST method initiates rollback a VNF lifecycle operation if that operation has experienced a temporary failure
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -28,7 +28,7 @@ POST Rollback operation task Conflict (Not-FAILED_TEMP)
     ...    Test title: POST Rollback operation task Conflict (Not-FAILED_TEMP)
     ...    Test objective: The objective is to test that POST method The POST method initiates rollback a VNF lifecycle operation if that operation has experienced a temporary failure
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -43,7 +43,7 @@ POST Rollback operation task Not Found
     ...    Test title: POST Rollback operation task Not Found
     ...    Test objective: The objective is to test that the retry operation cannot be executed because the operation is not supported
     ...    Pre-conditions: 
-    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -55,7 +55,7 @@ GET Rollback operation task - Method not implemented
     ...    Test title: GET Rollback operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.15.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.15.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -67,7 +67,7 @@ PUT Rollback operation task - Method not implemented
     ...    Test title: PUT Rollback operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.15.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.15.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -79,7 +79,7 @@ PATCH Rollback operation task - Method not implemented
     ...    Test title: PATCH Rollback operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.15.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.15.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -91,7 +91,7 @@ DELETE Rollback operation task - Method not implemented
     ...    Test title: DELETE Rollback operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.15.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.15.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: 
diff --git a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
index b5fac239a..b9d984193 100644
--- a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
@@ -13,7 +13,7 @@ POST Scale a vnfInstance
     ...    Test title: POST Scale a vnfInstance
     ...    Test objective: The objective is to scale a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -26,7 +26,7 @@ POST Scale a vnfInstance Conflict (Not-Instantiated)
     ...    Test title: POST Scale a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to verify that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
     ...    Pre-conditions:  VNF instance resource is in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -40,7 +40,7 @@ POST Scale a vnfInstance Not Found
     ...    Test title: POST Scale a vnfInstance Not Found
     ...    Test objective: The objective is to verify that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
     ...    Pre-conditions:  
-    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -53,7 +53,7 @@ GET Scale VNFInstance - Method not implemented
     ...    Test title: GET Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  
-    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -65,7 +65,7 @@ PUT Scale VNFInstance - Method not implemented
     ...    Test title: PUT Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  
-    ...    Reference: Clause 5.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -77,7 +77,7 @@ PATCH Scale VNFInstance - Method not implemented
     ...    Test title: PATCH Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  
-    ...    Reference: Clause 5.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -89,7 +89,7 @@ DELETE Scale VNFInstance - Method not implemented
     ...    Test title: DELETE Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  
-    ...    Reference: Clause 5.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
diff --git a/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
index 920eb313c..be72af268 100644
--- a/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
@@ -12,7 +12,7 @@ POST Scale a vnfInstance to level
     ...    Test title: POST Scale a vnfInstance to level
     ...    Test objective: The objective is to scale a VNF instance to a target level.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions:
@@ -25,7 +25,7 @@ POST Scale a vnfInstance to level Conflict (Not-Instantiated)
     ...    Test title: POST Scale a vnfInstance to level Conflict (Not-Instantiated)
     ...    Test objective: The objective is to verify that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set. 
     ...    Pre-conditions: VNF instance resource is in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions:
@@ -39,7 +39,7 @@ POST Scale a vnfInstance Not Found
     ...    Test title: POST Scale a vnfInstance Not Found
     ...    Test objective: The objective is to verify that the VNF Scale operation fails when the VNF instance resource is not present
     ...    Pre-conditions: VNF instance resource is in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions:
@@ -53,7 +53,7 @@ GET Scale to level VNFInstance - Method not implemented
     ...    Test title: GET Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  
-    ...    Reference: Clause 5.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -65,7 +65,7 @@ PUT Scale to level VNFInstance - Method not implemented
     ...    Test title: PUT Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  
-    ...    Reference: Clause 5.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -77,7 +77,7 @@ PATCH Scale to level VNFInstance - Method not implemented
     ...    Test title: PATCH Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  
-    ...    Reference: Clause 5.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -89,7 +89,7 @@ DELETE Scale to level VNFInstance - Method not implemented
     ...    Test title: DELETE Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  
-    ...    Reference: Clause 5.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
diff --git a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
index a2b2e6303..3f14d231b 100644
--- a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
+++ b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
@@ -12,7 +12,7 @@ POST Create a new subscription
     ...    Test title: POST Create a new subscription
     ...    Test objective: The POST method creates a new subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null
@@ -25,7 +25,7 @@ POST Create a new Subscription - DUPLICATION
     ...    Test title: POST Create a new subscription - DUPLICATION
     ...    Test objective: The POST method creates a new subscription even if an existing subscription to same content exist
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: SUT should support duplication of subscription creation
     ...    Post-Conditions: in response header Location shall not be null
@@ -38,7 +38,7 @@ POST Create a new Subscription - NO-DUPLICATION
     ...    Test title: POST Create a new subscription - NO-DUPLICATION
     ...    Test objective: The POST method creates a new subscription even if an existing subscription to same content exist
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: SUT should not support duplication of subscription creation
     ...    Post-Conditions: in response header Location shall not be null
@@ -51,7 +51,7 @@ GET Subscriptions
     ...    Test title: GET Subscriptions
     ...    Test objective: The objective is Get the list of active subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -64,7 +64,7 @@ GET Subscription - Filter
     ...    Test title: GET Subscriptions - Filter
     ...    Test objective: The objective is Get the list of active subscriptions using a "filter"
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -77,7 +77,7 @@ GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test title: GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is Get the list of active subscriptions using a filter
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -89,7 +89,7 @@ GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test title: GET subscriptions with all_fields attribute selector
     ...    Test objective: The objective is Get the list of active subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -102,7 +102,7 @@ GET subscriptions with exclude_default attribute selector
     ...    Test title: GET subscriptions with exclude_default attribute selector
     ...    Test objective: The objective is Get the list of active subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -115,7 +115,7 @@ GET subscriptions with fields attribute selector
     ...    Test title: GET subscriptions with fields attribute selector
     ...    Test objective: The objective is Get the list of active subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -128,7 +128,7 @@ GET subscriptions with exclude_fields attribute selector
     ...    Test title: GET subscriptions with exclude_fields attribute selector
     ...    Test objective: The objective is Get the list of active subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -141,7 +141,7 @@ PUT subscriptions - Method not implemented
     ...    Test title: PUT subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.18.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -153,7 +153,7 @@ PATCH subscriptions - Method not implemented
     ...    Test title: PATCH subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.18.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -165,7 +165,7 @@ DELETE subscriptions - Method not implemented
     ...    Test title: DELETE subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.18.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: check that resources are not deleted
@@ -178,7 +178,7 @@ POST Create a new Subscription - Unprocessable Entity
     ...    Test title: POST Create a new Subscription - Unprocessable Entity
     ...    Test objective: The objective is to test that content type of the payload body is supported and the payload body of a request contains syntactically correct data but the data cannot be processed.
     ...    re-conditions: none
-    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -191,7 +191,7 @@ GET information about multiple subscriptions to get Paged Response
     ...    Test title: GET information about multiple subscriptions to get Paged Response
     ...    Test objective: The objective is to retrieve information about the subscriptions to get paged response
     ...    Pre-conditions: 
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions:  
@@ -204,7 +204,7 @@ GET information about multiple subscriptions for Bad Request Response too big
     ...    Test title: GET information about multiple subscriptions for Bad Request Response too big
     ...    Test objective: The objective is to test that GET method fail retrieving status information about subscriptions when Response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: 
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
diff --git a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
index 62f4f8f10..643737789 100644
--- a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
@@ -13,7 +13,7 @@ POST Terminate a vnfInstance
     ...    Test title: POST Terminate a vnfInstance
     ...    Test objective: The objective is to test that POST method terminate a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -26,7 +26,7 @@ POST Terminate a vnfInstance Conflict (Not-Instantiated)
     ...    Test title: POST Terminate a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set.  
     ...    Pre-conditions:  VNF instance resource is in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -40,7 +40,7 @@ GET Terminate VNFInstance - Method not implemented
     ...    Test title:  GET Terminate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -52,7 +52,7 @@ PUT Terminate VNFInstance - Method not implemented
     ...    Test title:  PUT Terminate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.8.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.8.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ PATCH Terminate VNFInstance - Method not implemented
     ...    Test title:  PATCH Terminate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.8.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.8.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -76,7 +76,7 @@ DELETE Terminate VNFInstance - Method not implemented
     ...    Test title:  DELETE Terminate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.8.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.8.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFLifecycleManagement-API/VNFInstances.robot b/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
index 4307c4fee..23b5dbea7 100644
--- a/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
+++ b/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
@@ -12,7 +12,7 @@ POST Create a new vnfInstance
     ...    Test title: POST Create a new vnfInstance
     ...    Test objective: The objective is to create a new VNF instance resource
     ...    Pre-conditions: 
-    ...    Reference: Clause 5.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: VNF instance created
@@ -25,7 +25,7 @@ GET information about multiple VNF instances
     ...    Test title: GET information about multiple VNF instances
     ...    Test objective: The objective is to get information about multiples VNF instances
     ...    Pre-conditions: 
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -39,7 +39,7 @@ GET information about multiple VNF instances Bad Request Invalid attribute-based
     ...    Test title: GET information about multiple VNF instances Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to get information about multiples VNF instances with Invalid attribute-based filtering parameters
     ...    Pre-conditions: 
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -52,7 +52,7 @@ GET information about multiple VNF instances Bad Request Invalid attribute selec
     ...    Test title: GET information about multiple VNF instances Bad Request Invalid attribute selector
     ...    Test objective: The objective is to get information about multiples VNF instances with Invalid attribute-based filtering parameters
     ...    Pre-conditions: 
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -65,7 +65,7 @@ GET information about multiple VNF instances with "all_fields" attribute selecto
     ...    Test title: GET information about multiple VNF instances with "all_fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances
     ...    Pre-conditions:  
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -78,7 +78,7 @@ GET information about multiple VNF instances with "exclude_default" attribute se
     ...    Test title: GET information about multiple VNF instances with "exclude_default" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances
     ...    Pre-conditions:  
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -91,7 +91,7 @@ GET information about multiple VNF instances with "fields" attribute selector
     ...    Test title: GET information about multiple VNF instances with "fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances
     ...    Pre-conditions:  
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -104,7 +104,7 @@ GET information about multiple VNF instances with "exclude_fields" attribute sel
     ...    Test title: GET information about multiple VNF instances with "exclude_fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances
     ...    Pre-conditions:  
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -117,7 +117,7 @@ PUT VNFInstances - Method not implemented
     ...    Test title: PUT VNFInstances - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions:  
-    ...    Reference: Clause 5.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -129,7 +129,7 @@ PATCH VNFInstances - Method not implemented
     ...    Test title: PATCH VNFInstances - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions:  
-    ...    Reference: Clause 5.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -141,7 +141,7 @@ DELETE VNFInstances - Method not implemented
     ...    Test title: DELETE VNFInstances - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions:  
-    ...    Reference: Clause 5.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: VNF instance not deleted
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
index 441bb3cf3..cfd78c66d 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
@@ -13,7 +13,7 @@ POST VNF LCM operation occurrences - Method not implemented
     ...    Test title: POST VNF LCM operation occurrences - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.12.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -25,7 +25,7 @@ GET status information about multiple VNF LCM operation occurrences
     ...    Test title: GET status information about multiple VNF LCM operation occurrences
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -38,7 +38,7 @@ GET status information about multiple VNF LCM operation occurrences Bad Request
     ...    Test title: GET status information about multiple VNF LCM operation occurrences Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to test that GET method fail retrieving status information about multiple VNF lifecycle management operation occurrences because attribute is invalid.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -51,7 +51,7 @@ GET status information about multiple VNF LCM Operation occurrences Bad Request
     ...    Test title: GET status information about multiple VNF LCM Operation occurrences Bad Request Invalid attribute selector
     ...    Test objective: The objective is to test that GET method fail retrieving status information about multiple VNF lifecycle management operation occurrences because attribute is invalid.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -64,7 +64,7 @@ GET status information about multiple VNF LCM Operation OCC with "all_fields"
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "all_fields"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -77,7 +77,7 @@ GET status information about multiple VNF LCM Operation OCC with "exlude_default
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "exclude_default"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -90,7 +90,7 @@ GET status information about multiple VNF LCM Operation OCC with "fields"
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "fields"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -103,7 +103,7 @@ GET status information about multiple VNF LCM Operation OCC with "exclude_fields
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "exclude_fields"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -116,7 +116,7 @@ PUT status information about multiple VNF LCM operation occurrences - Method not
     ...    Test title: PUT status information about multiple VNF LCM operation occurrences - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.12.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -128,7 +128,7 @@ PATCH status information about multiple VNF LCM operation occurrences - Method n
     ...    Test title: PATCH status information about multiple VNF LCM operation occurrences - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.12.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -140,7 +140,7 @@ DELETE status information about multiple VNF LCM operation occurrences - Method
     ...    Test title: DELETE status information about multiple VNF LCM operation occurrences - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.12.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -152,7 +152,7 @@ GET status information about multiple VNF LCM operation occurances to get Paged
     ...    Test title: GET status information about multiple VNF LCM operation occurances to get Paged Response
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences to get paged response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -165,7 +165,7 @@ GET status information about multiple VNF LCM Operation occurrences Bad Request
     ...    Test title: GET status information about multiple VNF LCM Operation occurrences Bad Request Response too big
     ...    Test objective: The objective is to test that GET method fail retrieving status information about multiple VNF lifecycle management operation occurrences because Response is too big.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
-- 
GitLab


From ee694009bb4099059d8069f88604e8841fb45ae2 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Mon, 28 Sep 2020 13:56:09 +0500
Subject: [PATCH 044/322] reference updated

---
 .../ApiVersion.robot                          | 20 ++++++-------
 .../IndividualPmJob.robot                     | 16 +++++------
 .../IndividualReport.robot                    | 12 ++++----
 .../IndividualSubscription.robot              | 14 +++++-----
 .../IndividualThreshold.robot                 | 16 +++++------
 .../VNFPerformanceManagement-API/PMJobs.robot | 28 +++++++++----------
 .../Subscriptions.robot                       | 24 ++++++++--------
 .../Thresholds.robot                          | 20 ++++++-------
 .../PerformanceManagementNotification.robot   |  4 +--
 9 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/SOL002/VNFPerformanceManagement-API/ApiVersion.robot b/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
index 4e36c2637..bb484bf34 100644
--- a/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
+++ b/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
@@ -11,7 +11,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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -23,7 +23,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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -36,7 +36,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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -48,7 +48,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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -60,7 +60,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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -72,7 +72,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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -84,7 +84,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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -97,7 +97,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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -109,7 +109,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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -121,7 +121,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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
index 3729a715b..7e39e348e 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
@@ -14,7 +14,7 @@ GET individual VNF Performance Job
     ...    Test title: Get individual VNF Performance Job
     ...    Test objective: The objective is to test the retrieval of an individual VNF performance monitoring job and perform a JSON schema and content validation of the collected job data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -28,7 +28,7 @@ GET individual VNF Performance Job with invalid resource identifier
     ...    Test title: Get individual VNF Performance Job with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual VNF performance monitoring job fails when using an invalid resource identifier, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ DELETE Individual VNF Performance Job
     ...    Test title: Delete Individual VNF Performance Job
     ...    Test objective: The objective is to test the deletion of an individual VNF performance monitoring job
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Job is no more available in the VNFM    
@@ -54,7 +54,7 @@ DELETE Individual VNF Performance Job with invalid resource identifier
     ...    Test title: Delete individual VNF Performance Job with invalid resource identifier
     ...    Test objective: The objective is to test that the deletion of an individual VNF performance monitoring job fails when using an invalid resource identifier, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -67,7 +67,7 @@ POST Individual VNF Performance Job - Method not implemented
     ...    Test title: POST Individual VNF Performance Job - method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF Performance Monitoring Job
     ...    Pre-conditions: A VNF instance is instantiated
-    ...    Reference: Clause 6.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Job is not created on the VNFM
@@ -80,7 +80,7 @@ PUT Individual VNF Performance Job - Method not implemented
     ...    Test title: PUT Individual VNF Performance Job - method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF Performance Monitoring Job
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Job is not modified by the operation
@@ -93,7 +93,7 @@ PATCH Individual VNF Performance Job
     ...    Test title: PATCH Individual VNF Performance Job
     ...    Test objective: The objective is to test that PATCH method allows to modify an exsisting individual PM job resource.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -106,7 +106,7 @@ PATCH Individual VNF Performance Job - Precondition failed
     ...    Test title: PATCH Individual VNF Performance Job - Precondition failed
     ...    Test objective: The objective is to attempt to Modify an individual alarm resource, where the precondition was not met
     ...    Pre-conditions:  A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  The VNF Performance Job is not modified by the operation
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
index 9a8f99a2c..d6ba168b3 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
@@ -11,7 +11,7 @@ Get Individual Performance Report
     ...    Test title: Get Individual Performance Report
     ...    Test objective: The objective is to test the retrieval of an individual VNF performance report associated to a monitoring job and perform a JSON schema validation of the collected report data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
-    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -24,7 +24,7 @@ Get Individual Performance Report with invalid resource endpoint
     ...    Test title: Get Individual Performance Report with invalid resource endpoint
     ...    Test objective:  The objective is to test that the retrieval of an individual VNF performance report associated to a monitoring job fails when using an invalid resource endpoint 
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
-    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -36,7 +36,7 @@ POST Individual Performance Report - Method not implemented
     ...    Test title: POST Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF performance report within a monitoring job
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 6.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF performance report is not created on the VNFM
@@ -49,7 +49,7 @@ PUT Individual Performance Report - Method not implemented
     ...    Test title: PUT Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF performance report within a monitoring job
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
-    ...    Reference: Clause 6.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF performance report is not modified by the operation
@@ -62,7 +62,7 @@ PATCH Individual Performance Report - Method not implemented
     ...    Test title: PATCH Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing VNF performance report within a monitoring job
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
-    ...    Reference: Clause 6.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF performance report is not modified by the operation
@@ -75,7 +75,7 @@ DELETE Individual Performance Report - Method not implemented
     ...    Test title: DELETE Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing VNF performance report within a monitoring job
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
-    ...    Reference: Clause 6.4.4.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.4.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF performance report is not deleted by the operation
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot b/SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot
index 39acdca29..4f34fd5c0 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot
@@ -13,7 +13,7 @@ GET Individual VNF Performance Subscription
     ...    Test title: GET Individual VNF Performance Subscription
     ...    Test objective: The objective is to test the retrieval of individual VNF performance subscription and perform a JSON schema and content validation of the returned subscription data structure
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.8.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.8.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ GET Individual VNF Performance Subscription with invalid resource identifier
     ...    Test title: GET Individual VNF Performance Subscription with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual VNF performance subscription fails when using an invalid resource identifier
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.8.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.8.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +39,7 @@ DELETE Individual VNF Performance Subscription
     ...    Test title: DELETE Individual VNF Performance Subscription
     ...    Test objective: The objective is to test the deletion of an individual VNF performance subscription
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.8.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.8.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Subscription is not available anymore in the VNFM    
@@ -52,7 +52,7 @@ DELETE Individual VNF Performance Subscription with invalid resource identifier
     ...    Test title: DELETE Individual VNF Performance Subscription with invalid resource identifier
     ...    Test objective: The objective is to test that the deletion of an individual VNF performance subscription fails when using an invalid resource identifier
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.8.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.8.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -64,7 +64,7 @@ POST Individual VNF Performance Subscription - Method not implemented
     ...    Test title: POST Individual VNF Performance Subscription - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF Performance Subscription
     ...    Pre-conditions: A VNF instance is instantiated
-    ...    Reference: Clause 6.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Subscription is not created on the VNFM
@@ -77,7 +77,7 @@ PUT Individual VNF Performance Subscription - Method not implemented
     ...    Test title: PUT Individual VNF Performance Subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF Performance subscription
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.8.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.8.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance subscription is not modified by the operation
@@ -90,7 +90,7 @@ PATCH Individual VNF Performance Subscription - Method not implemented
     ...    Test title: PATCH Individual VNF Performance Subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing VNF Performance subscription
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.8.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.8.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance subscription is not modified by the operation
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
index 9bb807520..7520167c4 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -12,7 +12,7 @@ GET Individual Threshold
     ...    Test title: GET Individual Threshold
     ...    Test objective: The objective is to test the retrieval of an individual VNF performance threshold and perform a JSON schema and content validation of the collected threshold data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -26,7 +26,7 @@ GET Individual Threshold with invalid resource identifier
     ...    Test title: GET Individual Threshold with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual VNF performance threshold fails when using an invalid resource identifier
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -38,7 +38,7 @@ DELETE Individual Threshold
     ...    Test title: DELETE Individual Threshold
     ...    Test objective: The objective is to test the deletion of an individual VNF performance threshold
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Threshold is not available anymore in the VNFM    
@@ -51,7 +51,7 @@ DELETE Individual Threshold with invalid resource identifier
     ...    Test title: DELETE Individual Threshold with invalid resource identifier
     ...    Test objective: The objective is to test the deletion of an individual VNF performance threshold
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -63,7 +63,7 @@ POST Individual Threshold - Method not implemented
     ...    Test title: POST Individual Threshold - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF Performance Threshold
     ...    Pre-conditions: A VNF instance is instantiated
-    ...    Reference: Clause 6.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Threshold is not created on the VNFM
@@ -76,7 +76,7 @@ PUT Individual Threshold - Method not implemented
     ...    Test title: PUT Individual Threshold - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF Performance threshold
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Threshold is not modified by the operation
@@ -89,7 +89,7 @@ PATCH Individual Threshold
     ...    Test title: PATCH Individual Threshold 
     ...    Test objective: The objective is to test that PATCH method allows to modify an Individual threshold resource.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Threshold is not modified by the operation
@@ -103,7 +103,7 @@ PATCH Individual Threshold - Precondition failed
     ...    Test title: PATCH Individual Threshold - Preconition failed
     ...    Test objective: The objective is to attempt to modify an individual threshold resource, where the precondition was not met.
     ...    Pre-conditions:  A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  The VNF Performance Job is not modified by the operation
diff --git a/SOL002/VNFPerformanceManagement-API/PMJobs.robot b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
index 577623b15..4552d9ef1 100644
--- a/SOL002/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
@@ -13,7 +13,7 @@ GET all VNF Performance Monitoring Jobs
     ...    Test title: GET all VNF Performance Monitoring Jobs
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance monitoring jobs and perform a JSON schema and content validation of the collected jobs data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ GET VNF Performance Monitoring Jobs with attribute-based filter
     ...    Test title: GET all VNF Performance Monitoring Jobs with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of VNF performance monitoring jobs using attribute-based filter, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued attribute-based filter
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ GET all VNF Performance Monitoring Jobs with all_fields attribute selector
     ...    Test title: GET all VNF Performance Monitoring Jobs with all_fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs all_fields attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued all_fileds selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -55,7 +55,7 @@ GET all VNF Performance Monitoring Jobs with exclude_default attribute selector
     ...    Test title: GET all VNF Performance Monitoring Jobs with exclude_default attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs exclude_default attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued exclude_default selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -69,7 +69,7 @@ GET all VNF Performance Monitoring Jobs with fields attribute selector
     ...    Test title: GET all VNF Performance Monitoring Jobs with fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs fields attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued fields selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM supports the use of exclude_fields attribute selector
     ...    Post-Conditions: none
@@ -83,7 +83,7 @@ GET all VNF Performance Monitoring Jobs with exclude_fields attribute selector
     ...    Test title: GET all VNF Performance Monitoring Jobs with exclude_fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs exclude_fields attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued exclude_fields selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM supports the use of exclude_fields attribute selector
     ...    Post-Conditions: none
@@ -97,7 +97,7 @@ GET VNF Performance Monitoring Jobs with invalid attribute-based filter
     ...    Test title: GET VNF Performance Monitoring Jobs with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of VNF performance monitoring jobs fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -110,7 +110,7 @@ GET VNF Performance Monitoring Jobs with invalid resource endpoint
     ...    Test title: GET VNF Performance Monitoring Jobs with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of VNF performance monitoring jobs fails when using invalid resource endpoint, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -123,7 +123,7 @@ Create new VNF Performance Monitoring Job
     ...    Test title:  Create a new VNF Performance Monitoring Job
     ...    Test objective: The objective is to test the creation of a new VNF performance monitoring job and perform the JSON schema validation of the returned job data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Job is successfully created on the VNFM
@@ -137,7 +137,7 @@ PUT all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test title: PUT all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF Performance Monitoring Jobs
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -149,7 +149,7 @@ PATCH all VNF Performance Monitoring Jobs - (Method not implemented)
     ...    Test title: PATCH all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF Performance Monitoring Jobs
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -161,7 +161,7 @@ DELETE all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test title: DELETE all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to update VNF Performance Monitoring Jobs
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -174,7 +174,7 @@ GET VNF Performance Monitoring Jobs to get Paged Response
     ...    Test title: GET VNF Performance Monitoring Jobs to get Paged Response
     ...    Test objective: The objective is to test the retrieval of VNF performance monitoring jobs to get Paged response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -187,7 +187,7 @@ GET VNF Performance Monitoring Jobs for Bad Request Response too big
     ...    Test title: GET VNF Performance Monitoring Jobs for Bad Request Response too big
     ...    Test objective: The objective is to test that GET method fail retrieving status information about VNF Performance Monitoring when Response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFPerformanceManagement-API/Subscriptions.robot b/SOL002/VNFPerformanceManagement-API/Subscriptions.robot
index 11c7f53ad..2ba4751cb 100644
--- a/SOL002/VNFPerformanceManagement-API/Subscriptions.robot
+++ b/SOL002/VNFPerformanceManagement-API/Subscriptions.robot
@@ -17,7 +17,7 @@ GET all VNF Performance Subscriptions
     ...    Test title: GET all VNF Performance Subscriptions
     ...    Test objective: The objective is to test the retrieval of all VNF performance subscriptions and perform a JSON schema validation of the returned subscriptions data structure
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -30,7 +30,7 @@ GET VNF Performance Subscriptions with attribute-based filter
     ...    Test title: GET VNF Performance Subscriptions with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of VNF performance subscriptions using attribute-based filter, perform a JSON schema validation of the collected indicators data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -44,7 +44,7 @@ GET VNF Performance Management Subscriptions with invalid attribute-based filter
     ...    Test title: GET VNF Performance Management Subscriptions with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of VNF performance subscriptions fails when using invalid attribute-based filters, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -57,7 +57,7 @@ GET VNF Performance Subscriptions with invalid resource endpoint
     ...    Test title: GET VNF Performance Subscriptions with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of all VNF performance subscriptions fails when using invalid resource endpoint.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -69,7 +69,7 @@ Create new VNF Performance subscription
     ...    Test title: Create new VNF Performance subscription
     ...    Test objective: The objective is to test the creation of a new VNF performance subscription and perform a JSON schema and content validation of the returned subscription data structure
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF performance subscription is successfully set and it matches the issued subscription    
@@ -86,7 +86,7 @@ Create duplicated VNF Performance subscription with VNFM not creating duplicated
     ...    Test title: Create duplicated VNF Performance subscription with VNFM not creating duplicated subscriptions
     ...    Test objective: The objective is to test the attempt of a creation of a duplicated VNF performance subscription and check that no new subscription is created by the VNFM and a link to the original subscription is returned
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM does not support the creation of duplicated subscriptions
     ...    Post-Conditions: The existing VNF performance subscription returned is available in the VNFM 
@@ -102,7 +102,7 @@ Create duplicated VNF Performance subscription with VNFM creating duplicated sub
     ...    Test title: Create duplicated VNF Performance subscription with VNFM creating duplicated subscriptions
     ...    Test objective: The objective is to test the creation of a duplicated VNF performance subscription and perform a JSON schema and content validation of the returned duplicated subscription data structure
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM supports the creation of duplicated subscriptions
     ...    Post-Conditions: The duplicated VNF performance subscription is successfully set and it matches the issued subscription
@@ -117,7 +117,7 @@ PUT VNF Performance Subscriptions - Method not implemented
     ...    Test title: PUT VNF Performance Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF performance subscriptions
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.7.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -129,7 +129,7 @@ PATCH VNF Performance Subscriptions - Method not implemented
     ...    Test title: PATCH VNF Performance Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF performance subscriptions
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.7.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -141,7 +141,7 @@ DELETE VNF Performance Subscriptions - Method not implemented
     ...    Test title: DELETE VNF Performance Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete VNF performance subscriptions
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.7.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF performance subscriptions are not deleted by the failed operation   
@@ -154,7 +154,7 @@ GET VNF Performance Subscriptions to get Paged Response
     ...    Test title: GET VNF Performance Subscriptions to get Paged Response
     ...    Test objective: The objective is to test the retrieval of all VNF performance subscriptions to get Paged Response
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -167,7 +167,7 @@ GET VNF Performance Management Subscriptions for Bad Request Response too big
     ...    Test title: GET VNF Performance Management Subscriptions for Bad Request Response too big
     ...    Test objective: The objective is to test that the retrieval of VNF performance subscriptions fails when response is too big, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFPerformanceManagement-API/Thresholds.robot b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
index 50552ec4f..e3be8ce01 100644
--- a/SOL002/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
@@ -13,7 +13,7 @@ GET All Performance Thresholds
     ...    Test title: GET All Performance Thresholds
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance thresholds and perform a JSON schema validation of the collected thresholds data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -26,7 +26,7 @@ GET Performance Thresholds with attribute-based filter
     ...    Test title: GET Performance Thresholds with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance thresholds when using attribute-based filters, perform a JSON schema validation of the collected thresholds data structure, and verify that the retrieved information matches the issued attribute-based filter
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -40,7 +40,7 @@ GET Performance Thresholds with invalid attribute-based filter
     ...    Test title: GET Performance Thresholds with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of VNF performance thresholds fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -52,7 +52,7 @@ GET Performance Thresholds with invalid resource endpoint
     ...    Test title: GET Performance Thresholds with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of VNF performance thresholds fails when using invalid resource endpoint, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -65,7 +65,7 @@ Create new Performance Threshold
     ...    Test title:  Create new Performance Threshold
     ...    Test objective: The objective is to test the creation of a new VNF performance threshold and perform the JSON schema validation of the returned threshold data structure
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Threshold is successfully created on the VNFM
@@ -80,7 +80,7 @@ PUT Performance Thresholds - Method not implemented
     ...    Test title: PUT Performance Thresholds - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF Performance Thresholds
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNF.
-    ...    Reference: Clause 6.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -92,7 +92,7 @@ PATCH Performance Thresholds - Method not implemented
     ...    Test title: PATCH Performance Thresholds - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify VNF Performance Thresholds
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -104,7 +104,7 @@ DELETE Performance Thresholds - Method not implemented
     ...    Test title: DELETE Performance Thresholds - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to update VNF Performance Thresholds
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF performance thresholds are not deleted by the failed operation
@@ -117,7 +117,7 @@ GET Performance Thresholds with Paged Response
     ...    Test title: GET Performance Thresholds with Paged Response
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance thresholds with Paged response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -130,7 +130,7 @@ GET Performance Thresholds for Bad Request Response too big
     ...    Test title: GET Performance Thresholds for Bad Request Response too big
     ...    Test objective: The objective is to test that the retrieval of VNF performance thresholds fails when response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot b/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
index bc0e9702f..58a7d9039 100644
--- a/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
+++ b/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
@@ -17,7 +17,7 @@ VNF Performance Information Availability Notification
     ...    Test title: VNF Performance Information Availability Notification
     ...    Test objective: The objective is to test the dispatch of VNF Performance Information Availability Notification when new VNF performance information is available in the NFVO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF performance job is created, and a subscription for information availability notifications is available in the VNFM.
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -30,7 +30,7 @@ VNF Threshold Crossed Notification
     ...    Test title: VNF Threshold Crossed Notification
     ...    Test objective: The objective is to test the dispatch of VNF Threshold Crossed Notification when a previously set VNF performance metric threshold is crossed, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF performance job is created, and a threshold subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-- 
GitLab


From 47c239360f356e320a7b7f2cd9ab144910c117c4 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Mon, 28 Sep 2020 15:38:42 +0500
Subject: [PATCH 045/322] reference updated

---
 SOL002/VNFFaultManagement-API/Alarms.robot    | 38 ++++++++--------
 .../VNFFaultManagement-API/ApiVersion.robot   | 20 ++++-----
 .../EscalatePerceivedSeverityTask.robot       | 10 ++---
 .../IndividualAlarm.robot                     | 14 +++---
 .../IndividualSubscription.robot              | 10 ++---
 .../NotificationEndpoint.robot                |  6 +--
 .../Subscriptions.robot                       | 44 +++++++++----------
 7 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/SOL002/VNFFaultManagement-API/Alarms.robot b/SOL002/VNFFaultManagement-API/Alarms.robot
index c7ef62b0f..c25094178 100644
--- a/SOL002/VNFFaultManagement-API/Alarms.robot
+++ b/SOL002/VNFFaultManagement-API/Alarms.robot
@@ -13,7 +13,7 @@ POST Alarms - Method not implemented
     ...    Test title: POST Alarms - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ GET information about multiple alarms
     ...    Test title: GET information about multiple alarms
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions:  
@@ -38,7 +38,7 @@ GET information about multiple alarms with attribute-based filter
     ...    Test title: GET information about multiple alarms with attribute-based filter
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -51,7 +51,7 @@ GET information about multiple alarms with invalid attribute-based filter
     ...    Test title: GET information about multiple alarms with invalid attribute-based filter
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -64,7 +64,7 @@ GET information about multiple alarms with "all_fields" attribute selector
     ...    Test title: GET information about multiple alarms with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -77,7 +77,7 @@ GET information about multiple alarms with exclude_default attribute selector
     ...    Test title: GET information about multiple alarms with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -91,7 +91,7 @@ GET information about multiple alarms with fields attribute selector
     ...    Test title: GET information about multiple alarms with fields attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -104,7 +104,7 @@ GET information about multiple alarms with "exclude_fields" attribute selector
     ...    Test title: GET information about multiple alarms with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: none
@@ -117,7 +117,7 @@ PUT Alarms - Method not implemented
     ...    Test title: PUT Alarms - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: none
@@ -129,7 +129,7 @@ PATCH Alarms - Method not implemented
     ...    Test title: PATCH Alarms - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: none
@@ -141,7 +141,7 @@ DELETE Alarms - Method not implemented
     ...    Test title: DELETE Alarms - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.6 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.2.3.6 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: the alarm is not deleted
@@ -153,7 +153,7 @@ GET information about multiple alarms to get Paged Response
     ...    Test title: GET information about multiple alarms to get Paged Response
     ...    Test objective: The objective is to retrieve information about the alarms to get paged response
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions:  
@@ -166,7 +166,7 @@ GET information about multiple alarms for Bad Request Response too big
     ...    Test title: GET information about multiple alarms for Bad Request Response too big
     ...    Test objective: The objective is to test that GET method fail retrieving status information about Alarms when Response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -179,7 +179,7 @@ GET information about alarms with attribute-based filter "id"
     ...    Test title: GET information about alarms with attribute-based filter "id"
     ...    Test objective: The objective is to retrieve information about the alarm list with alarm filter "id"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -193,7 +193,7 @@ GET information about multiple alarms with attribute-based filter "vnfcInstanceI
     ...    Test title: GET information about multiple alarms with attribute-based filter "vnfcInstanceIds"
     ...    Test objective: The objective is to retrieve information about the alarm list with attribute filter "vnfcInstanceIds"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -207,7 +207,7 @@ GET information about multiple alarms with attribute-based filter "rootCauseFaul
     ...    Test title: GET information about multiple alarms with attribute-based filter "rootCauseFaultyResource.faultyResourceType"
     ...    Test objective: The objective is to retrieve information about the alarm list with attribute filter "rootCauseFaultyResource.faultyResourceType"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -221,7 +221,7 @@ GET information about multiple alarms with attribute-based filter "eventType"
     ...    Test title: GET information about multiple alarms with attribute-based filter "eventType"
     ...    Test objective: The objective is to retrieve information about the alarm list with attribute filter "eventType"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -235,7 +235,7 @@ GET information about multiple alarms with attribute-based filter "perceivedSeve
     ...    Test title: GET information about multiple alarms with attribute-based filter "perceivedSeverity"
     ...    Test objective: The objective is to retrieve information about the alarm list with attribute filter "perceivedSeverity"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -249,7 +249,7 @@ GET information about multiple alarms with attribute-based filter "probableCause
     ...    Test title: GET information about multiple alarms with attribute-based filter "probableCause"
     ...    Test objective: The objective is to retrieve information about the alarm list with attribute filter "probableCause"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
diff --git a/SOL002/VNFFaultManagement-API/ApiVersion.robot b/SOL002/VNFFaultManagement-API/ApiVersion.robot
index f8e2fea9d..ae7bb77b0 100644
--- a/SOL002/VNFFaultManagement-API/ApiVersion.robot
+++ b/SOL002/VNFFaultManagement-API/ApiVersion.robot
@@ -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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot b/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
index 89822d2b5..7f6e2706d 100644
--- a/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
+++ b/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
@@ -10,7 +10,7 @@ Escalate the perceived severity
     ...    Test title: Escalate the perceived severity
     ...    Test objective: To enable the consumer to escalate the perceived severity of an alarm that is represented by an individual alarm resource.
     ...    Pre-conditions: The resource representing the individual alarm has been created
-    ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions:   
@@ -22,7 +22,7 @@ GET Escalate the perceived severity - Method not implemented
     ...    Test title: GET Escalate the perceived severity - Method not implemented
     ...    Test objective: The objective is to test that the GET HTTP method not implemented for escalate perceived severity
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions:   
@@ -34,7 +34,7 @@ PUT Escalate the perceived severity - Method not implemented
     ...    Test title: PUT Escalate the perceived severity - Method not implemented
     ...    Test objective: The objective is to test that the PUT HTTP method not implemented for escalate perceived severity
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions:   
@@ -46,7 +46,7 @@ PATCH Escalate the perceived severity - Method not implemented
     ...    Test title: PATCH Escalate the perceived severity - Method not implemented
     ...    Test objective: The objective is to test that the PATCH HTTP method not implemented for escalate perceived severity
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions:   
@@ -59,7 +59,7 @@ DELETE Escalate the perceived severity - Method not implemented
     ...    Test title: DELETE Escalate the perceived severity - Method not implemented
     ...    Test objective: The objective is to test that the DELETE HTTP method not implemented for escalate perceived severity
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.4.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.4.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions:   
diff --git a/SOL002/VNFFaultManagement-API/IndividualAlarm.robot b/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
index d6c9454f3..da15e6b9d 100644
--- a/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
+++ b/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
@@ -18,7 +18,7 @@ POST Alarm - Method not implemented
     ...    Test title: POST Alarm - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: none
@@ -31,7 +31,7 @@ GET information about an individual alarm
     ...    Test title: GET information about an individual alarm
     ...    Test objective: The objective is to read an individual alarm.
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 7.4.3.3.2  - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.3.3.2  - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions:   
@@ -46,7 +46,7 @@ PUT Individual Alarm - Method not implemented
     ...    Test title: PUT Individual Alarm - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: none
@@ -59,7 +59,7 @@ PATCH Individual Alarm
     ...    Test title: PATCH Individual Alarm
     ...    Test objective: The objective is to Modify an individual alarm resource
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: none
@@ -72,7 +72,7 @@ PATCH Individual Alarm - Precondition failed
     ...    Test title: PATCH Individual Alarm - Precondition failed
     ...    Test objective: The objective is to attempt to Modify an individual alarm resource, where the precondition was not met
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: The alarm resource is not modified
@@ -85,7 +85,7 @@ PATCH Individual Alarm - Conflict
     ...    Test title: PATCH Individual Alarm - Conflict
     ...    Test objective: The objective is to Modify an individual alarm resource
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: The alarm resource is not modified
@@ -99,7 +99,7 @@ DELETE Individual Alarm - Method not implemented
     ...    Test title: DELETE Individual Alarm - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: alarm not deleted
diff --git a/SOL002/VNFFaultManagement-API/IndividualSubscription.robot b/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
index db5d06baf..36b8f8641 100644
--- a/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
+++ b/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
@@ -13,7 +13,7 @@ POST Individual Subscription - Method not implemented
     ...    Test title: POST Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -25,7 +25,7 @@ GET Information about an individual subscription
     ...    Test title: GET Information about an individual subscription
     ...    Test objective: The objective is to read an individual subscription for VNF alarms subscribed by the client
     ...    Pre-conditions: The subscription with the given id exists
-    ...    Reference: Clause 7.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -38,7 +38,7 @@ PUT an individual subscription - Method not implemented
     ...    Test title: PUT an individual subscription - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -51,7 +51,7 @@ PATCH an individual subscription - Method not implemented
     ...    Test title: PATCH an individual subscription - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -64,7 +64,7 @@ DELETE an individual subscription
     ...    Test title: DELETE an individual subscription
     ...    Test objective: The objective is to test that the deletion of a subscription
     ...    Pre-conditions: an existing subscription
-    ...    Reference: Clause 7.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: the subscription is deleted
diff --git a/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot b/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
index 0b8e28eda..d5795f5c0 100644
--- a/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
+++ b/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
@@ -15,7 +15,7 @@ VNF Fault Alarm Notification
     ...    Test title: VNF Fault Alarm Notification
     ...    Test objective: The objective is to test the dispatch of VNF Fault Alarm Notification when a virtualised resource within an VNF instance fails, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm notifications is available in the VNFM.
-    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -28,7 +28,7 @@ VNF Fault Alarm Cleared Notification
     ...    Test title: VNF Fault Alarm Cleared Notification
     ...    Test objective: The objective is to test the dispatch of VNF Fault Alarm Cleared Notification when a faulty virtualised resource within an VNF instance is cleared, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF instance is instantiated, a virtualised resource is in faulty state, and a subscription for fault alarm cleared notifications is available in the VNFM.
-    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -41,7 +41,7 @@ VNF Fault Alarm List Rebuilt Notification
     ...    Test title: VNF Fault Alarm List Rebuilt Notification 
     ...    Test objective: The objective is to test the dispatch of VNF Fault Alarm List Rebuilt Notification when the VNFM decides to rebuild the list of its VNF alarms, e.g. due to a corruption in the alarm storage, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF instance is instantiated, one or more virtualised resource are in faulty state, and a subscription for fault alarm list rebuilt notifications is available in the VNFM.
-    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFFaultManagement-API/Subscriptions.robot b/SOL002/VNFFaultManagement-API/Subscriptions.robot
index b77885650..209997b2a 100644
--- a/SOL002/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL002/VNFFaultManagement-API/Subscriptions.robot
@@ -11,7 +11,7 @@ Create a new subscription
     ...    Test title: Create a new subscription
     ...    Test objective: The objective is to create a new subscription.
     ...    Pre-conditions: no subscription with the same filter and callbackUri exists
-    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: Resource created successfully
@@ -25,7 +25,7 @@ Create a new Subscription - DUPLICATION
     ...    Test title: Create a new Subscription - DUPLICATION
     ...    Test objective: The objective is to create a duplicate subscription.
     ...    Pre-conditions: subscription with the same filter and callbackUri exists
-    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: the VNFM does not allow creation of a subscription resource if another subscription resource with the same filter and callbackUri already exists
     ...    Post-Conditions: duplicated subscription is created
@@ -38,7 +38,7 @@ Create a new Subscription - NO-DUPLICATION
     ...    Test title: Create a new Subscription - NO-DUPLICATION
     ...    Test objective: The objective is to create a subscription in case of not allowed DUPLICATION.
     ...    Pre-conditions: subscription with the same filter and callbackUri exists
-    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: the VNFM does not allow creation of a duplicate subscription resource 
     ...    Post-Conditions: duplicated subscription is not created
@@ -50,7 +50,7 @@ GET Subscriptions
     ...    Test title: GET Subscriptions
     ...    Test objective: The objective is to retrieve the list of active subscriptions
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: subscription is not deleted
@@ -63,7 +63,7 @@ GET Subscription - Filter
     ...    Test title: GET Subscription - Filter
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -76,7 +76,7 @@ GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test title: GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to retrieve the list of active subscriptions with Invalid attribute-based filtering parameters
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -89,7 +89,7 @@ GET subscriptions with "all_fields" attribute selector
     ...    Test title: GET subscriptions with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -102,7 +102,7 @@ GET subscriptions with "exclude_default" attribute selector
     ...    Test title: GET subscriptions with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -115,7 +115,7 @@ GET subscriptions with "fields" attribute selector
     ...    Test title: GET subscriptions with "fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -128,7 +128,7 @@ GET subscriptions with "exclude_fields" attribute selector
     ...    Test title: GET subscriptions with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -143,7 +143,7 @@ PUT subscriptions - Method not implemented
     ...    Test title: PUT subscriptions - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -155,7 +155,7 @@ PATCH subscriptions - Method not implemented
     ...    Test title: PUT subscriptions - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -167,7 +167,7 @@ DELETE subscriptions - Method not implemented
     ...    Test title: DELETE subscriptions - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: subscription not deleted
@@ -179,7 +179,7 @@ GET Subscriptions to get Paged Response
     ...    Test title: GET Subscriptions to get Paged Response
     ...    Test objective: The objective is to retrieve the list of active subscriptions to get paged response
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: subscription is not deleted
@@ -192,7 +192,7 @@ GET subscriptions - Bad Request Response too Big
     ...    Test title: GET subscriptions - Bad Request Response too Big
     ...    Test objective: The objective is to test that GET method fail retrieving list of active subscription because Response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -205,7 +205,7 @@ GET Subscription with attribute-based filter "id"
     ...    Test title: GET Subscription with attribute-based filter "id"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "id"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -220,7 +220,7 @@ Get subscriptions with filter "filter.notificationTypes"
     ...    Test title: GET Subscription with attribute-based filter "filter.notificationTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.notificationTypes"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -234,7 +234,7 @@ Get subscriptions with filter "filter.faultyResourceTypes"
     ...    Test title: GET Subscription with attribute-based filter "filter.faultyResourceTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.faultyResourceTypes"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -248,7 +248,7 @@ Get subscriptions with filter "filter.perceivedSeverities"
     ...    Test title: GET Subscription with attribute-based filter "filter.perceivedSeverities"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.perceivedSeverities"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -262,7 +262,7 @@ Get subscriptions with filter "filter.eventTypes"
     ...    Test title: GET Subscription with attribute-based filter "filter.eventTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.eventTypes"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -276,7 +276,7 @@ Get subscriptions with filter "filter.probableCauses"
     ...    Test title: GET Subscription with attribute-based filter "filter.probableCauses"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.probableCauses"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -290,7 +290,7 @@ POST Create a new Subscription - Unprocessable Entity
     ...    Test title: POST Create a new Subscription - Unprocessable Entity
     ...    Test objective: The objective is to test that content type of the payload body is supported and the payload body of a request contains syntactically correct data but the data cannot be processed.
     ...    re-conditions: none
-    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-- 
GitLab


From da1ef090fecdbd2b35687c210246a41c053383eb Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Mon, 28 Sep 2020 16:24:08 +0500
Subject: [PATCH 046/322] reference updated

---
 SOL002/VNFIndicator-API/ApiVersion.robot      | 20 +++++++-------
 .../IndividualSubscription.robot              | 14 +++++-----
 .../IndividualVNFindicator.robot              | 24 ++++++++---------
 SOL002/VNFIndicator-API/Subscriptions.robot   | 26 +++++++++----------
 SOL002/VNFIndicator-API/VNFIndicators.robot   | 26 +++++++++----------
 .../VnfIndicatorsInVnfInstanceId.robot        | 20 +++++++-------
 .../VnfIndicatorNotification.robot            |  2 +-
 7 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/SOL002/VNFIndicator-API/ApiVersion.robot b/SOL002/VNFIndicator-API/ApiVersion.robot
index fce69405c..25aa1403f 100644
--- a/SOL002/VNFIndicator-API/ApiVersion.robot
+++ b/SOL002/VNFIndicator-API/ApiVersion.robot
@@ -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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFIndicator-API/IndividualSubscription.robot b/SOL002/VNFIndicator-API/IndividualSubscription.robot
index 16de0847e..d8a8eb5a0 100644
--- a/SOL002/VNFIndicator-API/IndividualSubscription.robot
+++ b/SOL002/VNFIndicator-API/IndividualSubscription.robot
@@ -11,7 +11,7 @@ GET Individual VNF Indicator Subscription
     ...    Test title: Get individual subscription to VNF performance indicators
     ...    Test objective: The objective is to test the retrieval of individual VNF performance indicator subscription and perform a JSON schema validation of the returned subscription data structure
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
@@ -24,7 +24,7 @@ GET Individual VNF Indicator Subscription with invalid resource identifier
     ...    Test title: Get individual subscription to VNF performance indicators
     ...    Test objective: The objective is to test that the retrieval of individual VNF performance indicator subscription fails when using an invalid resource identifier. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
@@ -37,7 +37,7 @@ DELETE Individual VNF Indicator Subscription
     ...    Test title: Delete individual subscription to VNF performance indicators
     ...    Test objective: The objective is to test the deletion of an individual VNF performance indicator subscription.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: clause 8.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: clause 8.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: The subscription to VNF performance indicators is deleted
@@ -50,7 +50,7 @@ DELETE Individual VNF Indicator Subscription with invalid resource identifier
     ...    Test title: Delete individual subscription to VNF performance indicators
     ...    Test objective: The objective is to test that the deletion of an individual VNF performance indicator subscription fails when using an invalid resource identifier. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: clause 8.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: clause 8.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none   
@@ -63,7 +63,7 @@ PUT Individual VNF Indicator Subscription - Method not implemented
     ...    Test title: PUT individual VNF indicator subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an individual VNF performance indicator subscription
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: The individual VNF indicator subscription is not modified by the operation
@@ -76,7 +76,7 @@ PATCH Individual VNF Indicator Subscription - Method not implemented
     ...    Test title: PUT individual VNF indicator subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update an individual VNF performance indicator subscription
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: The individual VNF indicator subscription is not modified by the operation
@@ -89,7 +89,7 @@ POST Individual VNF Indicator Subscription - Method not implemented
     ...    Test title: PUT individual VNF indicator subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an individual VNF performance indicator subscription
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: The individual VNF indicator subscription is not created by the operation
diff --git a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
index f4cecd713..08a04f106 100644
--- a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
+++ b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
@@ -10,7 +10,7 @@ Get Individual Indicator for VNF Instance
     ...    Test title: Get individual performance indicator for a VNF instance
     ...    Test objective: The objective is to test the retrieval of a performance indicator for a given VNF instance and perform a JSON schema validation of the returned indicator data structure
     ...    Pre-conditions: A VNF instance is instantiated. At least one measure of performance indicator is available for the given VNF instance.
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ Get Individual Indicator for VNF Instance with invalid indicator identifier
     ...    Test title: Get individual performance indicator for a VNF instance with invalid indicator identifier
     ...    Test objective: The objective is to test that the retrieval of a performance indicator for a given VNF instance fails when using an invalid resource identifier. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. At least one measure of performance indicator is available for the given VNF instance.
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -38,7 +38,7 @@ POST Individual VNF Indicator - Method not implemented
     ...    Test title: POST individual performance indicator for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new performance indicator for a VNF instance
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ PUT Individual VNF Indicator - Method not implemented
     ...    Test title: PUT individual performance indicator for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an existing performance indicator for a VNF instance
     ...    Pre-conditions: A VNF instance is instantiated. At least one measure of performance indicator is available for the given VNF instance.
-    ...    Reference: Clause 8.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -62,7 +62,7 @@ PATCH Individual VNF Indicator - Method not implemented
     ...    Test title: PATCH individual performance indicator for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update an existing performance indicator for a VNF instance
     ...    Pre-conditions: A VNF instance is instantiated. At least one measure of performance indicator is available for the given VNF instance.
-    ...    Reference: Clause 8.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -74,7 +74,7 @@ DELETE Individual VNF Indicator - Method not implemented
     ...    Test title: DELETE individual performance indicator indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing performance indicator for a VNF instance
     ...    Pre-conditions: A VNF instance is instantiated. At least one measure of performance indicator is available for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: The individual performance indicator for the VNF instance is not deleted by the unsuccessful operation
@@ -87,7 +87,7 @@ Get Individual Performance Indicator
     ...    Test title: Get Individual Performance Indicator 
     ...    Test objective: The objective is to test the retrieval of a performance indicator and perform a JSON schema validation of the returned indicator data structure
     ...    Pre-conditions: At least one measure of performance indicator is available..
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
@@ -101,7 +101,7 @@ Get Individual Performance Indicator with invalid indicator identifier
     ...    Test title: Get Individual Performance Indicator with invalid indicator identifier
     ...    Test objective: The objective is to test that the retrieval of a performance indicator fails when using an invalid resource identifier. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: At least one measure of performance indicator is available.
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -114,7 +114,7 @@ POST Individual Performance Indicator - Method not implemented
     ...    Test title: POST Individual Performance Indicator - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new performance indicator.
     ...    Pre-conditions: 
-    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -126,7 +126,7 @@ PUT Individual Performance Indicator - Method not implemented
     ...    Test title: PUT Individual Performance Indicator - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an existing performance indicator.
     ...    Pre-conditions: At least one measure of performance indicator is available.
-    ...    Reference: Clause 8.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -138,7 +138,7 @@ PATCH Individual Performance Indicator - Method not implemented
     ...    Test title: PATCH Individual Performance Indicator - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update an existing performance indicator.
     ...    Pre-conditions: At least one measure of performance indicator is available.
-    ...    Reference: Clause 8.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -150,7 +150,7 @@ DELETE Individual Performance Indicator - Method not implemented
     ...    Test title: DELETE Individual Performance Indicator - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing performance indicator.
     ...    Pre-conditions: At least one measure of performance indicator is available.
-    ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: 
diff --git a/SOL002/VNFIndicator-API/Subscriptions.robot b/SOL002/VNFIndicator-API/Subscriptions.robot
index 1d54a66d2..b0aadf74d 100644
--- a/SOL002/VNFIndicator-API/Subscriptions.robot
+++ b/SOL002/VNFIndicator-API/Subscriptions.robot
@@ -17,7 +17,7 @@ GET VNF Indicators Subscriptions
     ...    Test title: GET VNF Indicators Subscriptions
     ...    Test objective: The objective is to test the retrieval of all VNF indicators subscriptions and perform a JSON schema validation of the returned subscriptions data structure
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators
     ...    Post-Conditions: none
@@ -30,7 +30,7 @@ GET VNF Indicators Subscriptions with attribute-based filter
     ...    Test title: GET VNF Indicators Subscriptions with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of all VNF indicators subscriptions using attribute-based filter and perform a JSON schema and content validation of the returned subscriptions data structure
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators
     ...    Post-Conditions: none
@@ -44,7 +44,7 @@ GET VNF Indicators Subscriptions with invalid attribute-based filter
     ...    Test title: GET VNF Indicators Subscriptions with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of all VNF indicators subscriptions fails when using invalid attribute-based filter. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators
     ...    Post-Conditions: none
@@ -57,7 +57,7 @@ GET VNF Indicators Subscriptions with invalid resource endpoint
     ...    Test title: GET VNF Indicators Subscriptions with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of all VNF indicators subscriptions fails when using invalid resource endpoint.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators.
     ...    Post-Conditions: none
@@ -69,7 +69,7 @@ Create new VNF indicator subscription
     ...    Test title: Create new VNF indicator subscription
     ...    Test objective: The objective is to test the creation of a new VNF indicator subscription perform a JSON schema and content validation of the returned subscriptions data structure
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators.
     ...    Post-Conditions: The VNF indicator subscription is successfully set and it matches the issued subscription
@@ -84,7 +84,7 @@ PUT VNF Indicator Subscriptions - Method not implemented
     ...    Test title: PUT VNF Indicator Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF indicator subscriptions
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators.
     ...    Post-Conditions: none
@@ -96,7 +96,7 @@ PATCH VNF Indicator Subscriptions - Method not implemented
     ...    Test title: PATCH VNF Indicator Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF indicator subscriptions
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators.
     ...    Post-Conditions: none
@@ -108,7 +108,7 @@ DELETE VNF Indicator Subscriptions - Method not implemented
     ...    Test title: DELETE VNF Indicator Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete VNF indicator subscriptions
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators.
     ...    Post-Conditions: none
@@ -120,7 +120,7 @@ GET VNF Indicators Subscriptions to get Paged Response
     ...    Test title: GET VNF Indicators Subscriptions to get Paged Response
     ...    Test objective: The objective is to test the retrieval of all VNF indicators subscriptions to get Paged Response.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators
     ...    Post-Conditions: none
@@ -133,7 +133,7 @@ GET VNF Indicators Subscriptions - Bad Request Response too Big
     ...    Test title: GET VNF Indicators Subscriptions - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of all VNF indicators subscriptions fails because response is too big. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators
     ...    Post-Conditions: none
@@ -146,7 +146,7 @@ POST Create a new Subscription - Unprocessable Entity
     ...    Test title: POST Create a new Subscription - Unprocessable Entity
     ...    Test objective: The objective is to test that content type of the payload body is supported and the payload body of a request contains syntactically correct data but the data cannot be processed.
     ...    re-conditions: none
-    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -159,7 +159,7 @@ Create new VNF indicator Subscription - DUPLICATION
     ...    Test title: POST Create a new subscription - DUPLICATION
     ...    Test objective: The POST method creates a new subscription even if an existing subscription to same content exist
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: SUT should support duplication of subscription creation
     ...    Post-Conditions: in response header Location shall not be null
@@ -172,7 +172,7 @@ Create new VNF indicator Subscription - NO-DUPLICATION
     ...    Test title: POST Create a new subscription - NO-DUPLICATION
     ...    Test objective: The POST method creates a new subscription even if an existing subscription to same content exist
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: SUT should not support duplication of subscription creation
     ...    Post-Conditions: in response header Location shall not be null
diff --git a/SOL002/VNFIndicator-API/VNFIndicators.robot b/SOL002/VNFIndicator-API/VNFIndicators.robot
index bc6dbd9c9..a4e5e7b46 100644
--- a/SOL002/VNFIndicator-API/VNFIndicators.robot
+++ b/SOL002/VNFIndicator-API/VNFIndicators.robot
@@ -13,7 +13,7 @@ Get all VNF Indicators
     ...    Test title: Get all VNF Indicators
     ...    Test objective: The objective is to test the retrieval of all the available VNF indicators and perform a JSON schema validation of the collected indicators data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -26,7 +26,7 @@ Get VNF Indicators with attribute-based filter
     ...    Test title: Get VNF Indicators with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of VNF indicators using attribute-based filter, perform a JSON schema validation of the collected indicators data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -40,7 +40,7 @@ Get VNF Indicators with invalid attribute-based filter
     ...    Test title: Get VNF Indicators with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of VNF indicators fails when using invalid attribute-based filters, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -53,7 +53,7 @@ Get all VNF Indicators with malformed authorization token
     ...    Test title: GET all VNF Indicators with malformed authrization token.
     ...    Test objective: The objective is to test that the retrieval of VNF indicators fails when using malformed authorization token
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 4.5.3.3, 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 4.5.3.3, 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators. The VNF requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -65,7 +65,7 @@ Get all VNF Indicators without authorization token
     ...    Test title: GET all VNF Indicators without authorization token
     ...    Test objective: The objective is to test that the retrieval of VNF indicators fails when omitting the authorization token
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 4.5.3.3, 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 4.5.3.3, 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators. The VNF requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -77,7 +77,7 @@ GET all VNF Indicators with expired or revoked authorization token
     ...    Test title: GET all VNF Indicators with expired or revoked authorization token
     ...    Test objective: The objective is to test that the retrieval of VNF indicators fails when using expired or revoked authorization token
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 4.5.3.3, 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 4.5.3.3, 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators. The VNF requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -89,7 +89,7 @@ Get all VNF Indicators with invalid resource endpoint
     ...    Test title: GET all VNF Indicators with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of VNF indicators fails when using invalid resource endpoint
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators. 
     ...    Post-Conditions: none
@@ -101,7 +101,7 @@ POST all VNF Indicators - Method not implemented
     ...    Test title: POST all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new VNF indicators
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF
-    ...    Reference: Clause 8.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -113,7 +113,7 @@ PUT all VNF Indicators - Method not implemented
     ...    Test title: PUT all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF indicators
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF
-    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -125,7 +125,7 @@ PATCH all VNF Indicators - Method not implemented
     ...    Test title: PATCH all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF indicators
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF
-    ...    Reference: Clause 8.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -137,7 +137,7 @@ DELETE all VNF Indicators - Method not implemented
     ...    Test title: DELETE all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete VNF indicators
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF
-    ...    Reference: Clause 8.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -150,7 +150,7 @@ Get VNF Indicators to get Paged Response
     ...    Test title: Get VNF Indicators to get Paged Response
     ...    Test objective: The objective is to test the retrieval of all the available VNF indicators with Paged Response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -163,7 +163,7 @@ Get VNF Indicators - Bad Request Response too Big
     ...    Test title: Get VNF Indicators - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of VNF indicators fails when response is too big, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
diff --git a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
index 11f83e45b..1ab37fc66 100644
--- a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
+++ b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
@@ -13,7 +13,7 @@ Get Indicators for VNF Instance
     ...    Test title: Get all performance indicators for a VNF instance
     ...    Test objective: The objective is to test the retrieval of all performance indicators for a given VNF instance and perform a JSON schema validation of the returned indicators data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ GET Indicators for VNF Instance with attribute-based filter
     ...    Test title: Get all performance indicators for a VNF instance with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of all performance indicators for a given VNF instance using attribute-based filter and perform a JSON schema validation of the returned indicators data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ Get Indicators for VNF Instance with invalid attribute-based filter
     ...    Test title: Get all performance indicators for a VNF instance with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of all performance indicators for a given VNF instance fails using invalid attribute-based filter. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -54,7 +54,7 @@ Get Indicators for VNF Instance with invalid resource identifier
     ...    Test title: Get all performance indicators for a VNF instance with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of all performance indicators for a given VNF instance fails when using invalid resource identifier. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -67,7 +67,7 @@ POST Indicators for VNF instance - Method not implemented
     ...    Test title: POST performance indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new performance indicators for a VNF instance
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 8.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -79,7 +79,7 @@ PUT Indicators for VNF instance - Method not implemented
     ...    Test title: PUT performance indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify existing performance indicators for a VNF instance
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -91,7 +91,7 @@ PATCH Indicators for VNF instance - Method not implemented
     ...    Test title: PATCH performance indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update existing performance indicators for a VNF instance
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -103,7 +103,7 @@ DELETE Indicators for VNF instance - Method not implemented
     ...    Test title: DELETE performance indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete performance indicators for a VNF instance
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: The indicators for the VNF instance are not deleted by the unsuccessful operation
@@ -116,7 +116,7 @@ Get Indicators for VNF Instance to get Paged Response
     ...    Test title: Get Indicators for VNF Instance to get Paged Response
     ...    Test objective: The objective is to test the retrieval of all performance indicators for a given VNF instance to get paged response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
@@ -129,7 +129,7 @@ Get Indicators for VNF Instance - Bad Request Response too Big
     ...    Test title: Get Indicators for VNF Instance - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of all performance indicators for a given VNF instance fails when response is too big. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
diff --git a/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot b/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
index 27087d238..c58a979a1 100644
--- a/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
+++ b/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
@@ -16,7 +16,7 @@ VNF Indicator Value Change Notification
     ...    Test title: VNF Indicator Value Change Notification
     ...    Test objective: The objective is to test the dispatch of VNF Indicator Value Change Notification when new indicator values are available in the VNF, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF is instantiated, and a subscription for indicator value change notifications is available in the VNF.
-    ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.4.1
+    ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNF
     ...    Applicability: none
     ...    Post-Conditions: none 
-- 
GitLab


From 45e8c618e3ff07b24c9bf77e74077749ea930bea Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Mon, 28 Sep 2020 16:25:23 +0500
Subject: [PATCH 047/322] reference updated

---
 SOL002/VNFConfiguration-API/ApiVersion.robot  | 20 +++++++++----------
 .../VNFConfiguration-API/Configuration.robot  | 14 ++++++-------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/SOL002/VNFConfiguration-API/ApiVersion.robot b/SOL002/VNFConfiguration-API/ApiVersion.robot
index 68b95d747..f0e1fe455 100644
--- a/SOL002/VNFConfiguration-API/ApiVersion.robot
+++ b/SOL002/VNFConfiguration-API/ApiVersion.robot
@@ -11,7 +11,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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -23,7 +23,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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -36,7 +36,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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -48,7 +48,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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -60,7 +60,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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -72,7 +72,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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -84,7 +84,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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -97,7 +97,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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -109,7 +109,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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -121,7 +121,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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFConfiguration-API/Configuration.robot b/SOL002/VNFConfiguration-API/Configuration.robot
index 813e17ace..13dda5c88 100644
--- a/SOL002/VNFConfiguration-API/Configuration.robot
+++ b/SOL002/VNFConfiguration-API/Configuration.robot
@@ -12,7 +12,7 @@ Set new VNF Configuration
     ...    Test title: Set a new VNF Configuration
     ...    Test objective: The objective is to test the creation of a new VNF configuration and perform a JSON schema validation of the returned configuration data structure
     ...    Pre-conditions: A VNF instance is instantiated
-    ...    Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation of HTTP Etag opaque identifiers
     ...    Post-Conditions: The configuration is successfully set in the VNF and it matches the issued configuration
@@ -28,7 +28,7 @@ Get information about a VNF configuration
     ...    Test title: Get information about a VNF configuration
     ...    Test objective: The objective is to test the retrieval of an existing VNF instance configuration and perform a JSON schema validation of the collected configuration data structure
     ...    Pre-conditions: A VNF instance is instantiated. The VNF instance is already configured.
-    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -42,7 +42,7 @@ Get information about a VNF configuration with HTTP Etag
     ...    Test title: Get information about a VNF configuration with HTTP Etag
     ...    Test objective: The objective is to test the retrieval of an existing VNF instance configuration, check the generation by the VNF of an HTTP Etag opaque identifier, and perform a JSON schema validation of the collected configuration data structure
     ...    Pre-conditions:  A VNF instance is instantiated. The VNF instance is already configured
-    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation of HTTP Etag opaque identifiers
     ...    Post-Conditions: none
@@ -57,7 +57,7 @@ Set new VNF Configuration - HTTP Etag precondition unsuccessful
     ...    Test title: Set a new VNF Configuration - HTTP Etag precondition unsuccessful
     ...    Test objective: The objective is to test the unsuccess in setting a duplication of VNF configuration identified by an already used HTTP Etag identifier. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions:  A VNF instance is instantiated. The VNF instance is already configured (Test ID 6.3.1.1.1) with a given HTTP Etag identifier.
-    ...    Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation of HTTP Etag opaque identifiers
     ...    Post-Conditions:  The VNF configuration is not modified by the unsuccessful operation and it matches the configuration issued in Test ID 6.3.1.1.1
@@ -71,7 +71,7 @@ POST VNF Configuration - Method not implemented
     ...    Test title: POST VNF Configuration - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF configuration
     ...    Pre-conditions: A VNF instance is instantiated. The VNF instance is alrseady configured
-    ...    Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -83,7 +83,7 @@ PUT VNF Configuration - Method not implemented
     ...    Test title: PUT VNF Configuration - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an existing VNF configuration
     ...    Pre-conditions:  A VNF instance is instantiated. The VNF instance is already configured
-    ...    Reference: Clause 9.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 9.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -95,7 +95,7 @@ DELETE VNF Configuration - Method not implemented
     ...    Test title: Delete VNF Configuration - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing VNF configuration
     ...    Pre-conditions:  A VNF instance is instantiated. The VNF instance is already configured
-    ...    Reference: Clause 9.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 9.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: The VNF configuration is not deleted by the unsuccessful operation
-- 
GitLab


From 7ec0d18d048372abe5d9d8db995d3656c1c23a45 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Thu, 1 Oct 2020 12:59:05 +0500
Subject: [PATCH 048/322] templating, minor fix and new testcases added

---
 .../HealVNFTask.robot                         | 14 ++--
 .../IndividualVNFInstance.robot               | 22 +++---
 .../InstantiateVNFTask.robot                  | 26 +++----
 .../OperateVNFTask.robot                      | 14 ++--
 .../ScaleVNFTask.robot                        | 40 +++++-----
 .../ScaleVNFToLevelTask.robot                 | 36 ++++-----
 .../Subscriptions.robot                       |  1 +
 .../TerminateVNFTask.robot                    |  4 +-
 .../VNFInstances.robot                        | 77 +++++++++++--------
 .../VnfLcmOperationKeywords.robot             | 50 +++++++++---
 .../VnfLcmOperationOccurences.robot           | 15 +++-
 .../environment/variables.txt                 | 16 +++-
 .../jsons/changeVnfFlavourRequest.json        |  6 +-
 .../jsons/createVnfRequest.json               |  9 +--
 .../jsons/healVnfRequest.json                 |  6 +-
 .../jsons/instantiateVnfRequest.json          |  7 +-
 .../jsons/lccnSubscriptionRequest.json        | 14 ++--
 .../jsons/operateVnfRequest.json              |  6 +-
 .../jsons/scaleVnfRequest.json                |  8 +-
 .../jsons/scaleVnfToLevelRequest.json         |  6 +-
 .../jsons/terminateVnfRequest.json            |  6 +-
 21 files changed, 224 insertions(+), 159 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
index cddaa37ba..c62f11df1 100644
--- a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
@@ -16,7 +16,7 @@ POST Heal a vnfInstance
     ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     POST Heal VNF
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
@@ -30,7 +30,7 @@ POST Heal a vnfInstance Conflict (Not-Instantiated)
     ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     POST Heal VNF
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
@@ -44,7 +44,7 @@ POST Heal a vnfInstance Not Found
     ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     POST Heal VNF
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails 
@@ -57,7 +57,7 @@ GET Heal VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.9.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     GET Heal VNF  
     Check HTTP Response Status Code Is    405
 
@@ -69,7 +69,7 @@ PUT Heal VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.9.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions:
+    ...    Post-Conditions: none
     PUT Heal VNF  
     Check HTTP Response Status Code Is    405
 
@@ -81,7 +81,7 @@ PATCH Heal VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.9.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions:
+    ...    Post-Conditions: none
     PATCH Heal VNF  
     Check HTTP Response Status Code Is    405
     
@@ -93,7 +93,7 @@ DELETE Heal VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.9.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions:
+    ...    Post-Conditions: none
     DELETE Heal VNF  
     Check HTTP Response Status Code Is    405
 
diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index bb34332ff..84f826b94 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
@@ -20,8 +20,8 @@ POST Individual VNFInstance - Method not implemented
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     POST individual vnfInstance
     Check HTTP Response Status Code Is    405
     
@@ -32,8 +32,8 @@ GET Information about an individual VNF Instance
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET individual vnfInstance
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    vnfInstance
@@ -45,7 +45,7 @@ PUT Individual VNFInstance - Method not implemented
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: VNF instance not modified
     PUT individual vnfInstance
     Check HTTP Response Status Code Is    405
@@ -57,7 +57,7 @@ PATCH Individual VNFInstance
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: VNF instance modified
     PATCH individual vnfInstance
     Check HTTP Response Status Code Is    202
@@ -70,7 +70,7 @@ PATCH Individual VNFInstance Precondition failed
     ...    Pre-conditions:  A precondition given in an HTTP request header is not fulfilled. Typically, this is due to an ETag mismatch, indicating that the resource was modified by another entity
     ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: VNF instance not modified
     PATCH individual vnfInstance
     Check HTTP Response Status Code Is    412
@@ -83,7 +83,7 @@ PATCH Individual VNFInstance Conflict
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: VNF instance not modified
      PATCH individual vnfInstance
     Check HTTP Response Status Code Is    409
@@ -96,7 +96,7 @@ DELETE Individual VNFInstance
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: VNF instance deleted
     DELETE individual vnfInstance
     Check HTTP Response Status Code Is    204
@@ -108,8 +108,8 @@ DELETE Individual VNFInstance Conflict
     ...    Pre-conditions: VNF instance resource is in INSTANTIATED state
     ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     DELETE individual vnfInstance
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
diff --git a/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
index 01dd6a03e..93855de0a 100644
--- a/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
@@ -17,8 +17,8 @@ POST Instantiate a vnfInstance
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     POST instantiate individual vnfInstance
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
@@ -30,8 +30,8 @@ POST Instantiate a vnfInstance Conflict
     ...    Pre-conditions: VNF instance resource is in INSTANTIATED state
     ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     POST instantiate individual vnfInstance
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
@@ -40,11 +40,11 @@ GET Instantiate VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.3.3
     ...    Test title: GET Instantiate VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.4.3.2  - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET instantiate individual vnfInstance   
     Check HTTP Response Status Code Is    405
     
@@ -52,10 +52,10 @@ PUT Instantiate VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.3.4
     ...    Test title: PUT Instantiate VNFInstance  - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.4.3.3  - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: VNF instance not modified
     PUT instantiate individual vnfInstance   
     Check HTTP Response Status Code Is    405
@@ -64,10 +64,10 @@ PATCH Instantiate VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.3.5
     ...    Test title: PATCH Instantiate VNFInstance  - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.4.3.4  - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: VNF instance not modified
     PATCH instantiate individual vnfInstance   
     Check HTTP Response Status Code Is    405
@@ -76,10 +76,10 @@ DELETE Instantiate VNFInstance - Method not implemented
      [Documentation]    Test ID: 6.3.5.3.6
     ...    Test title: DELETE Instantiate VNFInstance  - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.4.3.5  - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: VNF instance not deleted
     DELETE instantiate individual vnfInstance   
     Check HTTP Response Status Code Is    405
diff --git a/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
index 88aa95920..c450c897e 100644
--- a/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
@@ -16,7 +16,7 @@ POST Operate a vnfInstance
     ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     POST Operate VNF
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
@@ -29,7 +29,7 @@ POST Operate a vnfInstance Conflict (Not-Instantiated)
     ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions:
+    ...    Post-Conditions: none
     POST Operate VNF
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
@@ -43,7 +43,7 @@ POST Operate a vnfInstance Not Found
     ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions:
+    ...    Post-Conditions: none
     POST Operate VNF
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails
@@ -56,7 +56,7 @@ GET Operate VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.10.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions:
+    ...    Post-Conditions: none
     GET Operate VNF
     Check HTTP Response Status Code Is    405
 
@@ -68,7 +68,7 @@ PUT Operate VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.10.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions:
+    ...    Post-Conditions: none
     PUT Operate VNF
     Check HTTP Response Status Code Is    405
 
@@ -80,7 +80,7 @@ PATCH Operate VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.10.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions:
+    ...    Post-Conditions: none
     PATCH Operate VNF
     Check HTTP Response Status Code Is    405
     
@@ -92,7 +92,7 @@ DELETE Operate VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.10.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions:
+    ...    Post-Conditions: none
     DELETE Operate VNF
     Check HTTP Response Status Code Is    405
 
diff --git a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
index b9d984193..6a5e732a1 100644
--- a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
@@ -15,8 +15,8 @@ POST Scale a vnfInstance
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     POST Scale vnfInstance  
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
@@ -28,8 +28,8 @@ POST Scale a vnfInstance Conflict (Not-Instantiated)
     ...    Pre-conditions:  VNF instance resource is in NOT-INSTANTIATED state
     ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     POST Scale vnfInstance  
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
@@ -39,12 +39,12 @@ POST Scale a vnfInstance Not Found
     [Documentation]    Test ID: 6.3.5.4.3
     ...    Test title: POST Scale a vnfInstance Not Found
     ...    Test objective: The objective is to verify that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
-    ...    Pre-conditions:  
+    ...    Pre-conditions: none 
     ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
-    POST Scale vnfInstance  
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    POST Scale vnfInstance
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails 
    
@@ -52,11 +52,11 @@ GET Scale VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.4.4
     ...    Test title: GET Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions: none  
     ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Scale vnfInstance
     Check HTTP Response Status Code Is    405
 
@@ -64,11 +64,11 @@ PUT Scale VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.4.5
     ...    Test title: PUT Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     PUT Scale vnfInstance
     Check HTTP Response Status Code Is    405
 
@@ -76,11 +76,11 @@ PATCH Scale VNFInstance - Method not implemented
      [Documentation]    Test ID: 6.3.5.4.6
     ...    Test title: PATCH Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     PATCH Scale vnfInstance
     Check HTTP Response Status Code Is    405
     
@@ -88,11 +88,11 @@ DELETE Scale VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.4.7
     ...    Test title: DELETE Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     DELETE Scale vnfInstance
     Check HTTP Response Status Code Is    405
 
diff --git a/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
index be72af268..7648c3756 100644
--- a/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
@@ -14,8 +14,8 @@ POST Scale a vnfInstance to level
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions:
+    ...    Applicability: none
+    ...    Post-Conditions: none
     POST Scale vnfInstance to level     
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
@@ -27,8 +27,8 @@ POST Scale a vnfInstance to level Conflict (Not-Instantiated)
     ...    Pre-conditions: VNF instance resource is in NOT-INSTANTIATED state
     ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions:
+    ...    Applicability: none
+    ...    Post-Conditions: none
     POST Scale vnfInstance to level   
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
@@ -41,8 +41,8 @@ POST Scale a vnfInstance Not Found
     ...    Pre-conditions: VNF instance resource is in NOT-INSTANTIATED state
     ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions:
+    ...    Applicability: none 
+    ...    Post-Conditions: none
     POST Scale vnfInstance to level    
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails 
@@ -52,11 +52,11 @@ GET Scale to level VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.5.4
     ...    Test title: GET Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Scale vnfInstance to level
     Check HTTP Response Status Code Is    405
 
@@ -64,11 +64,11 @@ PUT Scale to level VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.5.5
     ...    Test title: PUT Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     PUT Scale vnfInstance to level
     Check HTTP Response Status Code Is    405
 
@@ -76,11 +76,11 @@ PATCH Scale to level VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.5.6
     ...    Test title: PATCH Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions: none
     ...    Reference: Clause 5.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     PATCH Scale vnfInstance to level
     Check HTTP Response Status Code Is    405
     
@@ -88,11 +88,11 @@ DELETE Scale to level VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.5.7
     ...    Test title: DELETE Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     DELETE Scale vnfInstance to level
     Check HTTP Response Status Code Is    405
 
diff --git a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
index 3f14d231b..ad77de443 100644
--- a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
+++ b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
@@ -84,6 +84,7 @@ GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     Get subscriptions - invalid filter
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails
+    
  GET subscriptions with all_fields attribute selector
      [Documentation]    Test ID: 6.3.5.17.7
     ...    Test title: GET subscriptions with all_fields attribute selector
diff --git a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
index 643737789..914af7811 100644
--- a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
@@ -16,7 +16,7 @@ POST Terminate a vnfInstance
     ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     POST Terminate VNF  
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
@@ -29,7 +29,7 @@ POST Terminate a vnfInstance Conflict (Not-Instantiated)
     ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     POST Terminate VNF  
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
diff --git a/SOL002/VNFLifecycleManagement-API/VNFInstances.robot b/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
index 23b5dbea7..9f2f09c01 100644
--- a/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
+++ b/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
@@ -11,10 +11,10 @@ POST Create a new vnfInstance
     [Documentation]    Test ID: 6.3.5.1.1
     ...    Test title: POST Create a new vnfInstance
     ...    Test objective: The objective is to create a new VNF instance resource
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 5.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: VNF instance created
     POST Create a new vnfInstance
     Check HTTP Response Status Code Is    201
@@ -24,11 +24,11 @@ GET information about multiple VNF instances
     [Documentation]    Test ID: 6.3.5.1.2
     ...    Test title: GET information about multiple VNF instances
     ...    Test objective: The objective is to get information about multiples VNF instances
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET multiple vnfInstances
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    vnfInstances
@@ -38,11 +38,11 @@ GET information about multiple VNF instances Bad Request Invalid attribute-based
     [Documentation]    Test ID: 6.3.5.1.3
     ...    Test title: GET information about multiple VNF instances Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to get information about multiples VNF instances with Invalid attribute-based filtering parameters
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET multiple vnfInstances with bad attribute
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is   ProblemDetails
@@ -51,11 +51,11 @@ GET information about multiple VNF instances Bad Request Invalid attribute selec
     [Documentation]    Test ID: 6.3.5.1.4
     ...    Test title: GET information about multiple VNF instances Bad Request Invalid attribute selector
     ...    Test objective: The objective is to get information about multiples VNF instances with Invalid attribute-based filtering parameters
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET multiple vnfInstances with bad filter
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is   ProblemDetails
@@ -64,11 +64,11 @@ GET information about multiple VNF instances with "all_fields" attribute selecto
     [Documentation]    Test ID: 6.3.5.1.5
     ...    Test title: GET information about multiple VNF instances with "all_fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET multiple vnfInstances with all_fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    vnfInstances
@@ -77,11 +77,11 @@ GET information about multiple VNF instances with "exclude_default" attribute se
     [Documentation]    Test ID: 6.3.5.1.6
     ...    Test title: GET information about multiple VNF instances with "exclude_default" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET multiple vnfInstances with exclude_default attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    vnfInstances
@@ -90,11 +90,11 @@ GET information about multiple VNF instances with "fields" attribute selector
     [Documentation]    Test ID: 6.3.5.1.7
     ...    Test title: GET information about multiple VNF instances with "fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET multiple vnfInstances with fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    vnfInstances
@@ -103,11 +103,11 @@ GET information about multiple VNF instances with "exclude_fields" attribute sel
     [Documentation]    Test ID: 6.3.5.1.8
     ...    Test title: GET information about multiple VNF instances with "exclude_fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET multiple vnfInstances with exclude_fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    vnfInstances  
@@ -116,11 +116,11 @@ PUT VNFInstances - Method not implemented
     [Documentation]    Test ID: 6.3.5.1.9
     ...    Test title: PUT VNFInstances - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     PUT multiple vnfInstances
     Check HTTP Response Status Code Is    405
 
@@ -128,11 +128,11 @@ PATCH VNFInstances - Method not implemented
     [Documentation]    Test ID: 6.3.5.1.10
     ...    Test title: PATCH VNFInstances - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions: none 
     ...    Reference: Clause 5.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     PATCH multiple vnfInstances
     Check HTTP Response Status Code Is    405
 
@@ -140,10 +140,23 @@ DELETE VNFInstances - Method not implemented
     [Documentation]    Test ID: 6.3.5.1.11
     ...    Test title: DELETE VNFInstances - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions: none 
     ...    Reference: Clause 5.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: VNF instance not deleted
     DELETE multiple vnfInstances
-    Check HTTP Response Status Code Is    405
\ No newline at end of file
+    Check HTTP Response Status Code Is    405
+    
+GET information about multiple VNF instances with "exclude_default" and "fields" attribute selector
+    [Documentation]    Test ID: 6.3.5.1.12
+    ...    Test title: GET information about multiple VNF instances with "exclude_default" and "fields" attribute selector
+    ...    Test objective: The objective is to query information about multiple VNF instances
+    ...    Pre-conditions:  none
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET multiple vnfInstances with exclude_default and fields attribute selector
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    vnfInstances
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index 6daa361da..ceef45a66 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -9,6 +9,7 @@ Library    BuiltIn
 Library    JSONLibrary
 Library    Collections
 Library    JSONSchemaLibrary    schemas/
+Library           String
 
 *** Keywords ***
 
@@ -78,7 +79,8 @@ POST Create a new vnfInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/createVnfRequest.json
+    ${template} =    Get File    jsons/createVnfRequest.json
+    ${body}=        Format String   ${template}     vnfdId=${vnfdId}
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
@@ -129,7 +131,14 @@ GET multiple vnfInstances with fields attribute selector
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances?fields=${fields}
     ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}	
+    Set Suite Variable    ${response}    ${output}	    
+GET multiple vnfInstances with exclude_default and fields attribute selector
+    Log    Query status information about multiple VNF instances, using fields
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances?fields=${fields}&exclude_default
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
 GET multiple vnfInstances with exclude_fields attribute selector
     Log    Query status information about multiple VNF instances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
@@ -209,7 +218,8 @@ POST instantiate individual vnfInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/instantiateVnfRequest.json
+    ${template}=    Get File    jsons/instantiateVnfRequest.json
+    ${body}=        Format String   ${template}     flavourId=${flavourId} 
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/instantiate    ${body}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
@@ -247,7 +257,8 @@ POST Scale vnfInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/scaleVnfRequest.json
+    ${template}=    Get File    jsons/scaleVnfRequest.json
+    ${body}=        Format String   ${template}     type=${scaleVnfRequesttype}    aspectId=${scaleVnfRequestAspect} 
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -293,7 +304,8 @@ POST Scale vnfInstance to level
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/scaleVnfToLevelRequest.json
+    ${template}=    Get File    jsons/scaleVnfToLevelRequest.json
+    ${body}=        Format String   ${template}     newFlavourId=${newFlavourId} 
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -330,7 +342,8 @@ POST Change VNF deployment flavour
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/changeVnfFlavourRequest.json
+    ${template}=    Get File    jsons/changeVnfFlavourRequest.json
+    ${body}=        Format String   ${template}     newFlavourId=${newFlavourId} 
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour    ${body} 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  	 
@@ -367,7 +380,8 @@ POST Terminate VNF
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/terminateVnfRequest.json
+    ${template}=    Get File    jsons/terminateVnfRequest.json
+    ${body}=        Format String   ${template}     terminationType=${terminationType} 
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate    ${body}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
@@ -405,7 +419,8 @@ POST Heal VNF
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/healVnfRequest.json
+    ${template}=    Get File    jsons/healVnfRequest.json
+    ${body}=        Format String   ${template}     cause=${healingCause} 
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal    ${body}		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
@@ -481,7 +496,8 @@ POST Operate VNF
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/operateVnfRequest.json
+    ${template}=    Get File    jsons/operateVnfRequest.json
+    ${body}=        Format String   ${template}     changeStateTo=${changeStateTo} 
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
@@ -723,7 +739,8 @@ Post Create subscription
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/lccnSubscriptionRequest.json
+    ${template}=    Get File    jsons/lccnSubscriptionRequest.json
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}				
@@ -733,7 +750,8 @@ Post Create subscription - DUPLICATION
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/lccnSubscriptionRequest.json
+    ${template}=    Get File    jsons/lccnSubscriptionRequest.json
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}			
@@ -743,7 +761,8 @@ Post Create subscription - NO-DUPLICATION
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/lccnSubscriptionRequest.json
+    ${template}=    Get File    jsons/lccnSubscriptionRequest.json
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
@@ -956,6 +975,13 @@ Get VNF LCM Operation occurrences with fields attribute selector
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
+Get VNF LCM Operation occurrences with exclude_default and fields attribute selector
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs?fields=${fields}&exclude_default
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
 Get VNF LCM Operation occurrences with exclude_fields attribute selector
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
index cfd78c66d..1af91b51a 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
@@ -171,4 +171,17 @@ GET status information about multiple VNF LCM Operation occurrences Bad Request
     ...    Post-Conditions: none 
     GET VNF LCM OP occurrences
     Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is    ProblemDetails
\ No newline at end of file
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+    
+GET status information about multiple VNF LCM Operation OCC with "exlude_default" and "fields" 
+    [Documentation]    Test ID: 6.3.5.11.14
+    ...    Test title: GET status information about multiple VNF LCM Operation OCC with "exclude_default" and "fields"
+    ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none   
+    Get VNF LCM Operation occurrences with exclude_default and fields attribute selector
+    Check HTTP Response Status Code Is    202
+    Check HTTP Response Body Json Schema Is    VnfLcmOpOccs 
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/environment/variables.txt b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
index af716e9c4..ef3d9d5ae 100644
--- a/SOL002/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
@@ -59,4 +59,18 @@ ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.
 
 ${fields}
 
-${original_etag}    some_etag
\ No newline at end of file
+${original_etag}    some_etag
+
+${vnfdId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
+${flavourId}    vnf flavour
+
+${scaleVnfRequesttype}    SCALE_OUT
+${scaleVnfRequestAspect}    Aspect
+
+${newFlavourId}    5a7d81f-e602-4afa-8e13-962fb5a7d81f
+
+${terminationType}    GRACEFUL
+
+${healingCause}    healingCause    
+
+${changeStateTo}    STOPPED
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/changeVnfFlavourRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/changeVnfFlavourRequest.json
index 5b52927e9..50d5eb5db 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/changeVnfFlavourRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/changeVnfFlavourRequest.json
@@ -1,3 +1,3 @@
-{
-  "newFlavourId": "myFlavour_new"
-}
\ No newline at end of file
+{{
+  "newFlavourId": "{newFlavourId}"
+}}
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/createVnfRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/createVnfRequest.json
index 290151ae0..5c9c30a25 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/createVnfRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/createVnfRequest.json
@@ -1,6 +1,5 @@
-{
-  "vnfdId": "6fc3539c-e602-4afa-8e13-962fb5a7d81f",
+{{
+  "vnfdId": "${vnfdId}",
   "vnfInstanceName": "string",
-  "vnfInstanceDescription": "string",
-  "metadata":{}
-}
\ No newline at end of file
+  "vnfInstanceDescription": "string"
+}}
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/healVnfRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/healVnfRequest.json
index 8981fa942..8e57871a5 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/healVnfRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/healVnfRequest.json
@@ -1,4 +1,4 @@
-{
-  "cause": "a specific cause",
+{{
+  "cause": "{healingCause}",
   "additionalParams": {}
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/instantiateVnfRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/instantiateVnfRequest.json
index bb96e19dd..c8a0ed85c 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/instantiateVnfRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/instantiateVnfRequest.json
@@ -1,6 +1,5 @@
-{
-  "flavourId": "myFlavour",
-  "instantiationLevelId": "string",
+{{
+  "flavourId": "{flavourId}",
   "extVirtualLinks": [
     {
       "id": "string",
@@ -75,4 +74,4 @@
   "localizationLanguage": "English",
   "extensions": {},
   "additionalParams": {}
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json
index e44916f8d..1411fe3b4 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json
@@ -1,10 +1,10 @@
-{
-  "filter": {
-    "vnfInstanceSubscriptionFilter": {
+{{
+  "filter": {{
+    "vnfInstanceSubscriptionFilter": {{
       "vnfdIds": [
         "6fc3539c-e602-4afa-8e13-962fb5a7d81f"
       ]
-    }
-  },
-  "callbackUri": "http://127.0.0.1/subscribe"
-}
\ No newline at end of file
+    }}
+  }},
+  "callbackUri": "{callback_uri}{callback_endpoint}"
+}}
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/operateVnfRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/operateVnfRequest.json
index 2ead53e19..c32dd2c4e 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/operateVnfRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/operateVnfRequest.json
@@ -1,5 +1,5 @@
-{
-  "changeStateTo": "STOPPED",
+{{
+  "changeStateTo": "{changeStateTo}",
   "stopType": "FORCEFUL",
   "additionalParams": {}
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/scaleVnfRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/scaleVnfRequest.json
index 09dc7dffb..58964bb56 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/scaleVnfRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/scaleVnfRequest.json
@@ -1,4 +1,4 @@
-{
-  "type": "SCALE_OUT",
-  "aspectId": "myAspect"
-}
\ No newline at end of file
+{{
+  "type": "{scaleVnfRequesttype}",
+  "aspectId": "{scaleVnfRequestAspect}"
+}}
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/scaleVnfToLevelRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/scaleVnfToLevelRequest.json
index eeccec1d2..448dc4c27 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/scaleVnfToLevelRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/scaleVnfToLevelRequest.json
@@ -1,3 +1,3 @@
-{
-  "newFlavourId" : ""
-}
\ No newline at end of file
+{{
+  "newFlavourId" : "{newFlavourId}"
+}}
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/terminateVnfRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/terminateVnfRequest.json
index 0a4f9592d..b317c4de9 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/terminateVnfRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/terminateVnfRequest.json
@@ -1,4 +1,4 @@
-{
-  "terminationType": "GRACEFUL",
+{{
+  "terminationType": "{terminationType}",
   "additionalParams": {}
-}
\ No newline at end of file
+}}
\ No newline at end of file
-- 
GitLab


From e9893c5f613ebb7175a282c72aac9a4536702410 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Thu, 1 Oct 2020 14:06:08 +0500
Subject: [PATCH 049/322] templating, minor fix and new testcases added

---
 .../IndividualPmJob.robot                     |  3 +-
 .../IndividualThreshold.robot                 |  3 +-
 .../VNFPerformanceManagement-API/PMJobs.robot | 28 +++++++++++++++----
 .../Thresholds.robot                          |  5 ++--
 .../environment/pmJobs.txt                    |  4 ++-
 .../environment/variables.txt                 |  4 ++-
 .../jsons/CreatePmJobRequest.json             | 12 ++++----
 .../jsons/CreateThresholdRequest.json         | 16 +++++------
 8 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
index 7e39e348e..5a84a1747 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
@@ -7,7 +7,6 @@ Library     REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=fal
 Library     OperatingSystem
 Library     DependencyLibrary
 
-
 *** Test Cases ***
 GET individual VNF Performance Job
     [Documentation]    Test ID: 6.3.3.2.1
@@ -96,7 +95,7 @@ PATCH Individual VNF Performance Job
     ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send Patch request for individual VNF Performance Job
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    PMJobModifications
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
index 7520167c4..d68f09617 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -96,8 +96,7 @@ PATCH Individual Threshold
     Send Patch request for individual VNF Performance Threshold
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    ThresholdModifications
-    
-    
+       
 PATCH Individual Threshold - Precondition failed
     [Documentation]    Test ID: 6.3.3.5.8
     ...    Test title: PATCH Individual Threshold - Preconition failed
diff --git a/SOL002/VNFPerformanceManagement-API/PMJobs.robot b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
index 4552d9ef1..78883d757 100644
--- a/SOL002/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
@@ -195,7 +195,18 @@ GET VNF Performance Monitoring Jobs for Bad Request Response too big
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
-    
+GET all VNF Performance Monitoring Jobs with exclude_default and fields attribute selector
+    [Documentation]    Test ID: 6.3.3.1.15
+    ...    Test title: GET all VNF Performance Monitoring Jobs with exclude_default and fields attribute selector
+    ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs with exclude_default and fields attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued exclude_default selector
+    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
+    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET VNF Performance Monitoring Jobs with exclude_default and fields attribute selector
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is   PmJobs  
 *** Keywords ***
 GET all VNF Performance Monitoring Jobs
     Log    Trying to get all PM Jobs present in the VNFM
@@ -237,6 +248,14 @@ GET VNF Performance Monitoring Jobs with fields attribute selector
     GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
+    
+GET VNF Performance Monitoring Jobs with exclude_default and fields attribute selector
+    Log    Trying to get all VNF Packages present in the VNFM, using filter params
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?fields=${fields}&exclude_default
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
 
 GET VNF Performance Monitoring Jobs with exclude_fields attribute selector
     Log    Trying to get all VNF Packages present in the VNFM, using filter params
@@ -268,7 +287,8 @@ Send Post Request Create new VNF Performance Monitoring Job
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/CreatePmJobRequest.json
+    ${template}=    Get File    jsons/CreatePmJobRequest.json
+    ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}    callbackuri=${callback_uri}
     POST    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -384,6 +404,4 @@ Check HTTP Response Body Json Schema Is
     
 Check LINK in Header
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
-    Should Not Be Empty    ${linkURL}
-
-
+    Should Not Be Empty    ${linkURL}
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/Thresholds.robot b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
index e3be8ce01..a0fb710e9 100644
--- a/SOL002/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
@@ -176,8 +176,9 @@ Send Post Request Create new Performance Threshold
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    ${request}=    Get File    jsons/CreateThresholdRequest.json
-    POST    ${apiRoot}/${apiName}/${apiVersion}/thresholds    ${request}
+    ${template}=    Get File    jsons/CreateThresholdRequest.json
+    ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}    callback_uri=${callback_uri}
+    POST    ${apiRoot}/${apiName}/${apiVersion}/thresholds    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
diff --git a/SOL002/VNFPerformanceManagement-API/environment/pmJobs.txt b/SOL002/VNFPerformanceManagement-API/environment/pmJobs.txt
index f1675679e..7d16002b3 100644
--- a/SOL002/VNFPerformanceManagement-API/environment/pmJobs.txt
+++ b/SOL002/VNFPerformanceManagement-API/environment/pmJobs.txt
@@ -1,5 +1,7 @@
+*** Settings ***
+Resource          variables.txt    # Generic Parameters
 *** Variables ***
-${POS_FILTER}     objectInstanceIds=1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
+${POS_FILTER}     objectInstanceIds=${objectInstanceIds}
 ${NEG_FILTER}     criteriaPmJob=erroneousAttributeName
 ${fields}         criteria,reports
 ${response}=    httpresponse
diff --git a/SOL002/VNFPerformanceManagement-API/environment/variables.txt b/SOL002/VNFPerformanceManagement-API/environment/variables.txt
index 1b6fb6dbc..debf7b6a0 100644
--- a/SOL002/VNFPerformanceManagement-API/environment/variables.txt
+++ b/SOL002/VNFPerformanceManagement-API/environment/variables.txt
@@ -23,4 +23,6 @@ ${callback_endpoint_error}    /endpoint_404
 ${sleep_interval}    20s
 ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
 
-${response}        http-response
\ No newline at end of file
+${response}        http-response
+
+${objectInstanceIds}    1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/jsons/CreatePmJobRequest.json b/SOL002/VNFPerformanceManagement-API/jsons/CreatePmJobRequest.json
index 1f34fa20d..587c3fba7 100644
--- a/SOL002/VNFPerformanceManagement-API/jsons/CreatePmJobRequest.json
+++ b/SOL002/VNFPerformanceManagement-API/jsons/CreatePmJobRequest.json
@@ -1,10 +1,10 @@
-{
-	"objectInstanceIds" : ["1f50d68b-82e8-4deb-bd40-c934d4d1ac0a"],
-	"criteria" : {
+{{
+	"objectInstanceIds" : ["{objectInstanceIds}"],
+	"criteria" : {{
 		"performanceMetric": [],
 		"performanceMetricGroup": [],
 		"collectionPeriod": 10,
 		"reportingPeriod": 30
-	},
-	"callbackuri": "127.0.0.1"
-}
\ No newline at end of file
+	}},
+	"callbackuri": "{callback_uri}"
+}}
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/jsons/CreateThresholdRequest.json b/SOL002/VNFPerformanceManagement-API/jsons/CreateThresholdRequest.json
index c42c3773f..9f7640468 100644
--- a/SOL002/VNFPerformanceManagement-API/jsons/CreateThresholdRequest.json
+++ b/SOL002/VNFPerformanceManagement-API/jsons/CreateThresholdRequest.json
@@ -1,13 +1,13 @@
-{
-	"objectInstanceIds" : "1f50d68b-82e8-4deb-bd40-c934d4d1ac0a",
-	"criteria" : {
+{{
+	"objectInstanceIds" : "{objectInstanceIds}",
+	"criteria" : {{
 		"performanceMetric": "cpu_util",
 		"thresholdType": "SIMPLE",
-		"simpleThresholdDetails": {
+		"simpleThresholdDetails": {{
 			"thresholdValue": 10,
 			"hysteresis": 50
-		}
+		}}
 		
-	},
-	"callbackuri": "127.0.0.1"
-}
\ No newline at end of file
+	}},
+	"callbackuri": "{callback_uri}"
+}}
\ No newline at end of file
-- 
GitLab


From 34a83b2890bc4647fcf88b5e808f684f0e9f3316 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Thu, 1 Oct 2020 15:37:34 +0500
Subject: [PATCH 050/322] templating, minor fix and new testcases added

---
 SOL002/VNFFaultManagement-API/Alarms.robot    |  25 ++--
 .../EscalatePerceivedSeverityTask.robot       |  29 +++--
 .../IndividualAlarm.robot                     |  35 +++---
 .../IndividualSubscription.robot              |  40 +++---
 .../Subscriptions.robot                       | 117 +++++++++---------
 .../jsons/fmSubscriptionRequest.json          |  14 +--
 6 files changed, 137 insertions(+), 123 deletions(-)

diff --git a/SOL002/VNFFaultManagement-API/Alarms.robot b/SOL002/VNFFaultManagement-API/Alarms.robot
index c25094178..6bc714a21 100644
--- a/SOL002/VNFFaultManagement-API/Alarms.robot
+++ b/SOL002/VNFFaultManagement-API/Alarms.robot
@@ -38,7 +38,7 @@ GET information about multiple alarms with attribute-based filter
     ...    Test title: GET information about multiple alarms with attribute-based filter
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -51,7 +51,7 @@ GET information about multiple alarms with invalid attribute-based filter
     ...    Test title: GET information about multiple alarms with invalid attribute-based filter
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -85,7 +85,6 @@ GET information about multiple alarms with exclude_default attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    alarms
 
-    
 GET information about multiple alarms with fields attribute selector
     [Documentation]    Test ID: 6.3.4.1.7
     ...    Test title: GET information about multiple alarms with fields attribute selector
@@ -117,7 +116,7 @@ PUT Alarms - Method not implemented
     ...    Test title: PUT Alarms - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: none
@@ -129,7 +128,7 @@ PATCH Alarms - Method not implemented
     ...    Test title: PATCH Alarms - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 7.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: none
@@ -141,7 +140,7 @@ DELETE Alarms - Method not implemented
     ...    Test title: DELETE Alarms - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.6 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 7.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: the alarm is not deleted
@@ -166,7 +165,7 @@ GET information about multiple alarms for Bad Request Response too big
     ...    Test title: GET information about multiple alarms for Bad Request Response too big
     ...    Test objective: The objective is to test that GET method fail retrieving status information about Alarms when Response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -179,7 +178,7 @@ GET information about alarms with attribute-based filter "id"
     ...    Test title: GET information about alarms with attribute-based filter "id"
     ...    Test objective: The objective is to retrieve information about the alarm list with alarm filter "id"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -193,7 +192,7 @@ GET information about multiple alarms with attribute-based filter "vnfcInstanceI
     ...    Test title: GET information about multiple alarms with attribute-based filter "vnfcInstanceIds"
     ...    Test objective: The objective is to retrieve information about the alarm list with attribute filter "vnfcInstanceIds"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -207,7 +206,7 @@ GET information about multiple alarms with attribute-based filter "rootCauseFaul
     ...    Test title: GET information about multiple alarms with attribute-based filter "rootCauseFaultyResource.faultyResourceType"
     ...    Test objective: The objective is to retrieve information about the alarm list with attribute filter "rootCauseFaultyResource.faultyResourceType"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -221,7 +220,7 @@ GET information about multiple alarms with attribute-based filter "eventType"
     ...    Test title: GET information about multiple alarms with attribute-based filter "eventType"
     ...    Test objective: The objective is to retrieve information about the alarm list with attribute filter "eventType"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -235,7 +234,7 @@ GET information about multiple alarms with attribute-based filter "perceivedSeve
     ...    Test title: GET information about multiple alarms with attribute-based filter "perceivedSeverity"
     ...    Test objective: The objective is to retrieve information about the alarm list with attribute filter "perceivedSeverity"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -249,7 +248,7 @@ GET information about multiple alarms with attribute-based filter "probableCause
     ...    Test title: GET information about multiple alarms with attribute-based filter "probableCause"
     ...    Test objective: The objective is to retrieve information about the alarm list with attribute filter "probableCause"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
diff --git a/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot b/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
index 7f6e2706d..394a9c789 100644
--- a/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
+++ b/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
@@ -12,8 +12,8 @@ Escalate the perceived severity
     ...    Pre-conditions: The resource representing the individual alarm has been created
     ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions:   
+    ...    Applicability: none
+    ...    Post-Conditions: none
     Post escalate severity
     Check HTTP Response Status Code Is    204
     
@@ -21,11 +21,11 @@ GET Escalate the perceived severity - Method not implemented
     [Documentation]    Test ID: 6.3.4.3.2
     ...    Test title: GET Escalate the perceived severity - Method not implemented
     ...    Test objective: The objective is to test that the GET HTTP method not implemented for escalate perceived severity
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions:   
+    ...    Applicability: none
+    ...    Post-Conditions:   none
     Get escalate severity
     Check HTTP Response Status Code Is    405
 
@@ -33,11 +33,11 @@ PUT Escalate the perceived severity - Method not implemented
     [Documentation]    Test ID: 6.3.4.3.3
     ...    Test title: PUT Escalate the perceived severity - Method not implemented
     ...    Test objective: The objective is to test that the PUT HTTP method not implemented for escalate perceived severity
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none 
     ...    Reference: Clause 7.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions:   
+    ...    Applicability: none
+    ...    Post-Conditions: none
     Put escalate severity
     Check HTTP Response Status Code Is    405
     
@@ -45,24 +45,23 @@ PATCH Escalate the perceived severity - Method not implemented
     [Documentation]    Test ID: 6.3.4.3.4
     ...    Test title: PATCH Escalate the perceived severity - Method not implemented
     ...    Test objective: The objective is to test that the PATCH HTTP method not implemented for escalate perceived severity
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions:   
+    ...    Applicability: none
+    ...    Post-Conditions: none
     PATCH escalate severity
     Check HTTP Response Status Code Is    405
     
-    
 DELETE Escalate the perceived severity - Method not implemented
     [Documentation]    Test ID: 6.3.4.3.5
     ...    Test title: DELETE Escalate the perceived severity - Method not implemented
     ...    Test objective: The objective is to test that the DELETE HTTP method not implemented for escalate perceived severity
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.4.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions:   
+    ...    Applicability: none
+    ...    Post-Conditions: none
     Delete escalate severity
     Check HTTP Response Status Code Is    405
 
diff --git a/SOL002/VNFFaultManagement-API/IndividualAlarm.robot b/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
index da15e6b9d..ada7690ea 100644
--- a/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
+++ b/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
@@ -7,11 +7,9 @@ Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 Library    DependencyLibrary
 
-
 *** Variables **
 ${original_etag}    1234
 
-
 *** Test Cases ***
 POST Alarm - Method not implemented
     [Documentation]    Test ID: 6.3.4.2.1
@@ -20,12 +18,11 @@ POST Alarm - Method not implemented
     ...    Pre-conditions: 
     ...    Reference: Clause 7.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: none
     POST Alarm Task
     Check HTTP Response Status Code Is    405
 
-
 GET information about an individual alarm
     [Documentation]    Test ID: 6.3.4.2.2
     ...    Test title: GET information about an individual alarm
@@ -33,14 +30,12 @@ GET information about an individual alarm
     ...    Pre-conditions: The related alarm exists
     ...    Reference: Clause 7.4.3.3.2  - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions:   
+    ...    Applicability: none 
+    ...    Post-Conditions: none
     GET Alarm Task
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    alarm
     
-
-
 PUT Individual Alarm - Method not implemented
      [Documentation]    Test ID: 6.3.4.2.3
     ...    Test title: PUT Individual Alarm - Method not implemented
@@ -48,12 +43,11 @@ PUT Individual Alarm - Method not implemented
     ...    Pre-conditions: 
     ...    Reference: Clause 7.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: none
     PUT Alarm Task
     Check HTTP Response Status Code Is    405
 
-
 PATCH Individual Alarm
     [Documentation]    Test ID: 6.3.4.2.4
     ...    Test title: PATCH Individual Alarm
@@ -61,7 +55,7 @@ PATCH Individual Alarm
     ...    Pre-conditions: The related alarm exists
     ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: none
     PATCH Alarm Task
     Check HTTP Response Status Code Is    200
@@ -74,7 +68,7 @@ PATCH Individual Alarm - Precondition failed
     ...    Pre-conditions: The related alarm exists
     ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: The alarm resource is not modified
     PATCH Alarm Task with wrong precondition
     Check HTTP Response Status Code Is    412
@@ -87,13 +81,12 @@ PATCH Individual Alarm - Conflict
     ...    Pre-conditions: The related alarm exists
     ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: The alarm resource is not modified
     PATCH Alarm Task
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is     ProblemDetails
     
-
 DELETE Individual Alarm - Method not implemented
     [Documentation]    Test ID: 6.3.4.2.7
     ...    Test title: DELETE Individual Alarm - Method not implemented
@@ -101,10 +94,22 @@ DELETE Individual Alarm - Method not implemented
     ...    Pre-conditions: 
     ...    Reference: Clause 7.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: alarm not deleted
     DELETE Alarm Task
     Check HTTP Response Status Code Is    405
+    
+GET information about an individual alarm - Not Found
+    [Documentation]    Test ID: 6.3.4.2.8
+    ...    Test title: GET information about an individual alarm - Not Found
+    ...    Test objective: The objective is to test that GET method fail retrieving status information about individaual Alarms when alarm is not present.
+    ...    Pre-conditions: The related alarm doesnot exists
+    ...    Reference: Clause 7.4.3.3.2  - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none   
+    GET Alarm Task
+    Check HTTP Response Status Code Is    404
 
 *** Keywords ***
 POST Alarm Task
diff --git a/SOL002/VNFFaultManagement-API/IndividualSubscription.robot b/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
index 36b8f8641..274b83385 100644
--- a/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
+++ b/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
@@ -12,11 +12,11 @@ POST Individual Subscription - Method not implemented
     [Documentation]    Test ID: 6.3.4.5.1
     ...    Test title: POST Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     Post Create individual subscription
     Check HTTP Response Status Code Is    405
     
@@ -27,8 +27,8 @@ GET Information about an individual subscription
     ...    Pre-conditions: The subscription with the given id exists
     ...    Reference: Clause 7.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability:  
-    ...    Post-Conditions: 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
     Get individual subscription
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   FmSubscription
@@ -37,28 +37,26 @@ PUT an individual subscription - Method not implemented
     [Documentation]    Test ID: 6.3.4.5.3
     ...    Test title: PUT an individual subscription - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     Put individual subscription
     Check HTTP Response Status Code Is    405
-    
-
+   
 PATCH an individual subscription - Method not implemented
     [Documentation]    Test ID: 6.3.4.5.4
     ...    Test title: PATCH an individual subscription - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     Patch individual subscription
     Check HTTP Response Status Code Is    405
     
-    
 DELETE an individual subscription
     [Documentation]    Test ID: 6.3.4.5.5
     ...    Test title: DELETE an individual subscription
@@ -66,11 +64,23 @@ DELETE an individual subscription
     ...    Pre-conditions: an existing subscription
     ...    Reference: Clause 7.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: the subscription is deleted
     Delete individual subscription
     Check HTTP Response Status Code Is    204
     
+GET Information about an individual subscription - Not Found
+    [Documentation]    Test ID: 6.3.4.5.6
+    ...    Test title: GET Information about an individual subscription - Not Found
+    ...    Test objective: The objective is to test that GET method fail retrieving individual subscription for VNF alarms subscribed by the client because it is not present.
+    ...    Pre-conditions: The subscription with the given id donot exists
+    ...    Reference: Clause 7.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability:  none
+    ...    Post-Conditions: none
+    Get individual subscription
+    Check HTTP Response Status Code Is    404
+    
 *** Keywords ***
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}
diff --git a/SOL002/VNFFaultManagement-API/Subscriptions.robot b/SOL002/VNFFaultManagement-API/Subscriptions.robot
index 209997b2a..bc3bbb182 100644
--- a/SOL002/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL002/VNFFaultManagement-API/Subscriptions.robot
@@ -4,6 +4,7 @@ Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=fal
 Library     OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
+Library    String
 
 *** Test Cases ***
 Create a new subscription
@@ -13,7 +14,7 @@ Create a new subscription
     ...    Pre-conditions: no subscription with the same filter and callbackUri exists
     ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: Resource created successfully
     Post Create subscription
     Check HTTP Response Status Code Is    201
@@ -49,10 +50,10 @@ GET Subscriptions
     [Documentation]    Test ID: 6.3.4.4.4
     ...    Test title: GET Subscriptions
     ...    Test objective: The objective is to retrieve the list of active subscriptions
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability:  
+    ...    Applicability:  none
     ...    Post-Conditions: subscription is not deleted
     Get subscriptions
     Check HTTP Response Status Code Is    200
@@ -62,11 +63,11 @@ GET Subscription - Filter
     [Documentation]    Test ID: 6.3.4.4.5
     ...    Test title: GET Subscription - Filter
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability:  
-    ...    Post-Conditions: 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
     Get subscriptions - filter
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   FmSubscriptions 
@@ -75,11 +76,11 @@ GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     [Documentation]    Test ID: 6.3.4.4.6
     ...    Test title: GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to retrieve the list of active subscriptions with Invalid attribute-based filtering parameters
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability:  
-    ...    Post-Conditions: 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
     Get subscriptions - invalid filter
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is   ProblemDetails 
@@ -88,11 +89,11 @@ GET subscriptions with "all_fields" attribute selector
     [Documentation]    Test ID: 6.3.4.4.7
     ...    Test title: GET subscriptions with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability:  
-    ...    Post-Conditions: 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
     Get subscriptions with all_fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   FmSubscriptions 
@@ -101,11 +102,11 @@ GET subscriptions with "exclude_default" attribute selector
     [Documentation]    Test ID: 6.3.4.4.8
     ...    Test title: GET subscriptions with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability:  
-    ...    Post-Conditions: 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
     Get subscriptions with exclude_default attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   FmSubscriptions
@@ -114,11 +115,11 @@ GET subscriptions with "fields" attribute selector
     [Documentation]    Test ID: 6.3.4.4.9
     ...    Test title: GET subscriptions with "fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability:  
-    ...    Post-Conditions: 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
     Get subscriptions with fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   FmSubscriptions
@@ -127,26 +128,24 @@ GET subscriptions with "exclude_fields" attribute selector
     [Documentation]    Test ID: 6.3.4.4.10
     ...    Test title: GET subscriptions with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability:  
-    ...    Post-Conditions: 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
     Get subscriptions with exclude_fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   FmSubscriptions    
-
-
         
 PUT subscriptions - Method not implemented
     [Documentation]    Test ID: 6.3.4.4.11
     ...    Test title: PUT subscriptions - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability:  
-    ...    Post-Conditions: 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
     PUT subscriptions
     Check HTTP Response Status Code Is    405
 
@@ -154,11 +153,11 @@ PATCH subscriptions - Method not implemented
     [Documentation]    Test ID: 6.3.4.4.12
     ...    Test title: PUT subscriptions - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability:  
-    ...    Post-Conditions: 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
     PATCH subscriptions
     Check HTTP Response Status Code Is    405
 
@@ -166,10 +165,10 @@ DELETE subscriptions - Method not implemented
     [Documentation]    Test ID: 6.3.4.4.13
     ...    Test title: DELETE subscriptions - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none 
     ...    Reference: Clause 7.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability:  
+    ...    Applicability:  none
     ...    Post-Conditions: subscription not deleted
     DELETE subscriptions
     Check HTTP Response Status Code Is    405
@@ -178,10 +177,10 @@ GET Subscriptions to get Paged Response
     [Documentation]    Test ID: 6.3.4.4.14
     ...    Test title: GET Subscriptions to get Paged Response
     ...    Test objective: The objective is to retrieve the list of active subscriptions to get paged response
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability:  
+    ...    Applicability:  none
     ...    Post-Conditions: subscription is not deleted
     Get subscriptions
     Check HTTP Response Status Code Is    200
@@ -191,11 +190,11 @@ GET subscriptions - Bad Request Response too Big
     [Documentation]    Test ID: 6.3.4.4.15
     ...    Test title: GET subscriptions - Bad Request Response too Big
     ...    Test objective: The objective is to test that GET method fail retrieving list of active subscription because Response is too big, and perform the JSON schema validation of the failed operation HTTP response
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none 
     ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability:  
-    ...    Post-Conditions: 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
     Get subscriptions - invalid filter
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is   ProblemDetails
@@ -204,26 +203,25 @@ GET Subscription with attribute-based filter "id"
     [Documentation]    Test ID: 6.3.4.4.16
     ...    Test title: GET Subscription with attribute-based filter "id"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "id"
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability:  
-    ...    Post-Conditions: 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
     Get subscriptions with filter "id"
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   FmSubscription
     Check PostCondition HTTP Response Body Subscription Matches the requested attribute-based filter "id"
     
-    
 Get subscriptions with filter "filter.notificationTypes"
     [Documentation]    Test ID: 6.3.4.4.17
     ...    Test title: GET Subscription with attribute-based filter "filter.notificationTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.notificationTypes"
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none 
     ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability:  
-    ...    Post-Conditions: 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
     Get subscriptions with filter "filter_notificationTypes"
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   FmSubscriptions 
@@ -233,11 +231,11 @@ Get subscriptions with filter "filter.faultyResourceTypes"
     [Documentation]    Test ID: 6.3.4.4.18
     ...    Test title: GET Subscription with attribute-based filter "filter.faultyResourceTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.faultyResourceTypes"
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability:  
-    ...    Post-Conditions: 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
     Get subscriptions with filter "filter_faultyResourceTypes"
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   FmSubscriptions
@@ -247,11 +245,11 @@ Get subscriptions with filter "filter.perceivedSeverities"
     [Documentation]    Test ID: 6.3.4.4.19
     ...    Test title: GET Subscription with attribute-based filter "filter.perceivedSeverities"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.perceivedSeverities"
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability:  
-    ...    Post-Conditions: 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
     Get subscriptions with filter "filter_perceivedSeverities"
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   FmSubscriptions
@@ -261,11 +259,11 @@ Get subscriptions with filter "filter.eventTypes"
     [Documentation]    Test ID: 6.3.4.4.20
     ...    Test title: GET Subscription with attribute-based filter "filter.eventTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.eventTypes"
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability:  
-    ...    Post-Conditions: 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
     Get subscriptions with filter "filter_eventTypes"
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   FmSubscriptions
@@ -275,11 +273,11 @@ Get subscriptions with filter "filter.probableCauses"
     [Documentation]    Test ID: 6.3.4.4.21
     ...    Test title: GET Subscription with attribute-based filter "filter.probableCauses"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.probableCauses"
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none 
     ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability:  
-    ...    Post-Conditions: 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
     Get subscriptions with filter "filter_probableCauses"
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   FmSubscriptions
@@ -304,7 +302,8 @@ Post Create subscription
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/fmSubscriptionRequest.json
+    ${template}=    Get File    jsons/fmSubscriptionRequest.json
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}				
@@ -314,7 +313,8 @@ Post Create subscription - DUPLICATION
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/fmSubscriptionRequest.json
+    ${template}=    Get File    jsons/fmSubscriptionRequest.json
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}			
@@ -324,7 +324,8 @@ Post Create subscription - NO-DUPLICATION
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/fmSubscriptionRequest.json
+    ${template}=    Get File    jsons/fmSubscriptionRequest.json
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
diff --git a/SOL002/VNFFaultManagement-API/jsons/fmSubscriptionRequest.json b/SOL002/VNFFaultManagement-API/jsons/fmSubscriptionRequest.json
index e44916f8d..1411fe3b4 100644
--- a/SOL002/VNFFaultManagement-API/jsons/fmSubscriptionRequest.json
+++ b/SOL002/VNFFaultManagement-API/jsons/fmSubscriptionRequest.json
@@ -1,10 +1,10 @@
-{
-  "filter": {
-    "vnfInstanceSubscriptionFilter": {
+{{
+  "filter": {{
+    "vnfInstanceSubscriptionFilter": {{
       "vnfdIds": [
         "6fc3539c-e602-4afa-8e13-962fb5a7d81f"
       ]
-    }
-  },
-  "callbackUri": "http://127.0.0.1/subscribe"
-}
\ No newline at end of file
+    }}
+  }},
+  "callbackUri": "{callback_uri}{callback_endpoint}"
+}}
\ No newline at end of file
-- 
GitLab


From 7d24d2cb7834d46d6bf7e89b1aa0b3cb89cef124 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Fri, 2 Oct 2020 10:51:30 +0500
Subject: [PATCH 051/322] templating added

---
 SOL002/VNFIndicator-API/Subscriptions.robot      | 3 ++-
 SOL002/VNFIndicator-API/jsons/subscriptions.json | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/SOL002/VNFIndicator-API/Subscriptions.robot b/SOL002/VNFIndicator-API/Subscriptions.robot
index b0aadf74d..65cfcde57 100644
--- a/SOL002/VNFIndicator-API/Subscriptions.robot
+++ b/SOL002/VNFIndicator-API/Subscriptions.robot
@@ -217,7 +217,8 @@ Send Post Request for VNF Indicator Subscription
     Log    Trying to create a new subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    ${body}=    Get File    jsons/subscriptions.json
+    ${template}=    Get File    jsons/subscriptions.json
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${output}=    Output    response
diff --git a/SOL002/VNFIndicator-API/jsons/subscriptions.json b/SOL002/VNFIndicator-API/jsons/subscriptions.json
index ccf9f514c..8274dac3f 100644
--- a/SOL002/VNFIndicator-API/jsons/subscriptions.json
+++ b/SOL002/VNFIndicator-API/jsons/subscriptions.json
@@ -1,3 +1,3 @@
-{
-	"callbackUri": "http://127.0.0.1/subscribe"
-}
\ No newline at end of file
+{{
+	"callbackUri": "{callback_uri}{callback_endpoint}"
+}}
\ No newline at end of file
-- 
GitLab


From a733b78f9cb7f0bf4c2b29ae36e36d15e8ff4158 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 6 Oct 2020 16:38:49 +0500
Subject: [PATCH 052/322] templating, minor fix and new testcases added

---
 .../ChangeVNFFlavourTask.robot                |  4 +-
 .../HealVNFTask.robot                         | 14 +--
 .../IndividualSubscription.robot              | 12 +++
 .../IndividualVNFInstance.robot               | 34 +++++---
 .../IndividualVnfLcmOperationOccurence.robot  | 26 +++---
 .../InstantiateVNFTask.robot                  | 32 +++----
 .../OperateVNFTask.robot                      | 17 ++--
 .../RetryOperationTask.robot                  |  1 -
 .../RollbackOperationTask.robot               |  1 -
 .../ScaleVNFTask.robot                        | 36 ++++----
 .../ScaleVNFToLevelTask.robot                 | 34 ++++----
 .../TerminateVNFTask.robot                    |  4 +-
 .../VNFInstances.robot                        | 87 +++++++++++--------
 .../VnfLcmMntOperationKeywords.robot          | 75 +++++++++++-----
 .../VnfLcmOperationOccurences.robot           | 15 +++-
 .../environment/variables.txt                 | 17 ++++
 .../jsons/changeVnfFlavourRequest.json        |  6 +-
 .../jsons/createVnfRequest.json               |  8 +-
 .../jsons/healVnfRequest.json                 |  8 +-
 .../jsons/lccnSubscriptionRequest.json        |  2 +-
 .../jsons/operateVnfRequest.json              | 10 +--
 .../jsons/scaleVnfRequest.json                |  8 +-
 .../jsons/scaleVnfToLevelRequest.json         |  6 +-
 .../jsons/terminateVnfRequest.json            |  8 +-
 24 files changed, 280 insertions(+), 185 deletions(-)

diff --git a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
index 8ef6b52dd..26326b039 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
@@ -33,7 +33,6 @@ POST Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
     POST Change VNF deployment flavour   
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
-
   
 POST Change deployment flavour of a vnfInstance Not Found
     # TODO: Need to create a vnfInstance which's instantiatedVnfInfo.scaleStatus is absent
@@ -48,8 +47,7 @@ POST Change deployment flavour of a vnfInstance Not Found
     POST Change VNF deployment flavour  
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails
-   
-    
+       
 GET Change deployment flavour VNFInstance - Method not implemented
     [Documentation]    Test ID: 7.3.1.6.4
     ...    Test title: GET Change deployment flavour VNFInstance - Method not implemented
diff --git a/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot b/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
index f3c586a63..dadd2ea47 100644
--- a/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
@@ -16,7 +16,7 @@ POST Heal a vnfInstance
     ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     POST Heal VNF
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id existence
@@ -30,7 +30,7 @@ POST Heal a vnfInstance Conflict (Not-Instantiated)
     ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     POST Heal VNF
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
@@ -45,7 +45,7 @@ POST Heal a vnfInstance Not Found
     ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     POST Heal VNF
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails 
@@ -59,7 +59,7 @@ GET Heal VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.9.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none 
     GET Heal VNF  
     Check HTTP Response Status Code Is    405
 
@@ -71,7 +71,7 @@ PUT Heal VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.9.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions:
+    ...    Post-Conditions: none
     PUT Heal VNF  
     Check HTTP Response Status Code Is    405
 
@@ -83,7 +83,7 @@ PATCH Heal VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.9.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions:
+    ...    Post-Conditions: none
     PATCH Heal VNF  
     Check HTTP Response Status Code Is    405
     
@@ -95,7 +95,7 @@ DELETE Heal VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.9.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions:
+    ...    Post-Conditions: none
     DELETE Heal VNF  
     Check HTTP Response Status Code Is    405
 
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot b/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot
index d41331c9f..8088c0856 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot
@@ -67,6 +67,18 @@ DELETE an individual subscription
     ...    Post-Conditions: subscription deleted from VNFM
     Delete Individual subscription
 	Check HTTP Response Status Code Is    405
+	
+GET Individual Subscription - Not Found
+    [Documentation]    Test ID: 7.3.1.18.6
+    ...    Test title: GET Individual Subscription - Not Found
+    ...    Test objective: The objective is to test the retrieval of individual subscription fails when subscription is not present
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.19.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Get Individual Subscription
+    Check HTTP Response Status Code Is    404
 
 *** Keywords ***
 Check resource existence
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index 4d5a7fda1..da668687a 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
@@ -20,8 +20,8 @@ Post Individual VNFInstance - Method not implemented
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.3.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     POST individual vnfInstance
 	Check HTTP Response Status Code Is    405
 
@@ -32,8 +32,8 @@ Get Information about an individual VNF Instance
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET individual vnfInstance
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    vnfInstance
@@ -45,8 +45,8 @@ PUT Individual VNFInstance - Method not implemented
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     PUT individual vnfInstance
     Check HTTP Response Status Code Is    405
     
@@ -57,7 +57,7 @@ PATCH Individual VNFInstance
     ...    Pre-conditions: an existing VNF instance resource
     ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: VNFInstance modified
     PATCH individual vnfInstance
     Check HTTP Response Status Code Is    202
@@ -70,7 +70,7 @@ PATCH Individual VNFInstance Precondition failed
     ...    Pre-conditions:  ETag mismatch
     ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: VNFInstance not modified
     PATCH individual vnfInstance
     Check HTTP Response Status Code Is    412
@@ -83,7 +83,7 @@ PATCH Individual VNFInstance Conflict
     ...    Pre-conditions: another LCM operation is ongoing
     ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: VNFInstance not modified
     PATCH individual vnfInstance
     Check HTTP Response Status Code Is    409
@@ -96,7 +96,7 @@ DELETE Individual VNFInstance
     ...    Pre-conditions: the VNF instance resource is existing
     ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: VNFInstance deleted
     DELETE individual vnfInstance
     Check HTTP Response Status Code Is    204
@@ -108,13 +108,25 @@ DELETE Individual VNFInstance Conflict
     ...    Pre-conditions: VNF instance resource is in INSTANTIATED state
     ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: Resources are not deleted
     DELETE individual vnfInstance
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
     Check resource existence
     
+Get Information about an individual VNF Instance - Not Found
+     [Documentation]    Test ID: 7.3.1.2.9
+    ...    Test title: Get Information about an individual VNF Instance - Not Found
+    ...    Test objective: The objective is to test that the retrieval of an individual VNF Instance fails when instance is not present.
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET individual vnfInstance
+    Check HTTP Response Status Code Is    404
+    
 *** Keywords ***
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot b/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
index fbe80d6ad..6dce74a23 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
@@ -19,16 +19,16 @@ Post Individual VNF LCM Operation occurrences - Method not implemented
     Post Individual VNF LCM Operation occurrences
     Check HTTP Response Status Code Is    405
     
-Get information about multiple VNF instances 
+Get Individual VNF LCM Operation occurrences
     [Documentation]    Test ID: 7.3.1.12.2
-    ...    Test title: Get information about multiple VNF instances
+    ...    Test title: Get Individual VNF LCM Operation occurrences
     ...    Test objective: The objective is to test that this method retrieve information about a VNF lifecycle management operation occurrence 
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Get multiple VNF instances
+    Get Individual VNF LCM Operation occurrences
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    VnfLcmOpOcc 
 
@@ -68,12 +68,14 @@ PATCH Individual VNF LCM Operation occurrences - Method not implemented
     Delete multiple VNF instances
     Check HTTP Response Status Code Is    405
     
-*** Keywords ***
-Get multiple VNF instances	
-    Log    Query status information about multiple VNF lifecycle management operation occurrences.
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}	
\ No newline at end of file
+Get Individual VNF LCM Operation occurrences - Not Found
+    [Documentation]    Test ID: 7.3.1.12.6
+    ...    Test title: Get Individual VNF LCM Operation occurrences - Not Found
+    ...    Test objective: The objective is to test that the retrieval of VNF lifecycle management operation occurrence fails when instance is not present. 
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Get Individual VNF LCM Operation occurrences
+    Check HTTP Response Status Code Is    404 
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
index 97f4aaf8e..1990c4dc4 100644
--- a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
@@ -17,8 +17,8 @@ Instantiate a vnfInstance
     ...    Pre-conditions: VNF instance resource is in NOT INSTANTIATED state
     ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     POST instantiate individual vnfInstance
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id existence
@@ -31,8 +31,8 @@ Instantiate a vnfInstance Conflict
     ...    Pre-conditions: VNF instance resource is in INSTANTIATED state
     ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     POST instantiate individual vnfInstance
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
@@ -41,11 +41,11 @@ GET Instantiate VNFInstance - Method not implemented
      [Documentation]    Test ID: 7.3.1.3.3
     ...    Test title: GET Instantiate Individual VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions: none  
     ...    Reference: Clause 5.4.4.3.2  - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET instantiate individual vnfInstance   
     Check HTTP Response Status Code Is    405
 
@@ -53,11 +53,11 @@ PUT Instantiate VNFInstance - Method not implemented
     [Documentation]    Test ID: 7.3.1.3.4
     ...    Test title: PUT Instantiate Individual VNFInstance  - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.4.3.3  - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     PUT instantiate individual vnfInstance   
     Check HTTP Response Status Code Is    405
 
@@ -65,11 +65,11 @@ PATCH Instantiate VNFInstance - Method not implemented
     [Documentation]    Test ID: 7.3.1.3.5
     ...    Test title: PATCH Instantiate Individual VNFInstance  - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.4.3.4  - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     PATCH instantiate individual vnfInstance   
     Check HTTP Response Status Code Is    405
     
@@ -77,11 +77,11 @@ DELETE Instantiate VNFInstance - Method not implemented
     [Documentation]    Test ID: 7.3.1.3.6
     ...    Test title: DELETE Instantiate Individual VNFInstance  - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions: none  
     ...    Reference: Clause 5.4.4.3.5  - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     DELETE instantiate individual vnfInstance   
     Check HTTP Response Status Code Is    405
 
diff --git a/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
index 3666b24b3..c5dba8677 100644
--- a/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
@@ -18,7 +18,7 @@ POST Operate a vnfInstance
     ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     POST Operate VNF
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id existence
@@ -31,12 +31,11 @@ POST Operate a vnfInstance Conflict (Not-Instantiated)
     ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions:
+    ...    Post-Conditions: none
     POST Operate VNF
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
-
-    
+   
 POST Operate a vnfInstance Not Found
     [Documentation]    Test ID: 7.3.1.9.3
     ...    Test title: POST Operate a vnfInstance Not Found
@@ -45,7 +44,7 @@ POST Operate a vnfInstance Not Found
     ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions:
+    ...    Post-Conditions: none
     POST Operate VNF
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
@@ -58,7 +57,7 @@ GET Operate VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.10.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions:
+    ...    Post-Conditions: none
     GET Operate VNF
     Check HTTP Response Status Code Is    405
 
@@ -70,7 +69,7 @@ PUT Operate VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.10.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions:
+    ...    Post-Conditions: none
     PUT Operate VNF
     Check HTTP Response Status Code Is    405
 
@@ -82,7 +81,7 @@ PATCH Operate VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.10.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions:
+    ...    Post-Conditions: none
     PATCH Operate VNF
     Check HTTP Response Status Code Is    405
     
@@ -94,7 +93,7 @@ DELETE Operate VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.10.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions:
+    ...    Post-Conditions: none
     DELETE Operate VNF
     Check HTTP Response Status Code Is    405
 
diff --git a/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot b/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
index a6610845e..ff057a941 100644
--- a/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
@@ -37,7 +37,6 @@ Post Retry operation task Conflict (Not-FAILED_TEMP)
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
-
 Post Retry operation task Not Found
     [Documentation]    Test ID: 7.3.1.13.3
     ...    Test title: Post Retry operation task Not Found
diff --git a/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot b/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
index acf2f998b..4f5fc7688 100644
--- a/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
@@ -37,7 +37,6 @@ POST Rollback operation task Conflict (Not-FAILED_TEMP)
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
-
 POST Rollback operation task Not Found
     [Documentation]    Test ID: 7.3.1.14.3
     ...    Test title: POST Rollback operation task Not Found
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
index 3f0703386..d5f81b268 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
@@ -16,8 +16,8 @@ POST Scale a vnfInstance
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none 
     POST Scale vnfInstance  
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id existence
@@ -30,8 +30,8 @@ POST Scale a vnfInstance Conflict (Not-Instantiated)
     ...    Pre-conditions:  VNF instance resource is in NOT-INSTANTIATED state
     ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     POST Scale vnfInstance  
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
@@ -41,11 +41,11 @@ POST Scale a vnfInstance Not Found
      [Documentation]    Test ID: 7.3.1.4.3
     ...    Test title: POST Scale a vnfInstance Not Found
     ...    Test objective: The objective is to verify that the operation cannot be executed currently, because the VNF instance resource is not found. 
-    ...    Pre-conditions:  
+    ...    Pre-conditions: none  
     ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     POST Scale vnfInstance  
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails 
@@ -54,11 +54,11 @@ GET Scale VNFInstance - Method not implemented
     [Documentation]    Test ID: 7.3.1.4.4
     ...    Test title: GET Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Scale vnfInstance
     Check HTTP Response Status Code Is    405
 
@@ -66,11 +66,11 @@ PUT Scale VNFInstance - Method not implemented
     [Documentation]    Test ID: 7.3.1.4.5
     ...    Test title: PUT Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions: none  
     ...    Reference: Clause 5.4.5.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     PUT Scale vnfInstance
     Check HTTP Response Status Code Is    405
 
@@ -78,11 +78,11 @@ PATCH Scale VNFInstance - Method not implemented
     [Documentation]    Test ID: 7.3.1.4.6
     ...    Test title: PATCH Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions: none 
     ...    Reference: Clause 5.4.5.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     PATCH Scale vnfInstance
     Check HTTP Response Status Code Is    405
     
@@ -90,10 +90,10 @@ DELETE Scale VNFInstance - Method not implemented
     [Documentation]    Test ID: 7.3.1.4.7
     ...    Test title: DELETE Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions: none  
     ...    Reference: Clause 5.4.5.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: Resource are not deleted
     DELETE Scale vnfInstance
     Check HTTP Response Status Code Is    405
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
index 56f1c4c05..b57e54726 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
@@ -15,8 +15,8 @@ POST Scale a vnfInstance to level
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions:
+    ...    Applicability: none
+    ...    Post-Conditions: none
     POST Scale vnfInstance to level     
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id existence
@@ -29,8 +29,8 @@ POST Scale a vnfInstance to level Conflict (Not-Instantiated)
     ...    Pre-conditions: VNF instance resource is in NOT-INSTANTIATED state
     ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions:
+    ...    Applicability: none
+    ...    Post-Conditions: none
     POST Scale vnfInstance to level   
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
@@ -44,8 +44,8 @@ Scale a vnfInstance Not Found
     ...    Pre-conditions: VNF instance resource is in NOT-INSTANTIATED state
     ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions:
+    ...    Applicability: none
+    ...    Post-Conditions: none
     POST Scale vnfInstance to level    
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
@@ -55,11 +55,11 @@ GET Scale to level VNFInstance - Method not implemented
     [Documentation]    Test ID: 7.3.1.5.4
     ...    Test title: GET Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Scale vnfInstance to level
     Check HTTP Response Status Code Is    405
 
@@ -67,11 +67,11 @@ PUT Scale to level VNFInstance - Method not implemented
     [Documentation]    Test ID: 7.3.1.5.5
     ...    Test title: PUT Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions: none  
     ...    Reference: Clause 5.4.6.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     PUT Scale vnfInstance to level
     Check HTTP Response Status Code Is    405
 
@@ -79,11 +79,11 @@ PATCH Scale to level VNFInstance - Method not implemented
     [Documentation]    Test ID: 7.3.1.5.6
     ...    Test title: PATCH Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     PATCH Scale vnfInstance to level
     Check HTTP Response Status Code Is    405
     
@@ -91,10 +91,10 @@ DELETE Scale to level VNFInstance - Method not implemented
     [Documentation]    Test ID: 7.3.1.5.7
     ...    Test title: DELETE Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: Resources are not deleted
     DELETE Scale vnfInstance to level
     Check HTTP Response Status Code Is    405
diff --git a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
index d61927bee..94fa1a7f3 100644
--- a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
@@ -17,7 +17,7 @@ POST Terminate a vnfInstance
     ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     POST Terminate VNF  
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id existence
@@ -30,7 +30,7 @@ POST Terminate a vnfInstance Conflict (Not-Instantiated)
     ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     POST Terminate VNF  
     Check HTTP Response Status Code Is    202
     Check HTTP Response Body Json Schema Is    ProblemDetails
diff --git a/SOL003/VNFLifecycleManagement-API/VNFInstances.robot b/SOL003/VNFLifecycleManagement-API/VNFInstances.robot
index 8b817204b..af57f75f0 100644
--- a/SOL003/VNFLifecycleManagement-API/VNFInstances.robot
+++ b/SOL003/VNFLifecycleManagement-API/VNFInstances.robot
@@ -16,7 +16,7 @@ POST Create a new vnfInstance
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: VNF instance created
     POST Create a new vnfInstance
     Check HTTP Response Status Code Is    201
@@ -26,11 +26,11 @@ GET information about multiple VNF instances
     [Documentation]    Test ID: 7.3.1.1.2
     ...    Test title: GET information about multiple VNF instances
     ...    Test objective: The objective is to query information about multiple VNF instances
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET multiple vnfInstances
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    vnfInstances
@@ -42,8 +42,8 @@ GET information about multiple VNF instances Bad Request Invalid attribute-based
     ...    Pre-conditions:  A VNF is instantiated,  a bad filter selector (filter selectors are listed in Table 5.4.2.3.2-1  - ETSI GS NFV-SOL 003 [1] v2.6.1).
     ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET multiple vnfInstances with bad attribute
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails
@@ -56,8 +56,8 @@ GET information about multiple VNF instances Bad Request Invalid attribute selec
     ...    Pre-conditions:  A VNF is instantiated,  a bad attribute selector (attribute selectors are listed in Table 5.4.2.3.2-1  - ETSI GS NFV-SOL 003 [1] v2.6.1).
     ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET multiple vnfInstances with bad filter
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails
@@ -66,11 +66,11 @@ GET information about multiple VNF instances with "all_fields" attribute selecto
     [Documentation]    Test ID: 7.3.1.1.5
     ...    Test title: GET information about multiple VNF instances with "all_fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET multiple vnfInstances with all_fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    vnfInstances
@@ -79,11 +79,11 @@ GET information about multiple VNF instances with "exclude_default" attribute se
     [Documentation]    Test ID: 7.3.1.1.6
     ...    Test title: GET information about multiple VNF instances with "exclude_default" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET multiple vnfInstances with exclude_default attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    vnfInstances
@@ -92,11 +92,11 @@ GET information about multiple VNF instances with "fields" attribute selector
     [Documentation]    Test ID: 7.3.1.1.7
     ...    Test title: GET information about multiple VNF instances with "fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances
-    ...    Pre-conditions:  
+    ...    Pre-conditions: none 
     ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET multiple vnfInstances with fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    vnfInstances
@@ -105,11 +105,11 @@ GET information about multiple VNF instances with "exclude_fields" attribute sel
     [Documentation]    Test ID: 7.3.1.1.8
     ...    Test title: GET information about multiple VNF instances with "exclude_fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET multiple vnfInstances with exclude_fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    vnfInstances  
@@ -118,47 +118,47 @@ PUT multiples VNFInstances - Method not implemented
     [Documentation]    Test ID: 7.3.1.1.9
     ...    Test title: PUT multiples VNFInstances - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
-    PUT multiple vnfInstances
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    PUT VNFInstances
 	Check HTTP Response Status Code Is    405
 	
 PATCH multiples VNFInstances - Method not implemented
     [Documentation]    Test ID: 7.3.1.1.10
     ...    Test title: PATCH multiples VNFInstances - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
-    PATCH multiple vnfInstances
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    PATCH VNFInstances
 	Check HTTP Response Status Code Is    405
 
 DELETE VNFInstances - Method not implemented
     [Documentation]    Test ID: 7.3.1.1.11
     ...    Test title: DELETE multiples VNFInstances - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
-    ...    Pre-conditions:  
+    ...    Pre-conditions: none 
     ...    Reference: Clause 5.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: resources are not deleted
-    DELETE multiple vnfInstances
+    DELETE VNFInstances
 	Check HTTP Response Status Code Is    405
 	
 GET information about multiple VNF instances to get Paged Response
     [Documentation]    Test ID: 7.3.1.1.12
     ...    Test title: GET information about multiple VNF instances to get Paged Response
     ...    Test objective: The objective is to query information about multiple VNF instances to get Paged Response.
-    ...    Pre-conditions:  
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET multiple vnfInstances
     Check HTTP Response Status Code Is    200
     Check LINK in Header
@@ -170,8 +170,21 @@ GET information about multiple VNF instances - Bad Request Response too Big
     ...    Pre-conditions:  A VNF is instantiated,  a bad attribute selector (attribute selectors are listed in Table 5.4.2.3.2-1  - ETSI GS NFV-SOL 003 [1] v2.6.1).
     ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET multiple vnfInstances
     Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is    ProblemDetails
\ No newline at end of file
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+    
+GET information about multiple VNF instances with "exclude_default" and "fields" attribute selector
+    [Documentation]    Test ID: 7.3.1.1.14
+    ...    Test title: GET information about multiple VNF instances with "exclude_default" and "fields" attribute selector
+    ...    Test objective: The objective is to query information about multiple VNF instances
+    ...    Pre-conditions: none 
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET multiple vnfInstances with exclude_default and fields attribute selector
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    vnfInstances
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index bc4b649a6..8fde64a7e 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -1,4 +1,5 @@
 *** Settings ***
+Library    String
 Resource    environment/configuration.txt
 Resource    environment/variables.txt
 Resource    environment/scaleVariables.txt
@@ -324,7 +325,8 @@ POST Change VNF deployment flavour
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/changeVnfFlavourRequest.json
+    ${template}=    Get File    jsons/changeVnfFlavourRequest.json
+    ${body}=        Format String   ${template}     newFlavourId=${newFlavourId}
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour    ${body} 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  	 
@@ -361,7 +363,8 @@ POST Create a new vnfInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/createVnfRequest.json
+    ${template}=    Get File    jsons/createVnfRequest.json
+    ${body}=        Format String   ${template}     vnfdId=${vnfdId} 
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
@@ -417,6 +420,13 @@ GET multiple vnfInstances with fields attribute selector
     GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
+GET multiple vnfInstances with exclude_default and fields attribute selector
+    Log    Query status information about multiple VNF instances, using fields
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances?fields=${fields}&exclude_default
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}	
 GET multiple vnfInstances with exclude_fields attribute selector
     Log    Query status information about multiple VNF instances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
@@ -424,33 +434,33 @@ GET multiple vnfInstances with exclude_fields attribute selector
     GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 	
-	     		     	
-PUT VNFInstances - Method not implemented
+         		     	
+PUT VNFInstances
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances   
-    Log    Validate Status code
-    Integer    response status    405	     	
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 		     	
 
-PATCH VNFInstances - Method not implemented
+PATCH VNFInstances
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances   
-    Log    Validate Status code
-    Integer    response status    405	
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 		
 
-DELETE VNFInstances - Method not implemented
+DELETE VNFInstances
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances   
-    Log    Validate Status code
-    Integer    response status    405	  
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 		  
     
 POST individual vnfInstance
     log    Trying to perform a POST. This method should not be implemented
@@ -494,7 +504,6 @@ DELETE individual vnfInstance
     Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
-
 POST instantiate individual vnfInstance	
     Log    Trying to Instantiate a vnf Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
@@ -537,7 +546,8 @@ POST Scale vnfInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/scaleVnfRequest.json
+    ${template}=    Get File    jsons/scaleVnfRequest.json
+    ${body}=        Format String   ${template}     scaletype=${scaletype}    scaleAspectId=${scaleAspectId}
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -582,7 +592,8 @@ POST Scale vnfInstance to level
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/scaleVnfToLevelRequest.json
+    ${template}=    Get File    jsons/scaleVnfToLevelRequest.json
+    ${body}=        Format String   ${template}     instantiationLevelId=${instantiationLevelId}
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -619,7 +630,8 @@ POST Terminate VNF
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/terminateVnfRequest.json
+    ${template}=    Get File    jsons/terminateVnfRequest.json
+    ${body}=        Format String   ${template}     terminationType=${terminationType}
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate    ${body}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
@@ -657,7 +669,8 @@ POST Heal VNF
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/healVnfRequest.json
+    ${template}=    Get File    jsons/healVnfRequest.json
+    ${body}=        Format String   ${template}     healingCause=${healingCause}
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal    ${body}		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
@@ -695,7 +708,8 @@ POST Operate VNF
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/operateVnfRequest.json
+    ${template}=    Get File    jsons/operateVnfRequest.json
+    ${body}=        Format String   ${template}     changeStateTo=${changeStateTo}    stopType=${stopType}
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
@@ -764,6 +778,13 @@ Get VNF LCM Operation occurrences with all_fields attribute selector
     GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
+Get VNF LCM Operation occurrences with exclude_default and fields attribute selector
+    Log    Query status information about multiple VNF lifecycle management operation occurrences, using fields
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs?fields=${fields}&exclude_default
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
 Get VNF LCM Operation occurrences with exclude_default attribute selector
     Log    Query status information about multiple VNF lifecycle management operation occurrences using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
@@ -813,7 +834,14 @@ Post Individual VNF LCM Operation occurrences
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
-
+Get Individual VNF LCM Operation occurrences
+    Log    Query status information about multiple VNF lifecycle management operation occurrences.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Execute Query and validate response
+    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	   
 Put multiple VNF instances	
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
@@ -948,7 +976,8 @@ Post Create subscription
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/lccnSubscriptionRequest.json
+    ${template}=    Get File    jsons/lccnSubscriptionRequest.json
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_notification=${callback_notification}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}				
@@ -958,7 +987,8 @@ Post Create subscription - DUPLICATION
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/lccnSubscriptionRequest.json
+    ${template}=    Get File    jsons/lccnSubscriptionRequest.json
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_notification=${callback_notification}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}			
@@ -968,7 +998,8 @@ Post Create subscription - NO-DUPLICATION
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/lccnSubscriptionRequest.json
+    ${template}=    Get File    jsons/lccnSubscriptionRequest.json
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_notification=${callback_notification}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
index dcdc287d2..4566da857 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
@@ -170,4 +170,17 @@ GET status information about multiple VNF LCM Operation OCC - Bad Request Respon
     ...    Post-Conditions: none   
     GET VNF LCM Operation occurrences
     Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is    ProblemDetails
\ No newline at end of file
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+    
+GET status information about multiple VNF LCM Operation OCC with "exclude_default" and "fields"   
+    [Documentation]    Test ID: 7.3.1.11.13
+    ...    Test title: GET status information about multiple VNF LCM Operation OCC with "exclude_default" and "fields"
+    ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none   
+    Get VNF LCM Operation occurrences with exclude_default and fields attribute selector
+    Check HTTP Response Status Code Is    202
+    Check HTTP Response Body Json Schema Is    VnfLcmOpOccs
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/environment/variables.txt b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
index 75ef919b5..2697018f6 100644
--- a/SOL003/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
@@ -31,6 +31,7 @@ ${patchBodyRequest}   {}
 
 ${callback_uri}    http://localhost
 ${callback_port}    9091
+${callback_notification}    /notification
 ${callback_endpoint}    /endpoint
 ${callback_endpoint_fwd}    /endpoint/check
 ${callback_endpoint_error}    /endpoint_404
@@ -42,3 +43,19 @@ ${notification_request}    []
 ${notification_response}    []
 
 ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+
+${vnfdId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
+
+${scaletype}    SCALE_OUT
+${scaleAspectId}    myAspect
+
+${instantiationLevelId}    myNextLevel
+
+${newFlavourId}    myFlavour_new
+
+${healingCause}    a new cause
+
+${changeStateTo}    STOPPED
+${stopType}    FORCEFUL
+
+${terminationType}    GRACEFUL
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/jsons/changeVnfFlavourRequest.json b/SOL003/VNFLifecycleManagement-API/jsons/changeVnfFlavourRequest.json
index 5b52927e9..50d5eb5db 100644
--- a/SOL003/VNFLifecycleManagement-API/jsons/changeVnfFlavourRequest.json
+++ b/SOL003/VNFLifecycleManagement-API/jsons/changeVnfFlavourRequest.json
@@ -1,3 +1,3 @@
-{
-  "newFlavourId": "myFlavour_new"
-}
\ No newline at end of file
+{{
+  "newFlavourId": "{newFlavourId}"
+}}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/jsons/createVnfRequest.json b/SOL003/VNFLifecycleManagement-API/jsons/createVnfRequest.json
index 290151ae0..64ab8e55c 100644
--- a/SOL003/VNFLifecycleManagement-API/jsons/createVnfRequest.json
+++ b/SOL003/VNFLifecycleManagement-API/jsons/createVnfRequest.json
@@ -1,6 +1,6 @@
-{
-  "vnfdId": "6fc3539c-e602-4afa-8e13-962fb5a7d81f",
+{{
+  "vnfdId": "{vnfdId}",
   "vnfInstanceName": "string",
   "vnfInstanceDescription": "string",
-  "metadata":{}
-}
\ No newline at end of file
+  "metadata":{{}}
+}}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/jsons/healVnfRequest.json b/SOL003/VNFLifecycleManagement-API/jsons/healVnfRequest.json
index 8981fa942..640cd60d9 100644
--- a/SOL003/VNFLifecycleManagement-API/jsons/healVnfRequest.json
+++ b/SOL003/VNFLifecycleManagement-API/jsons/healVnfRequest.json
@@ -1,4 +1,4 @@
-{
-  "cause": "a specific cause",
-  "additionalParams": {}
-}
\ No newline at end of file
+{{
+  "cause": "{healingCause}",
+  "additionalParams": {{}}
+}}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json b/SOL003/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json
index f44d3cec5..3f094a639 100644
--- a/SOL003/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json
+++ b/SOL003/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json
@@ -6,5 +6,5 @@
       ]
     }
   },
-  "callbackUri": "http://localhost:9091/notification"
+  "callbackUri": "{callback_uri}{callback_notification}"
 }
diff --git a/SOL003/VNFLifecycleManagement-API/jsons/operateVnfRequest.json b/SOL003/VNFLifecycleManagement-API/jsons/operateVnfRequest.json
index 8f7b4a192..b878c437d 100644
--- a/SOL003/VNFLifecycleManagement-API/jsons/operateVnfRequest.json
+++ b/SOL003/VNFLifecycleManagement-API/jsons/operateVnfRequest.json
@@ -1,5 +1,5 @@
-{
-  "changeStateTo": "STOPPED",
-  "stopType": "FORCEFUL",
-  "additionalParams": {}
-}
+{{
+  "changeStateTo": "{changeStateTo}",
+  "stopType": "{stopType}",
+  "additionalParams": {{}}
+}}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/jsons/scaleVnfRequest.json b/SOL003/VNFLifecycleManagement-API/jsons/scaleVnfRequest.json
index 09dc7dffb..142fad5a0 100644
--- a/SOL003/VNFLifecycleManagement-API/jsons/scaleVnfRequest.json
+++ b/SOL003/VNFLifecycleManagement-API/jsons/scaleVnfRequest.json
@@ -1,4 +1,4 @@
-{
-  "type": "SCALE_OUT",
-  "aspectId": "myAspect"
-}
\ No newline at end of file
+{{
+  "type": "{scaletype}",
+  "aspectId": "{scaleAspectId}"
+}}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/jsons/scaleVnfToLevelRequest.json b/SOL003/VNFLifecycleManagement-API/jsons/scaleVnfToLevelRequest.json
index 1c39a7bb5..ca0ea8d3f 100644
--- a/SOL003/VNFLifecycleManagement-API/jsons/scaleVnfToLevelRequest.json
+++ b/SOL003/VNFLifecycleManagement-API/jsons/scaleVnfToLevelRequest.json
@@ -1,3 +1,3 @@
-{
-  "instantiationLevelId": "myNextLevel"
-}
\ No newline at end of file
+{{
+  "instantiationLevelId": "{instantiationLevelId}"
+}}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/jsons/terminateVnfRequest.json b/SOL003/VNFLifecycleManagement-API/jsons/terminateVnfRequest.json
index 0a4f9592d..bc9553a2e 100644
--- a/SOL003/VNFLifecycleManagement-API/jsons/terminateVnfRequest.json
+++ b/SOL003/VNFLifecycleManagement-API/jsons/terminateVnfRequest.json
@@ -1,4 +1,4 @@
-{
-  "terminationType": "GRACEFUL",
-  "additionalParams": {}
-}
\ No newline at end of file
+{{
+  "terminationType": "{terminationType}",
+  "additionalParams": {{}}
+}}
\ No newline at end of file
-- 
GitLab


From ccdf4d58b1bf91b2ba8ef5f7f8f051f04dac3e05 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 6 Oct 2020 16:44:26 +0500
Subject: [PATCH 053/322] fix added

---
 .../jsons/lccnSubscriptionRequest.json               | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/SOL003/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json b/SOL003/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json
index 3f094a639..7624e81f2 100644
--- a/SOL003/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json
+++ b/SOL003/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json
@@ -1,10 +1,10 @@
-{
-  "filter": {
-    "vnfInstanceSubscriptionFilter": {
+{{
+  "filter": {{
+    "vnfInstanceSubscriptionFilter": {{
       "vnfdIds": [
         "6fc3539c-e602-4afa-8e13-962fb5a7d81f"
       ]
-    }
-  },
+    }}
+  }},
   "callbackUri": "{callback_uri}{callback_notification}"
-}
+}}
-- 
GitLab


From 4524d91508aadaea88b0bad4e0fa9114d54165ca Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 7 Oct 2020 15:05:28 +0500
Subject: [PATCH 054/322] template fix added

---
 .../VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index ceef45a66..d6f9a33d4 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -258,7 +258,7 @@ POST Scale vnfInstance
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/scaleVnfRequest.json
-    ${body}=        Format String   ${template}     type=${scaleVnfRequesttype}    aspectId=${scaleVnfRequestAspect} 
+    ${body}=        Format String   ${template}     scaleVnfRequesttype=${scaleVnfRequesttype}    scaleVnfRequestAspect=${scaleVnfRequestAspect} 
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -420,7 +420,7 @@ POST Heal VNF
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/healVnfRequest.json
-    ${body}=        Format String   ${template}     cause=${healingCause} 
+    ${body}=        Format String   ${template}     healingCause=${healingCause} 
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal    ${body}		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
-- 
GitLab


From 9a2e5b95ae5094fc08c9d50e91a3980f6e9107ad Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 7 Oct 2020 16:09:06 +0500
Subject: [PATCH 055/322] template fix added

---
 SOL002/VNFPerformanceManagement-API/PMJobs.robot       |  2 +-
 .../VNFPerformanceManagementKeywords.robot             |  7 +++++--
 .../environment/variables.txt                          |  4 +++-
 .../jsons/subscriptions.json                           | 10 +++++-----
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/SOL002/VNFPerformanceManagement-API/PMJobs.robot b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
index 78883d757..27a851129 100644
--- a/SOL002/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
@@ -288,7 +288,7 @@ Send Post Request Create new VNF Performance Monitoring Job
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/CreatePmJobRequest.json
-    ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}    callbackuri=${callback_uri}
+    ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}    callback_uri=${callback_uri}
     POST    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
index f131a7216..80ac22c2d 100644
--- a/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
+++ b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
@@ -1,4 +1,5 @@
 *** Settings ***
+Library    String
 Resource    environment/variables.txt
 Resource    environment/subscriptions.txt
 Resource    environment/individualSubscription.txt
@@ -104,7 +105,8 @@ Send Post Request for VNF Performance Subscription
     Set headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Set headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    ${body_request}=    Get File    jsons/subscriptions.json
+    ${template}=    Get File    jsons/subscriptions.json
+    ${body_request}=        Format String   ${template}     callback_uri=${callback_uri}    subscribe=${subscribe}
     POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body_request}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -135,7 +137,8 @@ Send Post Request for Duplicated VNF Performance Subscription
     Set headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Set headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body_request}=    Get File    jsons/subscriptions.json
+    ${template}=    Get File    jsons/subscriptions.json
+    ${body_request}=        Format String   ${template}     callback_uri=${callback_uri}    subscribe=${subscribe}
     POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body_request}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}    
diff --git a/SOL002/VNFPerformanceManagement-API/environment/variables.txt b/SOL002/VNFPerformanceManagement-API/environment/variables.txt
index debf7b6a0..65cab3fbe 100644
--- a/SOL002/VNFPerformanceManagement-API/environment/variables.txt
+++ b/SOL002/VNFPerformanceManagement-API/environment/variables.txt
@@ -25,4 +25,6 @@ ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.
 
 ${response}        http-response
 
-${objectInstanceIds}    1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
\ No newline at end of file
+${objectInstanceIds}    1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
+
+${subscribe}    /subscribe
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/jsons/subscriptions.json b/SOL002/VNFPerformanceManagement-API/jsons/subscriptions.json
index 3fcc4e59b..7072ba326 100644
--- a/SOL002/VNFPerformanceManagement-API/jsons/subscriptions.json
+++ b/SOL002/VNFPerformanceManagement-API/jsons/subscriptions.json
@@ -1,6 +1,6 @@
-{
-	"callbackUri": "http://127.0.0.1/subscribe",
-	"filter": {
+{{
+	"callbackUri": "{callback_uri}{subscribe}",
+	"filter": {{
 		"notificationTypes": ["ThresholdCrossedNotification"]
-	}
-}
\ No newline at end of file
+	}}
+}}
\ No newline at end of file
-- 
GitLab


From d223bac961cce30a0ace99bf44c338bcc67f1cd3 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 7 Oct 2020 17:57:55 +0500
Subject: [PATCH 056/322] fixx typos, issues and minor bugs

---
 .../CancelOperationTask.robot                 | 21 ++-------
 .../ChangeExternalVNFConnectivityTask.robot   | 20 +++-----
 .../ChangeVNFFlavourTask.robot                | 29 +-----------
 .../FailOperationTask.robot                   | 41 ++++-------------
 .../HealVNFTask.robot                         | 26 +----------
 .../IndividualSubscription.robot              | 14 ++----
 .../IndividualVNFInstance.robot               | 33 ++-----------
 .../IndividualVnfLcmOperationOccurence.robot  |  8 ++--
 .../InstantiateVNFTask.robot                  | 15 ++----
 .../OperateVNFTask.robot                      | 28 +----------
 .../RetryOperationTask.robot                  | 29 +++---------
 .../RollbackOperationTask.robot               | 33 ++++---------
 .../ScaleVNFTask.robot                        | 26 +----------
 .../ScaleVNFToLevelTask.robot                 | 29 +-----------
 .../Subscriptions.robot                       |  9 ++--
 .../TerminateVNFTask.robot                    | 30 ++----------
 .../VnfLcmOperationKeywords.robot             | 46 +++++++++++++++----
 .../VnfLcmOperationOccurences.robot           | 12 ++---
 .../environment/variables.txt                 |  4 +-
 .../jsons/lccnSubscriptionRequest.json        |  2 +-
 20 files changed, 110 insertions(+), 345 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
index 2ca0d781f..326819aa0 100644
--- a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
@@ -17,7 +17,7 @@ Post Cancel operation task
     ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: none    
+    ...    Post-Conditions: the resource is in FAILED_TEMP state    
     POST Cancel operation task
     Check HTTP Response Status Code Is    202
     Check operation resource state is FAILED_TEMP
@@ -47,6 +47,7 @@ Post Cancel operation task Not Found
     ...    Post-Conditions: none  
     POST Cancel operation task
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
     
 GET Cancel operation task - Method not implemented
     [Documentation]    Test ID: 6.3.5.16.4
@@ -101,20 +102,4 @@ Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
-    Integer    response status    200
-
-Launch another error handling action
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry
-    Integer    response status    202
-    
-Check Fail not supported
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
-    # how to check if Fail is not supported?
-    
-
-Check resource FAILED_TEMP
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
-    String    response body operationState    FAILED_TEMP
\ No newline at end of file
+    Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot b/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
index d8ad9fb08..48589116c 100644
--- a/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
@@ -11,7 +11,7 @@ Suite Setup    Check resource existence
 POST Change external VNF connectivity 
     [Documentation]    Test ID: 6.3.5.10.1
     ...    Test title: POST Change external VNF connectivity
-    ...    Test objective: The objective is to test that POST method trigger a change in VNF external connectivity
+    ...    Test objective: The objective is to test that POST method triggers a change in VNF external connectivity
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.11.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
@@ -69,16 +69,16 @@ DELETE Change external VNF connectivity - Method not implemented
     DELETE Change External VNF Connectivity
     Check HTTP Response Status Code Is    405
     
-POST Operate a vnfInstance Conflict (Not-Instantiated)
+POST Change external VNF connectivity Conflict
     [Documentation]    Test ID: 6.3.5.10.6
-    ...    Test title: POST Operate a vnfInstance Conflict (Not-Instantiated)
+    ...    Test title: POST Change external VNF connectivity Conflict
     ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set. 
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.11.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions:
-    POST Operate VNF
+    ...    Post-Conditions: none
+    POST Change External VNF Connectivity
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
 
@@ -88,12 +88,4 @@ Check resource existence
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
-    Integer    response status    200
-
-Launch another LCM operation
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/scaleVnfRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
-    Integer    response status    202
\ No newline at end of file
+    Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot b/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
index 3d662724c..d1a7d8634 100644
--- a/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
@@ -34,7 +34,6 @@ POST Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
-    
 POST Change deployment flavour of a vnfInstance Not Found
     [Documentation]    Test ID: 6.3.5.6.3
     ...    Test title: POST Change deployment flavour of a vnfInstance Not Found
@@ -47,8 +46,7 @@ POST Change deployment flavour of a vnfInstance Not Found
     POST Change VNF deployment flavour  
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails
-   
-    
+       
 GET Change deployment flavour VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.6.4
     ...    Test title: GET Change deployment flavour VNFInstance - Method not implemented
@@ -103,27 +101,4 @@ Check resource existence
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
-    Integer    response status    200
-
-Check resource not instantiated
-    [Arguments]    ${instanceId}
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${instanceId} 
-    String    response body instantiationState    NOT_INSTANTIATED
-
-Check change flavour not supported
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
-    # how to check if change floavour is not supported? "flavourId" doesn't exist?
-
-Launch another LCM operation
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/scaleVnfRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
-    Integer    response status    202
\ No newline at end of file
+    Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot b/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
index f1ebf86ce..071e57c71 100644
--- a/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
@@ -10,7 +10,7 @@ Library    JSONSchemaLibrary    schemas/
 POST Fail operation task  
     [Documentation]    Test ID: 6.3.5.15.1
     ...    Test title: POST Fail operation task
-    ...    Test objective: The objective is to test that POST method mark as "finally failed" a VNF lifecycle operation if that operation has experienced a temporary failure
+    ...    Test objective: The objective is to test that POST method mark as "finally failed" a VNF lifecycle operation if that operation has experienced a failure
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
     ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
@@ -22,10 +22,9 @@ POST Fail operation task
     Check operation resource state is FINALLY_FAILED
 
 POST Fail operation task Conflict (Not-FAILED_TEMP)
-    # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
     [Documentation]    Test ID: 6.3.5.15.2
     ...    Test title: POST Fail operation task Conflict (Not-FAILED_TEMP)
-    ...    Test objective: The objective is to test that POST method cannot mark as "finally failed" a VNF lifecycle operation if that operation has experienced a temporary failure
+    ...    Test objective: The objective is to test that POST method cannot mark as "finally failed" due to confilct with the state of LCM Operation Occurrence
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
     ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
@@ -36,17 +35,17 @@ POST Fail operation task Conflict (Not-FAILED_TEMP)
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
 POST Fail operation task Not Found
-    # TODO: Need to create a vnfInstance which's instantiatedVnfInfo.scaleStatus is absent
     [Documentation]    Test ID: 6.3.5.15.3
     ...    Test title: POST Fail operation task Not Found
     ...    Test objective: The objective is to test that POST method cannot mark as "finally failed" a VNF lifecycle operation because the operation is not supported
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
     Post Fail operation
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
 
 GET Fail operation task - Method not implemented
      [Documentation]    Test ID: 6.3.5.15.4
@@ -56,7 +55,7 @@ GET Fail operation task - Method not implemented
     ...    Reference: Clause 5.4.16.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Get Fail operation
     Check HTTP Response Status Code Is    405
 
@@ -68,7 +67,7 @@ PUT Fail operation task - Method not implemented
     ...    Reference: Clause 5.4.16.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none 
     Put Fail operation
     Check HTTP Response Status Code Is    405
 
@@ -80,7 +79,7 @@ PATCH Fail operation task - Method not implemented
     ...    Reference: Clause 5.4.16.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none 
     Patch Fail operation
     Check HTTP Response Status Code Is    405
     
@@ -92,28 +91,6 @@ DELETE Fail operation task - Method not implemented
     ...    Reference: Clause 5.4.16.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: VNF instance not deleted
+    ...    Post-Conditions: none
     Delete Fail operation
-    Check HTTP Response Status Code Is    405
-
-*** Keywords ***
-Check resource existence
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
-    Integer    response status    200
-
-Launch another error handling action
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry
-    Integer    response status    202
-    
-Check Fail not supported
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
-    # how to check if Fail is not supported?
-
-Check resource FAILED_TEMP
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
-    String    response body operationState    FAILED_TEMP
\ No newline at end of file
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
index c62f11df1..68b5014f6 100644
--- a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
@@ -22,7 +22,6 @@ POST Heal a vnfInstance
     Check Operation Occurrence Id
     
 POST Heal a vnfInstance Conflict (Not-Instantiated)
-    # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
    [Documentation]    Test ID: 6.3.5.8.2
     ...    Test title: POST Heal a vnfInstance (Not-Instantiated)
     ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set. 
@@ -103,27 +102,4 @@ Check resource existence
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
-    Integer    response status    200
-
-Check resource not instantiated
-    [Arguments]    ${instanceId}
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${instanceId} 
-    String    response body instantiationState    NOT_INSTANTIATED
-
-Check heal not supported
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
-    # how to check if heal is not supported? "flavourId" doesn't exist?
-
-Launch another LCM operation
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/scaleVnfRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
-    Integer    response status    202
\ No newline at end of file
+    Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot b/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot
index f5a3692d6..03e5e173b 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot
@@ -57,20 +57,12 @@ PATCH an individual subscription - Method not implemented
     
 DELETE an individual subscription
      [Documentation]    Test ID: 6.3.5.18.5
-    ...    Test title: DELETE Individual Subscription - Method not implemented
-    ...    Test objective: The objective is to test that the method is not implemented
+    ...    Test title: DELETE Individual Subscription
+    ...    Test objective: The objective is to test that the DELETE method removes an individual subscription
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.19.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
     Delete Individual subscription
-	Check HTTP Response Status Code Is    405
-
-*** Keywords ***
-Check resource existence
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} 
-    Integer    response status    200
\ No newline at end of file
+	Check HTTP Response Status Code Is    204
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index 84f826b94..826228e15 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
@@ -66,12 +66,12 @@ PATCH Individual VNFInstance
 PATCH Individual VNFInstance Precondition failed
     [Documentation]    Test ID: 6.3.5.2.5
     ...    Test title: PATCH Individual VNFInstance Precondition failed
-    ...    Test objective: The objective is to create a new VNF instance resource
-    ...    Pre-conditions:  A precondition given in an HTTP request header is not fulfilled. Typically, this is due to an ETag mismatch, indicating that the resource was modified by another entity
+    ...    Test objective: The objective is to that the modification of individual VNFInstance fails because precondition given in an HTTP request header is not fulfilled. Typically, this is due to an ETag mismatch, indicating that the resource was modified by another entity.
+    ...    Pre-conditions:  none
     ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: VNF instance not modified
+    ...    Post-Conditions: none
     PATCH individual vnfInstance
     Check HTTP Response Status Code Is    412
     Check HTTP Response Body Json Schema Is    ProblemDetails
@@ -84,7 +84,7 @@ PATCH Individual VNFInstance Conflict
     ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: VNF instance not modified
+    ...    Post-Conditions: none
      PATCH individual vnfInstance
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
@@ -112,27 +112,4 @@ DELETE Individual VNFInstance Conflict
     ...    Post-Conditions: none
     DELETE individual vnfInstance
     Check HTTP Response Status Code Is    409
-    Check HTTP Response Body Json Schema Is    ProblemDetails
-    
-*** Keywords ***
-Check resource existence
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
-    Integer    response status    200
-
-Check resource instantiated
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
-    String    response body instantiationState    INSTANTIATED
-
-Launch another LCM operation
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/scaleVnfToLevelRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
-    Integer    response status    202 
+    Check HTTP Response Body Json Schema Is    ProblemDetails
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot b/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
index a083f949b..82ecf4c76 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
@@ -26,7 +26,7 @@ Get status information about multiple VNF instances
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Get multiple VNF instances
+    Get Individual VNF LCM OP occurrences
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    VnfLcmOpOcc 
 
@@ -39,7 +39,7 @@ PUT status information about multiple VNF instances - Method not implemented
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
-    PUT multiple vnfInstances
+    PUT Individual VNF LCM OP occurrences
     Check HTTP Response Status Code Is    405
 
 PATCH status information about multiple VNF instances - Method not implemented 
@@ -51,7 +51,7 @@ PATCH status information about multiple VNF instances - Method not implemented
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none      
-    PATCH multiple vnfInstances
+    PATCH Individual VNF LCM OP occurrences
     Check HTTP Response Status Code Is    405
     
 DELETE status information about multiple VNF instances - Method not implemented 
@@ -63,5 +63,5 @@ DELETE status information about multiple VNF instances - Method not implemented
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
-    DELETE multiple vnfInstances
+    DELETE Individual VNF LCM OP occurrences
     Check HTTP Response Status Code Is    405
diff --git a/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
index 93855de0a..200f0c387 100644
--- a/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
@@ -56,7 +56,7 @@ PUT Instantiate VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.4.3.3  - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: VNF instance not modified
+    ...    Post-Conditions: none
     PUT instantiate individual vnfInstance   
     Check HTTP Response Status Code Is    405
 
@@ -68,7 +68,7 @@ PATCH Instantiate VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.4.3.4  - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: VNF instance not modified
+    ...    Post-Conditions: none
     PATCH instantiate individual vnfInstance   
     Check HTTP Response Status Code Is    405
     
@@ -80,7 +80,7 @@ DELETE Instantiate VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.4.3.5  - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: VNF instance not deleted
+    ...    Post-Conditions: none
     DELETE instantiate individual vnfInstance   
     Check HTTP Response Status Code Is    405
 
@@ -90,11 +90,4 @@ Check resource existence
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
-    Integer    response status    200
-
-Check resource instantiated
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
-    String    response body instantiationState    INSTANTIATED
\ No newline at end of file
+    Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
index c450c897e..a27748bc1 100644
--- a/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
@@ -25,7 +25,7 @@ POST Operate a vnfInstance Conflict (Not-Instantiated)
     [Documentation]    Test ID: 6.3.5.9.2
     ...    Test title: POST Operate a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set. 
-    ...    Pre-conditions: the VNF instance resource is in NOT-INSTANTIATED state
+    ...    Pre-conditions: the VNF instance resource is in NOT_INSTANTIATED state
     ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
@@ -34,7 +34,6 @@ POST Operate a vnfInstance Conflict (Not-Instantiated)
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
 
-    
 POST Operate a vnfInstance Not Found
     [Documentation]    Test ID: 6.3.5.9.3
     ...    Test title: POST Operate a vnfInstance Not Found
@@ -102,27 +101,4 @@ Check resource existence
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
-    Integer    response status    200
-
-Check resource not instantiated
-    [Arguments]    ${instanceId}
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${instanceId} 
-    String    response body instantiationState    NOT_INSTANTIATED
-
-Check operate not supported
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
-    # how to check if operate is not supported? "flavourId" doesn't exist?
-
-Launch another LCM operation
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/scaleVnfRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
-    Integer    response status    202
\ No newline at end of file
+    Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot b/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
index d1e1aca15..fff8c4816 100644
--- a/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
@@ -23,7 +23,6 @@ POST Retry operation task
     Check Operation Occurrence Id
 
 POST Retry operation task Conflict (Not-FAILED_TEMP)
-    # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
     [Documentation]    Test ID: 6.3.5.13.2
     ...    Test title: POST Retry operation task Conflict (Not-FAILED_TEMP)
     ...    Test objective: The objective is to test that the retry operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. (i.e. the VNF instance resource is not in FAILED_TEMP state)
@@ -36,9 +35,7 @@ POST Retry operation task Conflict (Not-FAILED_TEMP)
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
-
 POST Retry operation task Not Found
-    # TODO: Need to create a vnfInstance which's instantiatedVnfInfo.scaleStatus is absent
     [Documentation]    Test ID: 6.3.5.13.3
     ...    Test title: POST Retry operation task Not Found
     ...    Test objective: The objective is to test that the retry operation cannot be executed because the operation is not supported
@@ -49,6 +46,7 @@ POST Retry operation task Not Found
     ...    Post-Conditions: none 
     Post Retry operation
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
 
 GET Retry operation task - Method not implemented
     [Documentation]    Test ID: 6.3.5.13.4
@@ -58,7 +56,7 @@ GET Retry operation task - Method not implemented
     ...    Reference: Clause 5.4.14.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Get Retry operation
     Check HTTP Response Status Code Is    405
 
@@ -70,7 +68,7 @@ PUT Retry operation task - Method not implemented
     ...    Reference: Clause 5.4.14.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Put Retry operation
     Check HTTP Response Status Code Is    405
 
@@ -82,7 +80,7 @@ PATCH Retry operation task - Method not implemented
     ...    Reference: Clause 5.4.14.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Patch Retry operation
     Check HTTP Response Status Code Is    405
     
@@ -94,7 +92,7 @@ DELETE Retry operation task - Method not implemented
     ...    Reference: Clause 5.4.14.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Delete Retry operation
     Check HTTP Response Status Code Is    405
 *** Keywords ***
@@ -102,19 +100,4 @@ Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
-    Integer    response status    200
-
-Launch another error handling action
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback
-    Integer    response status    202
-    
-Check retry not supported
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
-    # how to check if retry is not supported?
-
-Check resource FAILED_TEMP
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
-    String    response body operationState    FAILED_TEMP
\ No newline at end of file
+    Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot b/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
index d9513b7ff..c92083878 100644
--- a/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
@@ -12,7 +12,7 @@ Suite Setup    Check resource existence
 POST Rollback operation task  
     [Documentation]    Test ID: 6.3.5.14.1
     ...    Test title: POST Rollback operation task
-    ...    Test objective: The objective is to test that POST method The POST method initiates rollback a VNF lifecycle operation if that operation has experienced a temporary failure
+    ...    Test objective: The objective is to test that POST method initiates rollback a VNF lifecycle operation if that operation has experienced a temporary failure
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
     ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
@@ -23,7 +23,6 @@ POST Rollback operation task
     Check Operation Occurrence Id
 
 POST Rollback operation task Conflict (Not-FAILED_TEMP)
-    # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
     [Documentation]    Test ID: 6.3.5.14.2
     ...    Test title: POST Rollback operation task Conflict (Not-FAILED_TEMP)
     ...    Test objective: The objective is to test that POST method The POST method initiates rollback a VNF lifecycle operation if that operation has experienced a temporary failure
@@ -36,19 +35,18 @@ POST Rollback operation task Conflict (Not-FAILED_TEMP)
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
-
 POST Rollback operation task Not Found
-    # TODO: Need to create a vnfInstance which's instantiatedVnfInfo.scaleStatus is absent
     [Documentation]    Test ID: 6.3.5.14.3
     ...    Test title: POST Rollback operation task Not Found
     ...    Test objective: The objective is to test that the retry operation cannot be executed because the operation is not supported
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post Rollback operation
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
 
 GET Rollback operation task - Method not implemented
     [Documentation]    Test ID: 6.3.5.14.4
@@ -58,7 +56,7 @@ GET Rollback operation task - Method not implemented
     ...    Reference: Clause 5.4.15.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none 
     Get Rollback operation
     Check HTTP Response Status Code Is    405
     
@@ -70,7 +68,7 @@ PUT Rollback operation task - Method not implemented
     ...    Reference: Clause 5.4.15.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none 
     Put Rollback operation
     Check HTTP Response Status Code Is    405
 
@@ -82,7 +80,7 @@ PATCH Rollback operation task - Method not implemented
     ...    Reference: Clause 5.4.15.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Patch Rollback operation
     Check HTTP Response Status Code Is    405
     
@@ -94,7 +92,7 @@ DELETE Rollback operation task - Method not implemented
     ...    Reference: Clause 5.4.15.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Delete Rollback operation
     Check HTTP Response Status Code Is    405
 
@@ -103,19 +101,4 @@ Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
-    Integer    response status    200
-
-Launch another error handling action
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry
-    Integer    response status    202
-    
-Check Rollback not supported
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
-    # how to check if Rollback is not supported?
-    
-Check resource FAILED_TEMP
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
-    String    response body operationState    FAILED_TEMP
\ No newline at end of file
+    Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
index 6a5e732a1..4b9ebed98 100644
--- a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
@@ -34,7 +34,6 @@ POST Scale a vnfInstance Conflict (Not-Instantiated)
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
 
-    
 POST Scale a vnfInstance Not Found
     [Documentation]    Test ID: 6.3.5.4.3
     ...    Test title: POST Scale a vnfInstance Not Found
@@ -102,27 +101,4 @@ Check resource existence
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
-    Integer    response status    200
-
-Check resource not instantiated
-    [Arguments]    ${instanceId}
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${instanceId} 
-    String    response body instantiationState    NOT_INSTANTIATED
-
-Check scale not supported
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
-    Missing    response body instantiatedVnfInfo scaleStatus
-
-Launch another LCM operation
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/scaleVnfToLevelRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
-    Integer    response status    202
\ No newline at end of file
+    Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
index 7648c3756..75efe34bf 100644
--- a/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
@@ -33,7 +33,6 @@ POST Scale a vnfInstance to level Conflict (Not-Instantiated)
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
 
-    
 POST Scale a vnfInstance Not Found
     [Documentation]    Test ID: 6.3.5.5.3
     ...    Test title: POST Scale a vnfInstance Not Found
@@ -46,8 +45,7 @@ POST Scale a vnfInstance Not Found
     POST Scale vnfInstance to level    
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails 
-   
-    
+       
 GET Scale to level VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.5.4
     ...    Test title: GET Scale to level VNFInstance - Method not implemented
@@ -102,27 +100,4 @@ Check resource existence
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
-    Integer    response status    200
-
-Check resource not instantiated
-    [Arguments]    ${instanceId}
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${instanceId} 
-    String    response body instantiationState    NOT_INSTANTIATED
-
- Check scale to level not supported
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
-    Missing    response body instantiatedVnfInfo scaleStatus
-
-Launch another LCM operation
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/scaleVnfRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
-    Integer    response status    202
+    Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
index ad77de443..6f8cbd6ed 100644
--- a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
+++ b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
@@ -18,7 +18,7 @@ POST Create a new subscription
     ...    Post-Conditions: in response header Location shall not be null
     Post Create subscription
     Check HTTP Response Status Code Is    201
-    Check HTTP Response Body Json Schema Is    Subscription
+    Check HTTP Response Body Json Schema Is    subscription
     
 POST Create a new Subscription - DUPLICATION
     [Documentation]    Test ID: 6.3.5.17.2
@@ -31,7 +31,7 @@ POST Create a new Subscription - DUPLICATION
     ...    Post-Conditions: in response header Location shall not be null
     Post Create subscription - DUPLICATION
     Check HTTP Response Status Code Is    201
-    Check HTTP Response Body Json Schema Is    Subscription
+    Check HTTP Response Body Json Schema Is    subscription
 
 POST Create a new Subscription - NO-DUPLICATION
     [Documentation]    Test ID: 6.3.5.17.3
@@ -198,7 +198,7 @@ GET information about multiple subscriptions to get Paged Response
     ...    Post-Conditions:  
     Get subscriptions
     Check HTTP Response Status Code Is    200
-    Check LINK in Header 
+    Check HTTP Response Header Contain Link
     
 GET information about multiple subscriptions for Bad Request Response too big
     [Documentation]    Test ID: 6.3.5.17.16
@@ -211,5 +211,4 @@ GET information about multiple subscriptions for Bad Request Response too big
     ...    Post-Conditions: 
     Get subscriptions
     Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is    ProblemDetails
-
+    Check HTTP Response Body Json Schema Is    ProblemDetails
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
index 914af7811..72690a90b 100644
--- a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
@@ -25,7 +25,7 @@ POST Terminate a vnfInstance Conflict (Not-Instantiated)
     [Documentation]    Test ID: 6.3.5.7.2
     ...    Test title: POST Terminate a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set.  
-    ...    Pre-conditions:  VNF instance resource is in NOT-INSTANTIATED state
+    ...    Pre-conditions:  VNF instance resource is in NOT_INSTANTIATED state
     ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
@@ -33,8 +33,7 @@ POST Terminate a vnfInstance Conflict (Not-Instantiated)
     POST Terminate VNF  
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
-
-       
+    
 GET Terminate VNFInstance - Method not implemented
     [Documentation]    Test ID: 6.3.5.7.3
     ...    Test title:  GET Terminate VNFInstance - Method not implemented
@@ -89,27 +88,4 @@ Check resource existence
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
-    Integer    response status    200
-
-Check resource not instantiated
-    [Arguments]    ${instanceId}
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${instanceId} 
-    String    response body instantiationState    NOT_INSTANTIATED
-
-Check change flavour not supported
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
-    # how to check if change floavour is not supported? "flavourId" doesn't exist?
-
-Launch another LCM operation
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/scaleVnfRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
-    Integer    response status    202
\ No newline at end of file
+    Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index d6f9a33d4..8b5b5d7de 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -587,7 +587,34 @@ Post Individual VNF LCM OP occurrences
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
-
+Get Individual VNF LCM OP occurrences
+    log    Trying to perform a POST. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+Put Individual VNF LCM OP occurrences
+    log    Trying to perform a POST. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+Patch Individual VNF LCM OP occurrences
+    log    Trying to perform a POST. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch   ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+Delete Individual VNF LCM OP occurrences
+    log    Trying to perform a POST. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}			
 Post Retry operation
     Log    Retry a VNF lifecycle operation if that operation has experienced a temporary failure
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
@@ -661,7 +688,7 @@ Delete Rollback operation
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Post Fail operation
-    Log    mark as Failed a VNF lifecycle operation if that operation has experienced a temporary failure
+    Log    mark as Failed a VNF lifecycle operation if that operation has experienced a failure
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
@@ -740,7 +767,7 @@ Post Create subscription
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}				
@@ -751,7 +778,7 @@ Post Create subscription - DUPLICATION
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}			
@@ -762,7 +789,7 @@ Post Create subscription - NO-DUPLICATION
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
@@ -942,10 +969,7 @@ GET test endpoint
     Sleep  ${sleep_interval}
     Verify Mock Expectation  ${req}
     Clear Requests  ${callback_endpoint}   
-Check LINK in Header
-    ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
-    Should Not Be Empty    ${linkURL}
-
+    
 Check Subscription resource exist
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
@@ -988,4 +1012,8 @@ Get VNF LCM Operation occurrences with exclude_fields attribute selector
     GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 	
+    
+Check HTTP Response Header Contain Link
+    ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
+    Should Not Be Empty    ${linkURL}
     
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
index 1af91b51a..687c6f711 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
@@ -59,7 +59,7 @@ GET status information about multiple VNF LCM Operation occurrences Bad Request
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
-GET status information about multiple VNF LCM Operation OCC with "all_fields"   
+GET status information about multiple VNF LCM Operation occurrences with "all_fields"   
     [Documentation]    Test ID: 6.3.5.11.5
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "all_fields"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
@@ -72,7 +72,7 @@ GET status information about multiple VNF LCM Operation OCC with "all_fields"
     Check HTTP Response Status Code Is    202
     Check HTTP Response Body Json Schema Is    VnfLcmOpOccs 
 
-GET status information about multiple VNF LCM Operation OCC with "exlude_default"   
+GET status information about multiple VNF LCM Operation occurrences with "exlude_default"   
     [Documentation]    Test ID: 6.3.5.11.6
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "exclude_default"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
@@ -85,7 +85,7 @@ GET status information about multiple VNF LCM Operation OCC with "exlude_default
     Check HTTP Response Status Code Is    202
     Check HTTP Response Body Json Schema Is    VnfLcmOpOccs 
 
-GET status information about multiple VNF LCM Operation OCC with "fields"   
+GET status information about multiple VNF LCM Operation occurrences with "fields"   
     [Documentation]    Test ID: 6.3.5.11.7
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "fields"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
@@ -98,7 +98,7 @@ GET status information about multiple VNF LCM Operation OCC with "fields"
     Check HTTP Response Status Code Is    202
     Check HTTP Response Body Json Schema Is    VnfLcmOpOccs
 
-GET status information about multiple VNF LCM Operation OCC with "exclude_fields"   
+GET status information about multiple VNF LCM Operation occurrences with "exclude_fields"   
     [Documentation]    Test ID: 6.3.5.11.8
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "exclude_fields"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
@@ -158,7 +158,7 @@ GET status information about multiple VNF LCM operation occurances to get Paged
     ...    Post-Conditions: none   
     GET VNF LCM OP occurrences
     Check HTTP Response Status Code Is    200
-    Check LINK in Header 
+    Check HTTP Response Header Contain Link
     
 GET status information about multiple VNF LCM Operation occurrences Bad Request Response too big
     [Documentation]    Test ID: 6.3.5.11.13
@@ -173,7 +173,7 @@ GET status information about multiple VNF LCM Operation occurrences Bad Request
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails
     
-GET status information about multiple VNF LCM Operation OCC with "exlude_default" and "fields" 
+GET status information about multiple VNF LCM Operation occurrences with "exlude_default" and "fields" 
     [Documentation]    Test ID: 6.3.5.11.14
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "exclude_default" and "fields"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
diff --git a/SOL002/VNFLifecycleManagement-API/environment/variables.txt b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
index ef3d9d5ae..71e5445a3 100644
--- a/SOL002/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
@@ -73,4 +73,6 @@ ${terminationType}    GRACEFUL
 
 ${healingCause}    healingCause    
 
-${changeStateTo}    STOPPED
\ No newline at end of file
+${changeStateTo}    STOPPED
+
+${vnfdIds}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json
index 1411fe3b4..b28685555 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json
@@ -2,7 +2,7 @@
   "filter": {{
     "vnfInstanceSubscriptionFilter": {{
       "vnfdIds": [
-        "6fc3539c-e602-4afa-8e13-962fb5a7d81f"
+        "{vnfdIds}"
       ]
     }}
   }},
-- 
GitLab


From 2135fca55e114edfc5862f9ab22c2ebaff0d75ff Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Thu, 8 Oct 2020 12:57:59 +0500
Subject: [PATCH 057/322] templating and minor bugs fix added

---
 .../IndividualPmJob.robot                     |   7 +-
 .../IndividualReport.robot                    |  33 +---
 .../IndividualSubscription.robot              | 100 ----------
 .../IndividualThreshold.robot                 |  17 +-
 .../VNFPerformanceManagement-API/PMJobs.robot |  26 ++-
 .../Subscriptions.robot                       | 176 ------------------
 .../Thresholds.robot                          |   4 +-
 .../environment/individualSubscription.txt    |   6 -
 .../environment/pmJobs.txt                    |   4 +-
 .../environment/subscriptions.txt             |   7 -
 .../environment/thresholds.txt                |   4 +-
 .../environment/variables.txt                 |   4 +-
 .../jsons/CreatePmJobRequest.json             |  10 +-
 .../jsons/CreateThresholdRequest.json         |  14 +-
 .../jsons/subscriptions.json                  |   6 -
 .../schemas/Subscriptions.schema.json         |   1 -
 16 files changed, 61 insertions(+), 358 deletions(-)
 delete mode 100644 SOL003/VNFPerformanceManagement-API/IndividualSubscription.robot
 delete mode 100644 SOL003/VNFPerformanceManagement-API/Subscriptions.robot
 delete mode 100644 SOL003/VNFPerformanceManagement-API/environment/individualSubscription.txt
 delete mode 100644 SOL003/VNFPerformanceManagement-API/environment/subscriptions.txt
 delete mode 100644 SOL003/VNFPerformanceManagement-API/jsons/subscriptions.json
 delete mode 100644 SOL003/VNFPerformanceManagement-API/schemas/Subscriptions.schema.json

diff --git a/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
index 8c2fc2979..6b86804c4 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
@@ -58,6 +58,7 @@ DELETE Individual VNF Performance Job with invalid resource identifier
     ...    Post-Conditions: none
     Send Delete request for individual VNF Performance Job with invalid resource identifier
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 POST Individual VNF Performance Job - Method not implemented
     [Documentation]    Test ID: 7.3.4.2.5
@@ -67,10 +68,9 @@ POST Individual VNF Performance Job - Method not implemented
     ...    Reference: Clause 6.4.3.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Performance Job is not created on the VNFM
+    ...    Post-Conditions: none
     Send Post request for individual VNF Performance Job
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Performance Job is not Created
 
 PUT Individual VNF Performance Job - Method not implemented
     [Documentation]    Test ID: 7.3.4.2.6
@@ -80,10 +80,9 @@ PUT Individual VNF Performance Job - Method not implemented
     ...    Reference: Clause 6.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Performance Job is not modified by the operation
+    ...    Post-Conditions: none
     Send Put request for individual VNF Performance Job
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Performance Job is Unmodified (Implicit)
 
 PATCH Individual VNF Performance Job
     [Documentation]    Test ID: 7.3.4.2.7
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualReport.robot b/SOL003/VNFPerformanceManagement-API/IndividualReport.robot
index 6a4de49d0..d3e24fa9e 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualReport.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualReport.robot
@@ -30,6 +30,7 @@ Get Individual Performance Report with invalid resource endpoint
     ...    Post-Conditions: none
     Get Individual Performance Report with invalid resource endpoint
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 POST Individual Performance Report - Method not implemented
     [Documentation]    Test ID: 7.3.4.3.3
@@ -39,10 +40,9 @@ POST Individual Performance Report - Method not implemented
     ...    Reference: Clause 6.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: The VNF performance report is not created on the VNFM
+    ...    Post-Conditions: none
     Send Post request for Individual Performance Report
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Individual Performance Report is not Created
 
 PUT Individual Performance Report - Method not implemented
     [Documentation]    Test ID: 7.3.4.3.4
@@ -52,10 +52,9 @@ PUT Individual Performance Report - Method not implemented
     ...    Reference: Clause 6.4.4.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: The VNF performance report is not modified by the operation
+    ...    Post-Conditions: none
     Send Put request for Individual Performance Report
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Individual Performance Report is Unmodified (Implicit)
 
 PATCH Individual Performance Report - Method not implemented
     [Documentation]    Test ID: 7.3.4.3.5
@@ -65,10 +64,9 @@ PATCH Individual Performance Report - Method not implemented
     ...    Reference: Clause 6.4.4.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: The VNF performance report is not modified by the operation
+    ...    Post-Conditions: none
     Send Patch request for Individual Performance Report
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Individual Performance Report is Unmodified (Implicit)
 
 DELETE Individual Performance Report - Method not implemented
     [Documentation]    Test ID: 7.3.4.3.6
@@ -78,10 +76,9 @@ DELETE Individual Performance Report - Method not implemented
     ...    Reference: Clause 6.4.4.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: The VNF performance report is not deleted by the operation
+    ...    Post-Conditions: none
     Send Delete request for Individual Performance Report
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Individual Performance Report Exists
 
 *** Keywords ***
 Get Individual Performance Report
@@ -134,26 +131,6 @@ Send Delete request for Individual Performance Report
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
-Check Postcondition VNF Individual Performance Report Exists
-    Log    Checking that report still exists
-    Get Individual Performance Report
-
-Check Postcondition VNF Individual Performance Report is not Created
-    Log    Trying to get a new report
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    Check HTTP Response Status Code Is    404
-
-Check Postcondition VNF Individual Performance Report is Unmodified (Implicit)
-    Log    Check Postcondition VNF PM job is not modified
-    Get Individual Performance Report
-    Log    Check Response matches original VNF report
-    ${report}=    evaluate    json.loads('''${response['body']}''')    json
-    Should Be Equal    ${origResponse['body']['entries'][0]['objectInstanceId']}    ${report['entries'][0]['objectInstanceId']}
-
 Check HTTP Response Status Code Is
     [Arguments]    ${expected_status}
     ${status}=    Convert To Integer    ${expected_status}    
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualSubscription.robot b/SOL003/VNFPerformanceManagement-API/IndividualSubscription.robot
deleted file mode 100644
index 2a5bf91ae..000000000
--- a/SOL003/VNFPerformanceManagement-API/IndividualSubscription.robot
+++ /dev/null
@@ -1,100 +0,0 @@
-*** Settings ***
-Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt    # Generic Parameters
-Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
-Library           OperatingSystem
-Library           JSONLibrary
-Resource          environment/individualSubscription.txt
-Resource          VNFPerformanceManagementKeywords.robot
-
-*** Test Cases ***
-GET Individual VNF Performance Subscription
-    [Documentation]    Test ID: 7.3.4.7.1
-    ...    Test title: GET Individual VNF Performance Subscription
-    ...    Test objective: The objective is to test the retrieval of individual VNF performance subscription and perform a JSON schema and content validation of the returned subscription data structure
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.8.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Individual VNF Performance Subscription
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is   PmSubscription
-    Check HTTP Response Body Subscription Identifier matches the requested Subscription
-
-GET Individual VNF Performance Subscription with invalid resource identifier
-    [Documentation]    Test ID: 7.3.4.7.2
-    ...    Test title: GET Individual VNF Performance Subscription with invalid resource identifier
-    ...    Test objective: The objective is to test that the retrieval of an individual VNF performance subscription fails when using an invalid resource identifier
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.8.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    GET individual VNF Performance Subscription with invalid resource identifier
-    Check HTTP Response Status Code Is    404
-
-DELETE Individual VNF Performance Subscription
-    [Documentation]    Test ID: 7.3.4.7.3
-    ...    Test title: DELETE Individual VNF Performance Subscription
-    ...    Test objective: The objective is to test the deletion of an individual VNF performance subscription
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.8.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: The VNF Performance Subscription is not available anymore in the VNFM    
-    Send Delete request for individual VNF Performance Subscription
-    Check HTTP Response Status Code Is    204
-    Check Postcondition VNF Performance Subscription is Deleted
-
-DELETE Individual VNF Performance Subscription with invalid resource identifier
-    [Documentation]    Test ID: 7.3.4.7.4
-    ...    Test title: DELETE Individual VNF Performance Subscription with invalid resource identifier
-    ...    Test objective: The objective is to test that the deletion of an individual VNF performance subscription fails when using an invalid resource identifier
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.8.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none   
-    Send Delete request for individual VNF Performance Subscription with invalid resource identifier
-    Check HTTP Response Status Code Is    404
-
-POST Individual VNF Performance Subscription - Method not implemented
-    [Documentation]    Test ID: 7.3.4.7.5
-    ...    Test title: POST Individual VNF Performance Subscription - Method not implemented
-    ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF Performance Subscription
-    ...    Pre-conditions: A VNF instance is instantiated
-    ...    Reference: Clause 6.4.8.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: The VNF Performance Subscription is not created on the VNFM
-    Send Post request for individual VNF Performance Subscription
-    Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Performance Subscription is not Created
-
-PUT Individual VNF Performance Subscription - Method not implemented
-    [Documentation]    Test ID: 7.3.4.7.6
-    ...    Test title: PUT Individual VNF Performance Subscription - Method not implemented
-    ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF Performance subscription
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.8.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: The VNF Performance subscription is not modified by the operation
-    Send Put request for individual VNF Performance Threshold
-    Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Performance Subscription is Unmodified (Implicit)
-
-PATCH Individual VNF Performance Subscription - Method not implemented
-    [Documentation]    Test ID: 7.3.4.7.7
-    ...    Test title: PATCH Individual VNF Performance Subscription - Method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing VNF Performance subscription
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.8.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: The VNF Performance subscription is not modified by the operation
-    Send Patch request for individual VNF Performance Threshold
-    Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Performance Subscription is Unmodified (Implicit)
-
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
index fb40dd197..a1fd48b1d 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -32,6 +32,7 @@ GET Individual Threshold with invalid resource identifier
     ...    Post-Conditions: none
     GET individual VNF Performance Threshold with invalid resource identifier
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 DELETE Individual Threshold
     [Documentation]    Test ID: 7.3.4.5.3
@@ -57,6 +58,7 @@ DELETE Individual Threshold with invalid resource identifier
     ...    Post-Conditions: none   
     Send Delete request for individual VNF Performance Threshold with invalid resource identifier
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 POST Individual Threshold - Method not implemented
     [Documentation]    Test ID: 7.3.4.5.5
@@ -66,10 +68,9 @@ POST Individual Threshold - Method not implemented
     ...    Reference: Clause 6.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Performance Threshold is not created on the VNFM
+    ...    Post-Conditions: none
     Send Post request for individual VNF Performance Threshold
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Performance Threshold is not Created
 
 PUT Individual Threshold - Method not implemented
     [Documentation]    Test ID: 7.3.4.5.6
@@ -79,10 +80,9 @@ PUT Individual Threshold - Method not implemented
     ...    Reference: Clause 6.4.6.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Performance Threshold is not modified by the operation
+    ...    Post-Conditions: none
     Send Put request for individual VNF Performance Threshold
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Performance Threshold is Unmodified (Implicit)
 
 PATCH Individual Threshold
     [Documentation]    Test ID: 7.3.4.5.7
@@ -176,15 +176,6 @@ Check Postcondition VNF Performance Threshold is Unmodified (Implicit)
     ${threshold}=    evaluate    json.loads('''${response['body']}''')    json
     Should Be Equal    ${origresponse['body']['id']}    ${threshold.id}
     Should Be Equal    ${origresponse['body']['criteria']}    ${threshold.criteria}
-    
-Check Postcondition VNF Performance Threshold is not Created
-    Log    Trying to get a new Threshold
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${newThresholdId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    Check HTTP Response Status Code Is    404
 
 Check Postcondition VNF Performance Threshold is Deleted
     Log    Check Postcondition Threshold is deleted
diff --git a/SOL003/VNFPerformanceManagement-API/PMJobs.robot b/SOL003/VNFPerformanceManagement-API/PMJobs.robot
index 13a3c7634..45188503d 100644
--- a/SOL003/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL003/VNFPerformanceManagement-API/PMJobs.robot
@@ -195,6 +195,20 @@ GET VNF Performance Monitoring Jobs - Bad Request Response too Big
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is   ProblemDetails
     
+GET all VNF Performance Monitoring Jobs with fields and exclude_default attribute selector
+    [Documentation]    Test ID: 7.3.4.1.15
+    ...    Test title: GET all VNF Performance Monitoring Jobs with fields and exclude_default attribute selector
+    ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs fields and exclude_default attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued fields selector
+    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: The VNFM supports the use of fields and exclude_fields attribute selector
+    ...    Post-Conditions: none
+    GET VNF Performance Monitoring Jobs with fields and exclude_default attribute selector
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is   PmJobs
+    Check HTTP Response Body PmJobs Matches the requested fields selector
+    
 *** Keywords ***
 GET all VNF Performance Monitoring Jobs
     Log    Trying to get all PM Jobs present in the VNFM
@@ -237,6 +251,15 @@ GET VNF Performance Monitoring Jobs with fields attribute selector
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
+GET VNF Performance Monitoring Jobs with fields and exclude_default attribute selector
+    Log    Trying to get all VNF Packages present in the VNFM, using filter params
+    Pass Execution If    ${FIELD_USAGE} == 0    Skipping test as VNFM is not supporting 'fields'
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?fields=${fields}&exclude_default
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
 GET VNF Performance Monitoring Jobs with exclude_fields attribute selector
     Log    Trying to get all VNF Packages present in the VNFM, using filter params
     Pass Execution If    ${FIELD_USAGE} == 0    Skipping test as VNFM is not supporting 'fields'
@@ -267,7 +290,8 @@ Send Post Request Create new VNF Performance Monitoring Job
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/CreatePmJobRequest.json
+    ${template}=    Get File    jsons/CreatePmJobRequest.json
+    ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}
     POST    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL003/VNFPerformanceManagement-API/Subscriptions.robot b/SOL003/VNFPerformanceManagement-API/Subscriptions.robot
deleted file mode 100644
index cee773e79..000000000
--- a/SOL003/VNFPerformanceManagement-API/Subscriptions.robot
+++ /dev/null
@@ -1,176 +0,0 @@
-*** Settings ***
-Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt    # Generic Parameters
-Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
-Library           OperatingSystem
-Library           JSONLibrary
-Resource          VNFPerformanceManagementKeywords.robot
-Resource          environment/subscriptions.txt
-Library           MockServerLibrary
-Library           Process
-Suite Setup       Create Sessions
-Suite Teardown    Terminate All Processes    kill=true
-
-*** Test Cases ***
-GET all VNF Performance Subscriptions
-    [Documentation]    Test ID: 7.3.4.6.1
-    ...    Test title: GET all VNF Performance Subscriptions
-    ...    Test objective: The objective is to test the retrieval of all VNF performance subscriptions and perform a JSON schema validation of the returned subscriptions data structure
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    Get all VNF Performance Subscriptions
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    PmSubscriptions
-
-GET VNF Performance Subscriptions with attribute-based filter
-    [Documentation]    Test ID: 7.3.4.6.2
-    ...    Test title: GET VNF Performance Subscriptions with attribute-based filter
-    ...    Test objective: The objective is to test the retrieval of VNF performance subscriptions using attribute-based filter, perform a JSON schema validation of the collected indicators data structure, and verify that the retrieved information matches the issued attribute-based filters 
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get VNF Performance Subscriptions with attribute-based filters
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    PmSubscriptions
-    Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filter 
-
-GET VNF Performance Management Subscriptions with invalid attribute-based filter
-    [Documentation]    Test ID: 7.3.4.6.3
-    ...    Test title: GET VNF Performance Management Subscriptions with invalid attribute-based filter
-    ...    Test objective: The objective is to test that the retrieval of VNF performance subscriptions fails when using invalid attribute-based filters, and perform the JSON schema validation of the failed operation HTTP response. 
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get VNF Performance Subscriptions with invalid attribute-based filters
-    Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is   ProblemDetails 
-
-GET VNF Performance Subscriptions with invalid resource endpoint
-    [Documentation]    Test ID: 7.3.4.6.4
-    ...    Test title: GET VNF Performance Subscriptions with invalid resource endpoint
-    ...    Test objective: The objective is to test that the retrieval of all VNF performance subscriptions fails when using invalid resource endpoint.
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    Get VNF Performance Subscriptions with invalid resource endpoint
-    Check HTTP Response Status Code Is    404
-    
-Create new VNF Performance subscription
-    [Documentation]    Test ID: 7.3.4.6.5
-    ...    Test title: Create new VNF Performance subscription
-    ...    Test objective: The objective is to test the creation of a new VNF performance subscription and perform a JSON schema and content validation of the returned subscription data structure
-    ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: The VNF performance subscription is successfully set and it matches the issued subscription    
-    Send Post Request for VNF Performance Subscription
-    Check HTTP Response Status Code Is    201
-    Check HTTP Response Body Json Schema Is    PmSubscription
-    Check HTTP Response Body PmSubscription Attributes Values Match the Issued Subscription
-    Check Postcondition VNF Performance Subscription Is Set 
-
-
-Create duplicated VNF Performance subscription with VNFM not creating duplicated subscriptions
-    [Tags]    no-duplicated-subs
-    [Documentation]    Test ID: 7.3.4.6.6
-    ...    Test title: Create duplicated VNF Performance subscription with VNFM not creating duplicated subscriptions
-    ...    Test objective: The objective is to test the attempt of a creation of a duplicated VNF performance subscription and check that no new subscription is created by the VNFM and a link to the original subscription is returned
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: The VNFM does not support the creation of duplicated subscriptions
-    ...    Post-Conditions: The existing VNF performance subscription returned is available in the VNFM
-    Send Post Request for Duplicated VNF Performance Subscription
-    Check HTTP Response Status Code Is    303
-    Check HTTP Response Body Is Empty
-    Check HTTP Response Header Contains    Location
-    Check Postcondition Subscription Resource Returned in Location Header Is Available
-
-Create duplicated VNF Performance subscription with VNFM creating duplicated subscriptions
-    [Tags]    duplicated-subs
-    [Documentation]    Test ID: 7.3.4.6.7
-    ...    Test title: Create duplicated VNF Performance subscription with VNFM creating duplicated subscriptions
-    ...    Test objective: The objective is to test the creation of a duplicated VNF performance subscription and perform a JSON schema and content validation of the returned duplicated subscription data structure
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: The VNFM supports the creation of duplicated subscriptions
-    ...    Post-Conditions: The duplicated VNF performance subscription is successfully set and it matches the issued subscription
-    Send Post Request for Duplicated VNF Performance Subscription
-    Check HTTP Response Status Code Is    201
-    Check HTTP Response Body Json Schema Is    PmSubscription
-    Check HTTP Response Body PmSubscription Attributes Values Match the Issued Subscription
-    Check Postcondition VNF Performance Subscription Is Set 
-
-PUT VNF Performance Subscriptions - Method not implemented
-    [Documentation]    Test ID: 7.3.4.6.8
-    ...    Test title: PUT VNF Performance Subscriptions - Method not implemented
-    ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF performance subscriptions
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send Put Request for VNF Performance Subscriptions
-    Check HTTP Response Status Code Is    405 
-    
-PATCH VNF Performance Subscriptions - Method not implemented
-    [Documentation]    Test ID: 7.3.4.6.9
-    ...    Test title: PATCH VNF Performance Subscriptions - Method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF performance subscriptions
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send Patch Request for VNF Performance Subscriptions
-    Check HTTP Response Status Code Is    405
-    
-DELETE VNF Performance Subscriptions - Method not implemented
-    [Documentation]    Test ID: 7.3.4.6.10
-    ...    Test title: DELETE VNF Performance Subscriptions - Method not implemented
-    ...    Test objective: The objective is to test that DELETE method is not allowed to delete VNF performance subscriptions
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: The VNF performance subscriptions are not deleted by the failed operation   
-    Send Delete Request for VNF Performance Subscriptions
-    Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Performance Subscriptions Exists
-
-GET all VNF Performance Subscriptions as Paged Response
-    [Documentation]    Test ID: 7.3.4.6.11
-    ...    Test title: GET all VNF Performance Subscriptions as Paged Response
-    ...    Test objective: The objective is to test the retrieval of all VNF performance subscriptions as Paged Response.
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    Get all VNF Performance Subscriptions
-    Check HTTP Response Status Code Is    200
-    Check LINK in Header
-    
-GET VNF Performance Management Subscriptions - Bad Request Response too Big
-    [Documentation]    Test ID: 7.3.4.6.12
-    ...    Test title: GET VNF Performance Management Subscriptions - Bad Request Response too Big
-    ...    Test objective: The objective is to test that the retrieval of VNF performance subscriptions fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response. 
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get all VNF Performance Subscriptions
-    Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is   ProblemDetails
\ No newline at end of file
diff --git a/SOL003/VNFPerformanceManagement-API/Thresholds.robot b/SOL003/VNFPerformanceManagement-API/Thresholds.robot
index c1d7f0471..c3dc62f94 100644
--- a/SOL003/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL003/VNFPerformanceManagement-API/Thresholds.robot
@@ -1,4 +1,5 @@
 *** Settings ***
+Library           String
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
 Library           JSONLibrary
@@ -174,7 +175,8 @@ Send Post Request Create new Performance Threshold
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    ${request}=    Get File    jsons/CreateThresholdRequest.json
+    ${template}=    Get File    jsons/CreateThresholdRequest.json
+    ${request}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}
     POST    ${apiRoot}/${apiName}/${apiVersion}/thresholds    ${request}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL003/VNFPerformanceManagement-API/environment/individualSubscription.txt b/SOL003/VNFPerformanceManagement-API/environment/individualSubscription.txt
deleted file mode 100644
index 921749ffd..000000000
--- a/SOL003/VNFPerformanceManagement-API/environment/individualSubscription.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-*** Variables ***
-${subscriptionId}    17563e75-0e14-4bd7-94b4-6bbb869c79aa
-${erroneousSubscriptionId}    erroneousSubscriptionId
-${newSubscriptionId}    newSubsciptionId
-${response}    httpresponse
-${origResponse}    httpresponse
\ No newline at end of file
diff --git a/SOL003/VNFPerformanceManagement-API/environment/pmJobs.txt b/SOL003/VNFPerformanceManagement-API/environment/pmJobs.txt
index 9891d3fed..bccab232a 100644
--- a/SOL003/VNFPerformanceManagement-API/environment/pmJobs.txt
+++ b/SOL003/VNFPerformanceManagement-API/environment/pmJobs.txt
@@ -1,5 +1,7 @@
+*** Settings ***
+Resource          variables.txt
 *** Variables ***
-${POS_FILTER}     objectInstanceIds=1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
+${POS_FILTER}     objectInstanceIds=${objectInstanceIds}
 ${NEG_FILTER}     criteriaPmJob=erroneousAttributeName
 ${fields}         criteria,objectInstanceIds
 ${response}       httpresponse         
diff --git a/SOL003/VNFPerformanceManagement-API/environment/subscriptions.txt b/SOL003/VNFPerformanceManagement-API/environment/subscriptions.txt
deleted file mode 100644
index 46984c68e..000000000
--- a/SOL003/VNFPerformanceManagement-API/environment/subscriptions.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-*** Variables ***
-${callbackUri_Sub}    http://172.22.1.7:9091/vnfpm/subscriptions
-${filter_ok}      callbackUri=${callbackUri_Sub}
-${filter_ko}      erroneousFilter=erroneous
-${total_polling_time}   2 min
-${polling_interval}     10 sec
-${response}    httpresponse
diff --git a/SOL003/VNFPerformanceManagement-API/environment/thresholds.txt b/SOL003/VNFPerformanceManagement-API/environment/thresholds.txt
index a2b025eef..18b3f32f4 100644
--- a/SOL003/VNFPerformanceManagement-API/environment/thresholds.txt
+++ b/SOL003/VNFPerformanceManagement-API/environment/thresholds.txt
@@ -1,4 +1,6 @@
+*** Settings ***
+Resource          variables.txt
 *** Variables ***
-${FILTER_OK}      objectInstanceId=1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
+${FILTER_OK}      objectInstanceId=${objectInstanceIds}
 ${FILTER_KO}      criterias=erroneousFilter
 ${response}=    httpresponse
\ No newline at end of file
diff --git a/SOL003/VNFPerformanceManagement-API/environment/variables.txt b/SOL003/VNFPerformanceManagement-API/environment/variables.txt
index a2794c309..170e9cee2 100644
--- a/SOL003/VNFPerformanceManagement-API/environment/variables.txt
+++ b/SOL003/VNFPerformanceManagement-API/environment/variables.txt
@@ -30,4 +30,6 @@ ${polling_interval}     10 sec
 
 ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
 
-${response}
\ No newline at end of file
+${response}
+
+${objectInstanceIds}    1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
\ No newline at end of file
diff --git a/SOL003/VNFPerformanceManagement-API/jsons/CreatePmJobRequest.json b/SOL003/VNFPerformanceManagement-API/jsons/CreatePmJobRequest.json
index 6a21ba34f..4dbfc7c6c 100644
--- a/SOL003/VNFPerformanceManagement-API/jsons/CreatePmJobRequest.json
+++ b/SOL003/VNFPerformanceManagement-API/jsons/CreatePmJobRequest.json
@@ -1,9 +1,9 @@
-{
-	"objectInstanceIds" : ["1f50d68b-82e8-4deb-bd40-c934d4d1ac0a"],
-	"criteria" : {
+{{
+	"objectInstanceIds" : ["{objectInstanceIds}"],
+	"criteria" : {{
 		"performanceMetric": [],
 		"performanceMetricGroup": [],
 		"collectionPeriod": 10,
 		"reportingPeriod": 30
-	}
-}
\ No newline at end of file
+	}}
+}}
\ No newline at end of file
diff --git a/SOL003/VNFPerformanceManagement-API/jsons/CreateThresholdRequest.json b/SOL003/VNFPerformanceManagement-API/jsons/CreateThresholdRequest.json
index 1e58c2bac..c7cfee14f 100644
--- a/SOL003/VNFPerformanceManagement-API/jsons/CreateThresholdRequest.json
+++ b/SOL003/VNFPerformanceManagement-API/jsons/CreateThresholdRequest.json
@@ -1,12 +1,12 @@
-{
-	"objectInstanceIds" : "1f50d68b-82e8-4deb-bd40-c934d4d1ac0a",
-	"criteria" : {
+{{
+	"objectInstanceIds" : "{objectInstanceIds}",
+	"criteria" : {{
 		"performanceMetric": "cpu_util",
 		"thresholdType": "SIMPLE",
-		"simpleThresholdDetails": {
+		"simpleThresholdDetails": {{
 			"thresholdValue": 10,
 			"hysteresis": 50
-		}
+		}}
 		
-	}
-}
\ No newline at end of file
+	}}
+}}
\ No newline at end of file
diff --git a/SOL003/VNFPerformanceManagement-API/jsons/subscriptions.json b/SOL003/VNFPerformanceManagement-API/jsons/subscriptions.json
deleted file mode 100644
index 128c42e1a..000000000
--- a/SOL003/VNFPerformanceManagement-API/jsons/subscriptions.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"callbackUri": "http://172.22.1.7:9091/vnfpm/subscriptions",
-	"filter": {
-		"notificationTypes": ["ThresholdCrossedNotification"]
-	}
-}
\ No newline at end of file
diff --git a/SOL003/VNFPerformanceManagement-API/schemas/Subscriptions.schema.json b/SOL003/VNFPerformanceManagement-API/schemas/Subscriptions.schema.json
deleted file mode 100644
index fefb142da..000000000
--- a/SOL003/VNFPerformanceManagement-API/schemas/Subscriptions.schema.json
+++ /dev/null
@@ -1 +0,0 @@
-{  "type": "array",  "items": {    "description": "This type represents a subscription.\n",    "type": "object",    "required": [      "id",      "callbackUri",      "_links"    ],    "properties": {      "id": {        "description": "An identifier with the intention of being globally unique.\n",        "type": "string"      },      "filter": {        "description": "This type represents a filter that can be used to subscribe for notifications related to performance management events.\n",        "type": "object",        "properties": {          "vnfInstanceSubscriptionFilter": {            "description": "This type represents subscription filter criteria to match VNF instances.\n",            "type": "object",            "properties": {              "vnfdIds": {                "description": "If present, match VNF instances that were created based on a VNFD identified by one of the vnfdId values listed in this attribute. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",                "type": "array",                "items": {                  "description": "An identifier with the intention of being globally unique.\n",                  "type": "string"                }              },              "vnfProductsFromProviders": {                "description": "If present, match VNF instances that belong to VNF products from certain providers. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",                "type": "array",                "items": {                  "type": "object",                  "required": [                    "vnfProvider"                  ],                  "properties": {                    "vnfProvider": {                      "description": "Name of the VNF provider to match.\n",                      "type": "string"                    },                    "vnfProducts": {                      "description": "If present, match VNF instances that belong to VNF products with certain product names, from one particular provider.\n",                      "type": "array",                      "items": {                        "type": "object",                        "required": [                          "vnfProductName"                        ],                        "properties": {                          "vnfProductName": {                            "description": "Name of the VNF product to match.\n",                            "type": "string"                          },                          "versions": {                            "description": "If present, match VNF instances that belong to VNF products with certain versions and a certain product name, from one particular provider.\n",                            "type": "array",                            "items": {                              "type": "object",                              "required": [                                "vnfSoftwareVersion"                              ],                              "properties": {                                "vnfSoftwareVersion": {                                  "description": "A version.\n",                                  "type": "string"                                },                                "vnfdVersions": {                                  "description": "If present, match VNF instances that belong to VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n",                                  "type": "array",                                  "items": {                                    "description": "A version.\n",                                    "type": "string"                                  }                                }                              }                            }                          }                        }                      }                    }                  }                }              },              "vnfInstanceIds": {                "description": "If present, match VNF instances with an instance identifier listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",                "type": "array",                "items": {                  "description": "An identifier with the intention of being globally unique.\n",                  "type": "string"                }              },              "vnfInstanceNames": {                "description": "If present, match VNF instances with a VNF Instance Name listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",                "type": "array",                "items": {                  "type": "string"                }              }            }          },          "notificationTypes": {            "description": "Match particular notification types. Permitted values: * ThresholdCrossedNotification * PerformanceInformationAvailableNotification The permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.\n",            "type": "string",            "enum": [              "ThresholdCrossedNotification",              "PerformanceInformationAvailableNotification"            ]          }        }      },      "callbackUri": {        "description": "The URI of the endpoint to send the notification to.\n",        "type": "string",        "format": "url"      },      "_links": {        "description": "Links to resources related to this resource.\n",        "type": "object",        "required": [          "self"        ],        "properties": {          "self": {            "description": "This type represents a link to a resource.\n",            "type": "object",            "required": [              "href"            ],            "properties": {              "href": {                "description": "URI of the referenced resource.\n",                "type": "string",                "format": "url"              }            }          }        }      }    }  }}
\ No newline at end of file
-- 
GitLab


From b0b789ebde7c4fcfb8a0f0d3eb55ab0d9110130f Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Thu, 8 Oct 2020 15:37:13 +0500
Subject: [PATCH 058/322] reference updated

---
 .../ApiVersion.robot                          |  20 +-
 .../IndividualPmJob.robot                     |  16 +-
 .../IndividualReport.robot                    |  12 +-
 .../IndividualThreshold.robot                 |  16 +-
 .../VNFPerformanceManagement-API/PMJobs.robot |  30 +-
 .../PerformanceManagementNotification.robot   |   4 +-
 .../Thresholds.robot                          |  20 +-
 .../VNFPerformanceManagementKeywords.robot    | 308 +-----------------
 8 files changed, 60 insertions(+), 366 deletions(-)

diff --git a/SOL003/VNFPerformanceManagement-API/ApiVersion.robot b/SOL003/VNFPerformanceManagement-API/ApiVersion.robot
index efc29bcee..6b87e7997 100644
--- a/SOL003/VNFPerformanceManagement-API/ApiVersion.robot
+++ b/SOL003/VNFPerformanceManagement-API/ApiVersion.robot
@@ -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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
index 6b86804c4..122cb090c 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
@@ -12,7 +12,7 @@ GET individual VNF Performance Job
     ...    Test title: Get individual VNF Performance Job
     ...    Test objective: The objective is to test the retrieval of an individual VNF performance monitoring job and perform a JSON schema and content validation of the collected job data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -26,7 +26,7 @@ GET individual VNF Performance Job with invalid resource identifier
     ...    Test title: Get individual VNF Performance Job with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual VNF performance monitoring job fails when using an invalid resource identifier, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +39,7 @@ DELETE Individual VNF Performance Job
     ...    Test title: Delete Individual VNF Performance Job
     ...    Test objective: The objective is to test the deletion of an individual VNF performance monitoring job
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Job is no more available in the VNFM    
@@ -52,7 +52,7 @@ DELETE Individual VNF Performance Job with invalid resource identifier
     ...    Test title: Delete individual VNF Performance Job with invalid resource identifier
     ...    Test objective: The objective is to test that the deletion of an individual VNF performance monitoring job fails when using an invalid resource identifier
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -65,7 +65,7 @@ POST Individual VNF Performance Job - Method not implemented
     ...    Test title: POST Individual VNF Performance Job - method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF Performance Monitoring Job
     ...    Pre-conditions: A VNF instance is instantiated
-    ...    Reference: Clause 6.4.3.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.3.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -77,7 +77,7 @@ PUT Individual VNF Performance Job - Method not implemented
     ...    Test title: PUT Individual VNF Performance Job - method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF Performance Monitoring Job
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -89,7 +89,7 @@ PATCH Individual VNF Performance Job
     ...    Test title: PATCH Individual VNF Performance Job
     ...    Test objective: The objective is to test that PATCH method allows to modify individual performace management job
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -102,7 +102,7 @@ PATCH Individual VNF Performance Job - Precondition failed
     ...    Test title: PATCH Individual VNF Performance Job - Precondition failed
     ...    Test objective: The objective is to attempt to Modify an individual alarm resource, where the precondition was not met.
     ...    Pre-conditions:  A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  The VNF Performance Job is not modified by the operation
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualReport.robot b/SOL003/VNFPerformanceManagement-API/IndividualReport.robot
index d3e24fa9e..a3d5d6347 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualReport.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualReport.robot
@@ -11,7 +11,7 @@ Get Individual Performance Report
     ...    Test title: Get Individual Performance Report
     ...    Test objective: The objective is to test the retrieval of an individual VNF performance report associated to a monitoring job and perform a JSON schema validation of the collected report data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
-    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -24,7 +24,7 @@ Get Individual Performance Report with invalid resource endpoint
     ...    Test title: Get Individual Performance Report with invalid resource endpoint
     ...    Test objective:  The objective is to test that the retrieval of an individual VNF performance report associated to a monitoring job fails when using an invalid resource endpoint 
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
-    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -37,7 +37,7 @@ POST Individual Performance Report - Method not implemented
     ...    Test title: POST Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF performance report within a monitoring job
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 6.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -49,7 +49,7 @@ PUT Individual Performance Report - Method not implemented
     ...    Test title: PUT Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF performance report within a monitoring job
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
-    ...    Reference: Clause 6.4.4.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.4.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -61,7 +61,7 @@ PATCH Individual Performance Report - Method not implemented
     ...    Test title: PATCH Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing VNF performance report within a monitoring job
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
-    ...    Reference: Clause 6.4.4.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.4.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -73,7 +73,7 @@ DELETE Individual Performance Report - Method not implemented
     ...    Test title: DELETE Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing VNF performance report within a monitoring job
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
-    ...    Reference: Clause 6.4.4.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.4.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
index a1fd48b1d..76bc00b86 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -12,7 +12,7 @@ GET Individual Threshold
     ...    Test title: GET Individual Threshold
     ...    Test objective: The objective is to test the retrieval of an individual VNF performance threshold and perform a JSON schema and content validation of the collected threshold data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -26,7 +26,7 @@ GET Individual Threshold with invalid resource identifier
     ...    Test title: GET Individual Threshold with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual VNF performance threshold fails when using an invalid resource identifier
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +39,7 @@ DELETE Individual Threshold
     ...    Test title: DELETE Individual Threshold
     ...    Test objective: The objective is to test the deletion of an individual VNF performance threshold
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Threshold is not available anymore in the VNFM    
@@ -52,7 +52,7 @@ DELETE Individual Threshold with invalid resource identifier
     ...    Test title: DELETE Individual Threshold with invalid resource identifier
     ...    Test objective: The objective is to test the deletion of an individual VNF performance threshold
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -65,7 +65,7 @@ POST Individual Threshold - Method not implemented
     ...    Test title: POST Individual Threshold - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF Performance Threshold
     ...    Pre-conditions: A VNF instance is instantiated
-    ...    Reference: Clause 6.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -77,7 +77,7 @@ PUT Individual Threshold - Method not implemented
     ...    Test title: PUT Individual Threshold - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF Performance threshold
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.6.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -89,7 +89,7 @@ PATCH Individual Threshold
     ...    Test title: PATCH Individual Threshold
     ...    Test objective: The objective is to test that PATCH method allows to modify an Individual threshold resource.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -102,7 +102,7 @@ PATCH Individual Threshold - Precondition failed
     ...    Test title: PATCH Individual Threshold - Preconition failed
     ...    Test objective: The objective is to attempt to modify an individual threshold resource, where the precondition was not met.
     ...    Pre-conditions:  A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  The VNF Performance Job is not modified by the operation
diff --git a/SOL003/VNFPerformanceManagement-API/PMJobs.robot b/SOL003/VNFPerformanceManagement-API/PMJobs.robot
index 45188503d..c0772ad12 100644
--- a/SOL003/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL003/VNFPerformanceManagement-API/PMJobs.robot
@@ -14,7 +14,7 @@ GET all VNF Performance Monitoring Jobs
     ...    Test title: GET all VNF Performance Monitoring Jobs
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance monitoring jobs and perform a JSON schema and content validation of the collected jobs data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -28,7 +28,7 @@ GET VNF Performance Monitoring Jobs with attribute-based filter
     ...    Test title: GET all VNF Performance Monitoring Jobs with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of VNF performance monitoring jobs using attribute-based filter, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued attribute-based filter
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -42,7 +42,7 @@ GET all VNF Performance Monitoring Jobs with all_fields attribute selector
     ...    Test title: GET all VNF Performance Monitoring Jobs with all_fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs all_fields attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued all_fileds selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -56,7 +56,7 @@ GET all VNF Performance Monitoring Jobs with exclude_default attribute selector
     ...    Test title: GET all VNF Performance Monitoring Jobs with exclude_default attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs exclude_default attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued exclude_default selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -70,7 +70,7 @@ GET all VNF Performance Monitoring Jobs with fields attribute selector
     ...    Test title: GET all VNF Performance Monitoring Jobs with fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs fields attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued fields selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM supports the use of exclude_fields attribute selector
     ...    Post-Conditions: none
@@ -84,7 +84,7 @@ GET all VNF Performance Monitoring Jobs with exclude_fields attribute selector
     ...    Test title: GET all VNF Performance Monitoring Jobs with exclude_fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs exclude_fields attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued exclude_fields selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM supports the use of exclude_fields attribute selector
     ...    Post-Conditions: none
@@ -98,7 +98,7 @@ GET VNF Performance Monitoring Jobs with invalid attribute-based filter
     ...    Test title: GET VNF Performance Monitoring Jobs with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of VNF performance monitoring jobs fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -111,7 +111,7 @@ GET VNF Performance Monitoring Jobs with invalid resource endpoint
     ...    Test title: GET VNF Performance Monitoring Jobs with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of VNF performance monitoring jobs fails when using invalid resource endpoint
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -123,7 +123,7 @@ Create new VNF Performance Monitoring Job
     ...    Test title:  Create a new VNF Performance Monitoring Job
     ...    Test objective: The objective is to test the creation of a new VNF performance monitoring job and perform the JSON schema validation of the returned job data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Job is successfully created on the VNFM
@@ -137,7 +137,7 @@ PUT all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test title: PUT all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF Performance Monitoring Jobs
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -149,7 +149,7 @@ PATCH all VNF Performance Monitoring Jobs - (Method not implemented)
     ...    Test title: PATCH all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF Performance Monitoring Jobs
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -161,7 +161,7 @@ DELETE all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test title: DELETE all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to update VNF Performance Monitoring Jobs
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -174,7 +174,7 @@ GET all VNF Performance Monitoring Jobs as Paged Response
     ...    Test title: GET all VNF Performance Monitoring Jobs as Paged Response
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance monitoring jobs as Paged Response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -187,7 +187,7 @@ GET VNF Performance Monitoring Jobs - Bad Request Response too Big
     ...    Test title: GET VNF Performance Monitoring Jobs - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of VNF performance monitoring jobs fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -200,7 +200,7 @@ GET all VNF Performance Monitoring Jobs with fields and exclude_default attribut
     ...    Test title: GET all VNF Performance Monitoring Jobs with fields and exclude_default attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs fields and exclude_default attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued fields selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM supports the use of fields and exclude_fields attribute selector
     ...    Post-Conditions: none
diff --git a/SOL003/VNFPerformanceManagement-API/PerformanceManagementNotification.robot b/SOL003/VNFPerformanceManagement-API/PerformanceManagementNotification.robot
index 9e5392bf2..a2e02a858 100644
--- a/SOL003/VNFPerformanceManagement-API/PerformanceManagementNotification.robot
+++ b/SOL003/VNFPerformanceManagement-API/PerformanceManagementNotification.robot
@@ -17,7 +17,7 @@ VNF Performance Information Availability Notification
     ...    Test title: VNF Performance Information Availability Notification
     ...    Test objective: The objective is to test the dispatch of VNF Performance Information Availability Notification when new VNF performance information is available in the NFVO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF performance job is created, and a subscription for information availability notifications is available in the VNFM.
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -30,7 +30,7 @@ VNF Threshold Crossed Notification
     ...    Test title: VNF Threshold Crossed Notification
     ...    Test objective: The objective is to test the dispatch of VNF Threshold Crossed Notification when a previously set VNF performance metric threshold is crossed, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF performance job is created, and a threshold subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL003/VNFPerformanceManagement-API/Thresholds.robot b/SOL003/VNFPerformanceManagement-API/Thresholds.robot
index c3dc62f94..e05108b1c 100644
--- a/SOL003/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL003/VNFPerformanceManagement-API/Thresholds.robot
@@ -13,7 +13,7 @@ GET All Performance Thresholds
     ...    Test title: GET All Performance Thresholds
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance thresholds and perform a JSON schema validation of the collected thresholds data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -26,7 +26,7 @@ GET Performance Thresholds with attribute-based filter
     ...    Test title: GET Performance Thresholds with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance thresholds when using attribute-based filters, perform a JSON schema validation of the collected thresholds data structure, and verify that the retrieved information matches the issued attribute-based filter
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -40,7 +40,7 @@ GET Performance Thresholds with invalid attribute-based filter
     ...    Test title: GET Performance Thresholds with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of VNF performance thresholds fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -52,7 +52,7 @@ GET Performance Thresholds with invalid resource endpoint
     ...    Test title: GET Performance Thresholds with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of VNF performance thresholds fails when using invalid resource endpoint, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -65,7 +65,7 @@ Create new Performance Threshold
     ...    Test title:  Create new Performance Threshold
     ...    Test objective: The objective is to test the creation of a new VNF performance threshold and perform the JSON schema validation of the returned threshold data structure
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Threshold is successfully created on the VNFM
@@ -80,7 +80,7 @@ PUT Performance Thresholds - Method not implemented
     ...    Test title: PUT Performance Thresholds - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF Performance Thresholds
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNF.
-    ...    Reference: Clause 6.4.5.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.5.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -92,7 +92,7 @@ PATCH Performance Thresholds - Method not implemented
     ...    Test title: PATCH Performance Thresholds - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify VNF Performance Thresholds
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.5.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -104,7 +104,7 @@ DELETE Performance Thresholds - Method not implemented
     ...    Test title: DELETE Performance Thresholds - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to update VNF Performance Thresholds
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.5.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF performance thresholds are not deleted by the failed operation
@@ -117,7 +117,7 @@ GET All Performance Thresholds as Paged Response
     ...    Test title: GET All Performance Thresholds as Paged Response
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance thresholds as a Paged Response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -130,7 +130,7 @@ GET Performance Thresholds - Bad Request Response too Big
     ...    Test title: GET Performance Thresholds - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of VNF performance thresholds fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL003/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot b/SOL003/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
index a7a2ac66e..acdf75c4d 100644
--- a/SOL003/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
+++ b/SOL003/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
@@ -1,7 +1,5 @@
 *** Settings ***
 Resource    environment/variables.txt
-Resource    environment/subscriptions.txt
-Resource    environment/individualSubscription.txt
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 Library    MockServerLibrary 
 Library    OperatingSystem
@@ -11,311 +9,7 @@ Library    Collections
 Library    JSONSchemaLibrary    schemas/
 Library    Process    
 
-*** Keywords ***
-Get all VNF Performance Subscriptions
-    [Documentation]    The client can use this method to query the list of active subscriptions to Performance management notifications
-    ...    subscribed by the client.
-    ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    Set headers    {"Accept": "application/json"}
-    Set headers    {"Content-Type": "application/json"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    # Integer    response status    200
-    # Log    Received a 200 OK as expected
-    # ${contentType}=    Output    response headers Content-Type
-    # Should Contain    ${contentType}    application/json
-    # ${result}=    Output    response body
-    # Validate Json    PmSubscriptions.schema.json    ${result}
-    # Log    Validated PmSubscription schema
-
-
- Get VNF Performance Subscriptions with attribute-based filters
-    [Documentation]    The client can use this method to query the list of active subscriptions to Performance management notifications
-    ...    subscribed by the client.
-    ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ok}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    # Integer    response status    200
-    # Log    Received a 200 OK as expected
-    # ${contentType}=    Output    response headers Content-Type
-    # Should Contain    ${contentType}    application/json
-    # ${result}=    Output    response body
-    # Validate Json    PmSubscriptions.schema.json    ${result}
-    # Log    Validated PmSubscription schema    
-    
-
-
-Get VNF Performance Subscriptions with invalid attribute-based filters
-    [Documentation]    The client can use this method to query the list of active subscriptions to Performance management notifications
-    ...    subscribed by the client.
-    ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ko}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    # Integer    response status    400
-    # Log    Received a 400 Bad Request as expected
-    # ${contentType}=    Output    response headers Content-Type
-    # Should Contain    ${contentType}    application/json
-    # ${result}=    Output    response body
-    # Validate Json    ProblemDetails.schema.json    ${result}
-    # Log    Validated ProblemDetails schema
-    
-    
-Get VNF Performance Subscriptions with invalid resource endpoint
-    [Documentation]    The client can use this method to query the list of active subscriptions to Performance management notifications
-    ...    subscribed by the client.
-    ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscription
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    # Integer    response status    404
-    # Log    Received a 404 Not found as expected
-    # ${contentType}=    Output    response headers Content-Type
-    # Should Contain    ${contentType}    application/json
-    # ${result}=    Output    response body
-    # Validate Json    ProblemDetails.schema.json    ${result}
-    # Log    Validated ProblemDetails schema    
-
-
-
-Send Post Request for VNF Performance Subscription
-    [Documentation]    The POST method creates a new subscription.
-    ...    This method shall follow the provisions specified in the tables 6.4.7.3.1-1 and 6.4.7.3.1-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    ...    Creation of two subscription resources with the same callbackURI and the same filter can result in performance
-    ...    degradation and will provide duplicates of notifications to the NFVO, and might make sense only in very rare use cases.
-    ...    Consequently, the VNFM may either allow creating a subscription resource if another subscription resource with the
-    ...    same filter and callbackUri already exists (in which case it shall return the "201 Created" response code), or may decide
-    ...    to not create a duplicate subscription resource (in which case it shall return a "303 See Other" response code referencing
-    ...    the existing subscription resource with the same filter and callbackUri).
-    Set headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    ${body_request}=    Get File    jsons/subscriptions.json
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body_request}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    Run Keyword If    ${VNFM_CHECKS_NOTIF_ENDPOINT} == 1
-    ...       Check Notification Endpoint
-    # Integer    response status    201
-    # Log    Received a 201 Created as expected
-    # ${contentType}=    Output    response headers Content-Type
-    # Should Contain    ${contentType}    application/json
-    # ${result}=    Output    response body
-    # Validate Json    PmSubscription.schema.json    ${result}
-    # Log    Validated PmSubscription schema
-    # Log    Trying to validate the Location header
-    # ${headers}=    Output    response headers
-    # Should Contain    ${headers}    Location
-
-
-Send Post Request for Duplicated VNF Performance Subscription
-    [Documentation]    The POST method creates a new subscription.
-    ...    This method shall follow the provisions specified in the tables 6.4.7.3.1-1 and 6.4.7.3.1-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    ...    Creation of two subscription resources with the same callbackURI and the same filter can result in performance
-    ...    degradation and will provide duplicates of notifications to the NFVO, and might make sense only in very rare use cases.
-    ...    Consequently, the VNFM may either allow creating a subscription resource if another subscription resource with the
-    ...    same filter and callbackUri already exists (in which case it shall return the "201 Created" response code), or may decide
-    ...    to not create a duplicate subscription resource (in which case it shall return a "303 See Other" response code referencing
-    ...    the existing subscription resource with the same filter and callbackUri).
-    Set headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    ${body_request}=    Get File    jsons/subscriptions.json
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body_request}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}    
-    # Integer    response status    303
-    # Log    Received a 303 See other as expected
-    # ${contentType}=    Output    response headers Content-Type
-    # Should Contain    ${contentType}    application/json
-    # ${result}=    Output    response body
-    # Should Be Empty    ${result}
-    # Log    Body is empty
-    # Log    Trying to validate the Location header
-    # ${headers}=    Output    response headers
-    # Should Contain    ${headers}    Location
-    
-
-
-Send Put Request for VNF Performance Subscriptions
-    [Documentation]    This method is not supported. When this method is requested on this resource, the VNFM shall return a "405 Method
-    ...    Not Allowed" response as defined in Clause 6.4.7.3.3.
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    # Integer    response status    405
-    # Log    Received 405 Method not implemented as expected
-
-Send Patch Request for VNF Performance Subscriptions
-    [Documentation]    This method is not supported. When this method is requested on this resource, the VNFM shall return a "405 Method
-    ...    Not Allowed" response as defined in Clause 6.4.7.3.4.
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    # Integer    response status    405
-    # Log    Received 405 Method not implemented as expected
-
-Send Delete Request for VNF Performance Subscriptions
-    [Documentation]    This method is not supported. When this method is requested on this resource, the VNFM shall return a "405 Method
-    ...    Not Allowed" response as defined in Clause 6.4.7.3.5.
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    # Integer    response status    405
-    # Log    Received 405 Method not implemented as expected
-
-Get Individual VNF Performance Subscription
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-GET individual VNF Performance Subscription with invalid resource identifier
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-Send Delete request for individual VNF Performance Subscription
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-Send Delete request for individual VNF Performance Subscription with invalid resource identifier
-    Log    Trying to delete a subscription in the VNFM with invalid id
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-Send Post request for individual VNF Performance Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${newSubscriptionId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-Send Put request for individual VNF Performance Threshold
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
-    ${origOutput}=    Output    response
-    Set Suite Variable    ${origResponse}    ${origOutput}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    
-Send Patch request for individual VNF Performance Threshold
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
-    ${origOutput}=    Output    response
-    Set Suite Variable    ${origResponse}    ${origOutput}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-Check Postcondition VNF Performance Subscription is Unmodified (Implicit)
-    Log    Check postconidtion subscription not modified
-    GET individual VNF Performance Subscription
-    Log    Check Response matches original VNF Threshold
-    ${subscription}=    evaluate    json.loads('''${response['body']}''')    json
-    Should Be Equal As Strings    ${origResponse['body']['id']}    ${subscription.id}
-    Should Be Equal As Strings    ${origResponse['body']['callbackUri']}    ${subscription.callbackUri}
-
-Check Postcondition VNF Performance Subscription is not Created
-    Log    Trying to get a new subscription
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${newSubscriptionId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    Check HTTP Response Status Code Is    404 
-
-Check Postcondition VNF Performance Subscription is Deleted
-    Log    Check Postcondition Subscription is deleted
-    GET individual VNF Performance Subscription
-    Check HTTP Response Status Code Is    404 
-
-Check HTTP Response Body Subscription Identifier matches the requested Subscription
-    Log    Trying to check response ID
-    Should Be Equal As Strings   ${response['body']['id']}    ${subscriptionId} 
-    Log    Subscription identifier as expected
-    
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings    ${response['status']}    ${expected_status}
-    Log    Status code validated 
-    
-    
-    
-Check HTTP Response Body Json Schema Is
-    [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
-    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
-    Validate Json    ${schema}    ${response['body']}
-    Log    Json Schema Validation OK  
-
-
-Check HTTP Response Body Is Empty
-    Should Be Empty    ${response['body']}    
-    Log    No json schema is provided. Validation OK  
-
-
-Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filter
-    Log    Check Response includes VNF Performance Management according to filter
-    Should Be Equal As Strings    ${response['body']['callbackUri']}    ${callbackUri_Sub}
-
-Check HTTP Response Body PmSubscription Attributes Values Match the Issued Subscription
-    Log    Check Response matches subscription
-    ${body}=    Get File    jsons/subscriptions.json
-    ${subscription}=    evaluate    json.loads('''${body}''')    json
-    Should Be Equal As Strings    ${response['body']['callbackUri']}    ${subscription['callbackUri']}
-
-Check Postcondition VNF Performance Subscription Is Set
-    Log    Check Postcondition subscription exist
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${response['body']['id']}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    Check HTTP Response Status Code Is    200
-
-Check Postcondition Subscription Resource Returned in Location Header Is Available
-    Log    Going to check postcondition
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${response['headers']['Location']}
-    Integer    response status    200
-    Log    Received a 200 OK as expected
-    ${contentType}=    Output    response headers Content-Type
-    Should Contain    ${contentType}    application/json
-    ${result}=    Output    response body
-    Validate Json    PmSubscription.schema.json    ${result}
-    Log    Validated PmSubscription schema
- 
-Check Postcondition VNF Performance Subscriptions Exists
-    Log    Checking that subscriptions exists
-    Get all VNF Performance Subscriptions         
-
+*** Keywords ***       
 Check HTTP Response Header Contains
     [Arguments]    ${CONTENT_TYPE}
     Should Contain    ${response['headers']}    ${CONTENT_TYPE}
-- 
GitLab


From e7218e5730df4946c40ba119cfca7fe3116da607 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Thu, 8 Oct 2020 15:46:52 +0500
Subject: [PATCH 059/322] reference updated

---
 SOL003/VNFFaultManagement-API/Alarms.robot    | 26 +++++------
 .../VNFFaultManagement-API/ApiVersion.robot   | 20 ++++-----
 .../IndividualAlarm.robot                     | 14 +++---
 .../IndividualSubscription.robot              | 10 ++---
 .../Subscriptions.robot                       | 44 +++++++++----------
 .../NotificationEndpoint.robot                |  6 +--
 6 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/SOL003/VNFFaultManagement-API/Alarms.robot b/SOL003/VNFFaultManagement-API/Alarms.robot
index 04c5c4bfa..0ec274966 100644
--- a/SOL003/VNFFaultManagement-API/Alarms.robot
+++ b/SOL003/VNFFaultManagement-API/Alarms.robot
@@ -14,7 +14,7 @@ POST Alarms - Method not implemented
     ...    Test title: POST Alarms - Method not implemented 
     ...    Test objective: The objective is to test that Post method is not allowed to create Fault management alarms on VNF 
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -26,7 +26,7 @@ Get information about multiple alarms
     ...    Test title: Get information about multiple alarms
     ...    Test objective: The objective is to retrieve information about the alarm list and perform a JSON schema and content validation of the returned alarms data structure
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +39,7 @@ Get information about multiple alarms with filter
     ...    Test title: Get information about multiple alarms with filter
     ...    Test objective: The objective is to retrieve information about the alarm list and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions: none 
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -52,7 +52,7 @@ Get information about multiple alarms Bad Request Invalid attribute-based filter
     ...    Test title:  Get information about multiple alarms Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to try to retrieve information about the alarm list with invalid filters and perform a JSON schema and content validation of the returned problem details data structure
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -65,7 +65,7 @@ GET information about multiple alarms with "all_fields" attribute selector
     ...    Test title: GET information about multiple alarms with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -78,7 +78,7 @@ GET information about multiple alarms with exclude_default attribute selector
     ...    Test title: GET information about multiple alarms with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -91,7 +91,7 @@ GET information about multiple alarms with fields attribute selector
     ...    Test title: GET information about multiple alarms with fields attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -104,7 +104,7 @@ GET information about multiple alarms with "exclude_fields" attribute selector
     ...    Test title: GET information about multiple alarms with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: none
@@ -117,7 +117,7 @@ PUT Alarms - Method not implemented
     ...    Test title: PUT Alarms - Method not implemented 
     ...    Test objective: The objective is to test that PUT method is not allowed to for Fault management alarms on VNF 
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -129,7 +129,7 @@ PATCH Alarms - Method not implemented
     ...    Test title: PATCH Alarms - Method not implemented 
     ...    Test objective: The objective is to test that PATCH method is not allowed to for Fault management alarms on VNF 
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -141,7 +141,7 @@ DELETE Alarms - Method not implemented
     ...    Test title: POST Alarms - Method not implemented 
     ...    Test objective: The objective is to test that DELETE method is not allowed for Fault management alarms on VNF 
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -154,7 +154,7 @@ Get information about multiple alarms as a Paged Response
     ...    Test title: Get information about multiple alarms as a Paged Response
     ...    Test objective: The objective is to retrieve information about the alarm list as a Paged Response
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -167,7 +167,7 @@ Get information about multiple alarms - Bad Request Response too Big
     ...    Test title:  Get information about multiple alarms - Bad Request Response too Big
     ...    Test objective: The objective is to try to retrieve information about the alarm list because response is too big and perform a JSON schema and content validation of the returned problem details data structure
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL003/VNFFaultManagement-API/ApiVersion.robot b/SOL003/VNFFaultManagement-API/ApiVersion.robot
index a971df333..1f3796a7c 100644
--- a/SOL003/VNFFaultManagement-API/ApiVersion.robot
+++ b/SOL003/VNFFaultManagement-API/ApiVersion.robot
@@ -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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL003/VNFFaultManagement-API/IndividualAlarm.robot b/SOL003/VNFFaultManagement-API/IndividualAlarm.robot
index 1f9ce5ebf..d03e8bf23 100644
--- a/SOL003/VNFFaultManagement-API/IndividualAlarm.robot
+++ b/SOL003/VNFFaultManagement-API/IndividualAlarm.robot
@@ -16,7 +16,7 @@ POST Alarm - Method not implemented
     ...    Test title: POST Alarm - Method not implemented
     ...    Test objective: The objective is to test that Post method is not allowed to create Fault management individual alarm on VNF 
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.3.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.3.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -28,7 +28,7 @@ Get information about an fault management individual alarm
     ...    Test title: Get information about an fault management individual alarm
     ...    Test objective: The objective is to retrieve information about an individual alarm and perform a JSON schema and content validation of the returned alarm data structure
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 7.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  none 
@@ -41,7 +41,7 @@ PUT Alarm - Method not implemented
     ...    Test title: PUT Alarm - Method not implemented
     ...    Test objective: he objective is to test that PUT method is not allowed to for Fault management individual alarm on VNF 
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 7.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  none 
@@ -53,7 +53,7 @@ PATCH Fault Management Individual Alarm
     ...    Test title: PATCH Fault Management Individual Alarm
     ...    Test objective: The objective is to Modify an individual alarm resource and perform a JSON schema and content validation of the returned alarm data structure
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -67,7 +67,7 @@ Modify an individual alarm resource - Precondition failed
     ...    Test title: Modify an individual alarm resource - Precondition failed
     ...    Test objective: The objective is to test that an individual alarm resource cannot be modified if the alarm is already in the state that is requested to be set
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -81,7 +81,7 @@ Modify an individual alarm resource - Conflict
     ...    Test title: Modify an individual alarm resource - Conflict
     ...    Test objective: The objective is to test that an individual alarm resource cannot be modified if the resource was modified by another entity
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -96,7 +96,7 @@ DELETE Alarm - Method not implemented
     ...    Test title: DELETE Alarm - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to for Fault management individual alarm on VNF 
     ...    Pre-conditions: nona
-    ...    Reference: Clause 7.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  The individual alarm still exists 
diff --git a/SOL003/VNFFaultManagement-API/IndividualSubscription.robot b/SOL003/VNFFaultManagement-API/IndividualSubscription.robot
index 06cbdbfe7..7f2c9bdb3 100644
--- a/SOL003/VNFFaultManagement-API/IndividualSubscription.robot
+++ b/SOL003/VNFFaultManagement-API/IndividualSubscription.robot
@@ -11,7 +11,7 @@ Post Individual Subscription - Method not implemented
     ...    Test title: Post Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed for Fault management subscription on VNF  
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions:  subscription is not created
@@ -23,7 +23,7 @@ Get Information about an individual subscription
     ...    Test title: Get Information about an individual subscription
     ...    Test objective: The objective is to read an individual subscription for NFVO alarms subscribed by the client and perform a JSON schema and content validation of the returned fault management individual subscription data structure
     ...    Pre-conditions: The subscription with the given id exists
-    ...   Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...   Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:   none
     ...    Post-Conditions:  none
@@ -36,7 +36,7 @@ PUT an individual subscription - Method not implemented
     ...    Test title:PUT an individual subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed for Fault management individual subscription on VNF  
     ...    Pre-conditions:  none
-    ...    Reference: Clause 7.4.5.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.5.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions:  none
@@ -48,7 +48,7 @@ PATCH an individual subscription - Method not implemented
     ...    Test title:PATCH an individual subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed for Fault management individual subscription on VNF  
     ...    Pre-conditions:  none
-    ...    Reference: Clause 7.4.5.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.5.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions:  none
@@ -60,7 +60,7 @@ DELETE an individual subscription
     ...    Test title:DELETE an individual subscription
     ...    Test objective: The objective is to test that DELETE method removes individual subscription on VNF   
     ...    Pre-conditions: The Subsbcription already exists
-    ...    Reference: Clause 7.4.5.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.5.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions:  subscription is not deleted
diff --git a/SOL003/VNFFaultManagement-API/Subscriptions.robot b/SOL003/VNFFaultManagement-API/Subscriptions.robot
index f9dae5efd..43050be17 100644
--- a/SOL003/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL003/VNFFaultManagement-API/Subscriptions.robot
@@ -13,7 +13,7 @@ Create a new Fault Management alarm subscription
     ...    Test title: Create a new Fault Management alarm subscription
     ...    Test objective: The objective is to create a new Fault management alarm subscriptions and perform a JSON schema and content validation of the returned fault management alarms subscription data structure
     ...    Pre-conditions: No subscription with the same filter and callbackUri exists
-    ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID:   Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: subscription is created
@@ -29,7 +29,7 @@ Create a new alarm subscription - DUPLICATION
     ...    Test title: Create a new alarm subscription - DUPLICATION
     ...    Test objective: The objective is to create a new subscription with the VNF allowing duplication and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: subscription with the same filter and callbackUri exists
-    ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID:   Config_prod_VNFM
     ...    Applicability: the NFVO allows creating a subscription resource if another subscription resource with the same filter and callbackUri already exists
     ...    Post-Conditions: duplicated subscription is created
@@ -44,7 +44,7 @@ Create a new alarm subscription - NO DUPLICATION
     ...    Test title: Create a new alarm subscription - NO DUPLICATION
     ...    Test objective: The objective is to create a new subscription with the VNF not allowing duplication and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: subscription with the same filter and callbackUri exists
-    ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID:   Config_prod_VNFM
     ...    Applicability: the NFVO decides to not create a duplicate subscription resource 
     ...    Post-Conditions: duplicated subscription is not created
@@ -58,7 +58,7 @@ Retrieve a list of alarm subscriptions
     ...    Test title: Retrieve a list of alarm subscriptions
     ...    Test objective: The objective is to retrieve the list of active subscriptions and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID:   Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: noe
@@ -71,7 +71,7 @@ Retrieve a list of alarm subscriptions with filter
     ...    Test title: Retrieve a list of alarm subscriptions with filter
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: none 
-    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID:   Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -84,7 +84,7 @@ GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test title: GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to retrieve the list of active subscriptions with Invalid attribute-based filtering parameters and perform a JSON schema and content validation of the returned problem details data structure.
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID:   Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions:    none 
@@ -97,7 +97,7 @@ GET subscriptions with "all_fields" attribute selector
     ...    Test title: GET subscriptions with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -110,7 +110,7 @@ GET subscriptions with "exclude_default" attribute selector
     ...    Test title: GET subscriptions with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -123,7 +123,7 @@ GET subscriptions with "fields" attribute selector
     ...    Test title: GET subscriptions with "fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -136,7 +136,7 @@ GET subscriptions with "exclude_fields" attribute selector
     ...    Test title: GET subscriptions with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -149,7 +149,7 @@ PUT subscriptions - Method not implemented
     ...    Test title:PUT subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to for Fault management subscriptions on VNF 
     ...    Pre-conditions: none
-    ...    RReference: Clause 7.4.4.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    RReference: Clause 7.4.4.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID:  Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -161,7 +161,7 @@ PATCH subscriptions - Method not implemented
     ...    Test title: PATCH subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to for Fault management subscriptions on VNF  
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.4.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.4.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID:  Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -173,7 +173,7 @@ DELETE subscriptions - Method not implemented
     ...    Test title: DELETE subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to for Fault management subscriptions on VNF  
     ...    Pre-conditions: none 
-    ...    Reference: Clause 7.4.4.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.4.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID:  Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: subscription is not deleted
@@ -185,7 +185,7 @@ Retrieve a list of alarm subscriptions as Paged Response
     ...    Test title: Retrieve a list of alarm subscriptions as Paged Response
     ...    Test objective: The objective is to retrieve the list of active subscriptions as Paged Response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID:   Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: noe
@@ -198,7 +198,7 @@ GET subscriptions - Bad Request Response too Big
     ...    Test title: GET subscriptions - Bad Request Response too Big
     ...    Test objective: The objective is to retrieve the list of active subscriptions because response is too big and perform a JSON schema and content validation of the returned problem details data structure.
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID:   Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions:    none 
@@ -211,7 +211,7 @@ GET Subscription with attribute-based filter "id"
     ...    Test title: GET Subscription with attribute-based filter "id"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "id"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -225,7 +225,7 @@ Get subscriptions with filter "filter.notificationTypes"
     ...    Test title: GET Subscription with attribute-based filter "filter.notificationTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.notificationTypes"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -239,7 +239,7 @@ Get subscriptions with filter "filter.faultyResourceTypes"
     ...    Test title: GET Subscription with attribute-based filter "filter.faultyResourceTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.faultyResourceTypes"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -253,7 +253,7 @@ Get subscriptions with filter "filter.perceivedSeverities"
     ...    Test title: GET Subscription with attribute-based filter "filter.perceivedSeverities"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.perceivedSeverities"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -267,7 +267,7 @@ Get subscriptions with filter "filter.eventTypes"
     ...    Test title: GET Subscription with attribute-based filter "filter.eventTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.eventTypes"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -281,7 +281,7 @@ Get subscriptions with filter "filter.probableCauses"
     ...    Test title: GET Subscription with attribute-based filter "filter.probableCauses"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.probableCauses"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -295,7 +295,7 @@ POST Create a new Subscription - Unprocessable Entity
     ...    Test title: POST Create a new Subscription - Unprocessable Entity
     ...    Test objective: The objective is to test that content type of the payload body is supported and the payload body of a request contains syntactically correct data but the data cannot be processed.
     ...    re-conditions: none
-    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot b/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot
index 95a357d1e..78e8209e1 100644
--- a/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot
+++ b/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot
@@ -15,7 +15,7 @@ VNF Fault Alarm Notification
     ...    Test title: VNF Fault Alarm Notification
     ...    Test objective: The objective is to test the dispatch of VNF Fault Alarm Notification when a virtualised resource within an VNF instance fails, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm notifications is available in the VNFM.
-    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -28,7 +28,7 @@ VNF Fault Alarm Cleared Notification
     ...    Test title: VNF Fault Alarm Cleared Notification
     ...    Test objective: The objective is to test the dispatch of VNF Fault Alarm Cleared Notification when a faulty virtualised resource within an VNF instance is cleared, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF instance is instantiated, a virtualised resource is in faulty state, and a subscription for fault alarm cleared notifications is available in the VNFM.
-    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -41,7 +41,7 @@ VNF Fault Alarm List Rebuilt Notification
     ...    Test title: VNF Fault Alarm List Rebuilt Notification 
     ...    Test objective: The objective is to test the dispatch of VNF Fault Alarm List Rebuilt Notification when the VNFM decides to rebuild the list of its VNF alarms, e.g. due to a corruption in the alarm storage, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF instance is instantiated, one or more virtualised resource are in faulty state, and a subscription for fault alarm list rebuilt notifications is available in the VNFM.
-    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-- 
GitLab


From 871e9680ec68f6e7372a518c0f85ae1fa2095df6 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Thu, 8 Oct 2020 16:11:45 +0500
Subject: [PATCH 060/322] templating, minor fix and new testcases added

---
 SOL003/VNFFaultManagement-API/Alarms.robot    | 26 +++++++++----------
 .../FaultManagement-APIKeyword.robot          | 24 ++++++++---------
 .../IndividualAlarm.robot                     | 24 ++++++++++++-----
 .../IndividualSubscription.robot              | 15 ++++++++++-
 .../Subscriptions.robot                       |  3 +--
 .../environment/variables.txt                 |  9 ++++---
 .../jsons/fmSubscriptionRequest.json          | 16 ++++++------
 7 files changed, 69 insertions(+), 48 deletions(-)

diff --git a/SOL003/VNFFaultManagement-API/Alarms.robot b/SOL003/VNFFaultManagement-API/Alarms.robot
index 0ec274966..69001f407 100644
--- a/SOL003/VNFFaultManagement-API/Alarms.robot
+++ b/SOL003/VNFFaultManagement-API/Alarms.robot
@@ -7,7 +7,6 @@ Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 Library    OperatingSystem
 
-
 *** Test Cases ***
 POST Alarms - Method not implemented
      [Documentation]    Test ID: 7.3.5.1.1
@@ -64,11 +63,11 @@ GET information about multiple alarms with "all_fields" attribute selector
     [Documentation]    Test ID: 7.3.5.1.5
     ...    Test title: GET information about multiple alarms with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Alarms Task with all_fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    alarms
@@ -77,11 +76,11 @@ GET information about multiple alarms with exclude_default attribute selector
     [Documentation]    Test ID: 7.3.5.1.6
     ...    Test title: GET information about multiple alarms with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Alarms Task with exclude_default attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    alarms
@@ -90,11 +89,11 @@ GET information about multiple alarms with fields attribute selector
     [Documentation]    Test ID: 7.3.5.1.7
     ...    Test title: GET information about multiple alarms with fields attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none 
     ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Alarms Task with fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    alarms
@@ -103,10 +102,10 @@ GET information about multiple alarms with "exclude_fields" attribute selector
     [Documentation]    Test ID: 7.3.5.1.8
     ...    Test title: GET information about multiple alarms with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none 
     ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: none
     GET Alarms Task with exclude_fields attribute selector
     Check HTTP Response Status Code Is    200
@@ -147,7 +146,6 @@ DELETE Alarms - Method not implemented
     ...    Post-Conditions:  none
     DELETE Fault management Alarms
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF fault management alarms Exists
     
 Get information about multiple alarms as a Paged Response
     [Documentation]    Test ID: 7.3.5.1.12
@@ -160,7 +158,7 @@ Get information about multiple alarms as a Paged Response
     ...    Post-Conditions: none
     GET Fault Management Alarms
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contain Link
     
 Get information about multiple alarms - Bad Request Response too Big
     [Documentation]    Test ID: 7.3.5.1.13
diff --git a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
index 4f18fe173..077fe2c6f 100644
--- a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
+++ b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
@@ -1,5 +1,6 @@
 *** Settings ***
-Resource    environment/variables.txt
+Library    String
+Resource   environment/variables.txt
 Library    REST     ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
@@ -27,13 +28,8 @@ Check Postcondition FaultManagement Subscription Is Set
 Check Operation Occurrence Id
     ${opOccId}=    Get Value From Json    ${response['headers']}    $..Location
     Should Not Be Empty    ${opOccId}
-Check Postcondition VNF fault management alarms Exists
-    Log    Checking that alarms exists
-    GET Fault Management Alarms
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    Alarms
 
-Check Postcondition VNF fault management individual alarm Exists
+Check Precondition VNF fault management individual alarm Exists
     Log    Checking that individual alarm exists
     GET Fault Management Individual Alarm
     Check HTTP Response Status Code Is    200
@@ -253,14 +249,14 @@ PATCH Fault Management Individual Alarm Conflict
     Patch    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}    ${body}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
-    
-    
+       
 POST Subscription
     Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/fmSubscriptionRequest.json
+    ${template}=    Get File    jsons/fmSubscriptionRequest.json
+    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}      callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -271,7 +267,8 @@ Send POST Request for duplicated subscription
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/fmSubscriptionRequest.json
+    ${template}=    Get File    jsons/fmSubscriptionRequest.json
+    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -282,7 +279,8 @@ Send POST Request for duplicated subscription not permitted
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/fmSubscriptionRequest.json
+    ${template}=    Get File    jsons/fmSubscriptionRequest.json
+    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -402,7 +400,7 @@ DELETE Individual Subscription
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
-Check LINK in Header
+Check HTTP Response Header Contain Link
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
     
diff --git a/SOL003/VNFFaultManagement-API/IndividualAlarm.robot b/SOL003/VNFFaultManagement-API/IndividualAlarm.robot
index d03e8bf23..bb3b81d10 100644
--- a/SOL003/VNFFaultManagement-API/IndividualAlarm.robot
+++ b/SOL003/VNFFaultManagement-API/IndividualAlarm.robot
@@ -8,8 +8,6 @@ Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 Library    DependencyLibrary
 
-
-
 *** Test Cases ***
 POST Alarm - Method not implemented
      [Documentation]    Test ID: 7.3.5.2.1
@@ -57,7 +55,7 @@ PATCH Fault Management Individual Alarm
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    Check Postcondition VNF fault management individual alarm Exists
+    Check Precondition VNF fault management individual alarm Exists
     PATCH Fault Management Individual Alarm
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is  alarmModification
@@ -71,7 +69,7 @@ Modify an individual alarm resource - Precondition failed
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    Check Postcondition VNF fault management individual alarm Exists  
+    Check Precondition VNF fault management individual alarm Exists  
     PATCH Fault Management Individual Alarm - precondition failed
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is  ProblemDetails
@@ -86,7 +84,7 @@ Modify an individual alarm resource - Conflict
     ...    Applicability: none
     ...    Post-Conditions: none
     Depends On Test    PATCH Fault Management Individual Alarm
-    Check Postcondition VNF fault management individual alarm Exists
+    Check Precondition VNF fault management individual alarm Exists
     PATCH Fault Management Individual Alarm Conflict
     Check HTTP Response Status Code Is    412
     Check HTTP Response Body Json Schema Is     ProblemDetails
@@ -99,7 +97,19 @@ DELETE Alarm - Method not implemented
     ...    Reference: Clause 7.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions:  The individual alarm still exists 
+    ...    Post-Conditions:  none
     DELETE Fault Management Individual Alarm
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF fault management individual alarm Exists
\ No newline at end of file
+    
+Get information about an fault management individual alarm - Not Found
+    [Documentation]    Test ID: 7.3.5.2.8
+    ...    Test title: Get information about an fault management individual alarm - Not Found
+    ...    Test objective: The objective is to test that retrieval of information about an individual alarm fails when individual alarm is not present
+    ...    Pre-conditions: The related alarm does not exists
+    ...    Reference: Clause 7.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions:  none 
+    GET Fault Management Individual Alarm
+    Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
\ No newline at end of file
diff --git a/SOL003/VNFFaultManagement-API/IndividualSubscription.robot b/SOL003/VNFFaultManagement-API/IndividualSubscription.robot
index 7f2c9bdb3..6ff137758 100644
--- a/SOL003/VNFFaultManagement-API/IndividualSubscription.robot
+++ b/SOL003/VNFFaultManagement-API/IndividualSubscription.robot
@@ -14,7 +14,7 @@ Post Individual Subscription - Method not implemented
     ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
-    ...    Post-Conditions:  subscription is not created
+    ...    Post-Conditions:  none
     POST Individual Subscription
     Check HTTP Response Status Code Is    405
 
@@ -67,3 +67,16 @@ DELETE an individual subscription
     DELETE Individual Subscription
     Check HTTP Response Status Code Is    204
     Check Individual Subscription deleted
+
+Get Information about an individual subscription - Not Found
+    [Documentation]    Test ID: 7.3.5.4.6
+    ...    Test title: Get Information about an individual subscription - Not Found
+    ...    Test objective: The objective is to test that the retrieval of an individual subscription for NFVO alarms subscribed by the client fails when subscription is not present
+    ...    Pre-conditions: The subscription with the given id does not exists
+    ...   Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability:   none
+    ...    Post-Conditions:  none
+    GET Individual Subscription
+    Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
\ No newline at end of file
diff --git a/SOL003/VNFFaultManagement-API/Subscriptions.robot b/SOL003/VNFFaultManagement-API/Subscriptions.robot
index 43050be17..6a98f35f8 100644
--- a/SOL003/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL003/VNFFaultManagement-API/Subscriptions.robot
@@ -23,7 +23,6 @@ Create a new Fault Management alarm subscription
     Check HTTP Response Body Json Schema Is  FmSubscription
     Check created Subscription existence 
   
-
 Create a new alarm subscription - DUPLICATION
      [Documentation]    Test ID: 7.3.5.3.2
     ...    Test title: Create a new alarm subscription - DUPLICATION
@@ -191,7 +190,7 @@ Retrieve a list of alarm subscriptions as Paged Response
     ...    Post-Conditions: noe
     GET Subscriptions
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contain Link
     
 GET subscriptions - Bad Request Response too Big
     [Documentation]    Test ID: 7.3.5.3.15
diff --git a/SOL003/VNFFaultManagement-API/environment/variables.txt b/SOL003/VNFFaultManagement-API/environment/variables.txt
index e28a2d096..14ec6985d 100644
--- a/SOL003/VNFFaultManagement-API/environment/variables.txt
+++ b/SOL003/VNFFaultManagement-API/environment/variables.txt
@@ -46,9 +46,12 @@ ${response}    {}
 ${req_mock}    {}
 ${resp_mock}    {}
 
-${alarm_filter}       nsInstanceId
 ${nsInstanceId}    007c111c-38a1-42c0-a666-7475ecb1567c
-${invalid_alarm_filter}    badFilter 
 ${invalidAlarmId}    invalidIdAlarm
 
-${fields}         criteria,objectInstanceIds
\ No newline at end of file
+${fields}         criteria,objectInstanceIds
+
+${callback_uri}  http://127.0.0.1
+${callback_endpoint}    /subscribe
+
+${vnfdIds}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
\ No newline at end of file
diff --git a/SOL003/VNFFaultManagement-API/jsons/fmSubscriptionRequest.json b/SOL003/VNFFaultManagement-API/jsons/fmSubscriptionRequest.json
index e44916f8d..b28685555 100644
--- a/SOL003/VNFFaultManagement-API/jsons/fmSubscriptionRequest.json
+++ b/SOL003/VNFFaultManagement-API/jsons/fmSubscriptionRequest.json
@@ -1,10 +1,10 @@
-{
-  "filter": {
-    "vnfInstanceSubscriptionFilter": {
+{{
+  "filter": {{
+    "vnfInstanceSubscriptionFilter": {{
       "vnfdIds": [
-        "6fc3539c-e602-4afa-8e13-962fb5a7d81f"
+        "{vnfdIds}"
       ]
-    }
-  },
-  "callbackUri": "http://127.0.0.1/subscribe"
-}
\ No newline at end of file
+    }}
+  }},
+  "callbackUri": "{callback_uri}{callback_endpoint}"
+}}
\ No newline at end of file
-- 
GitLab


From 26fefaf4f70cbf5b0a925b4034340d25fb7bce08 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Fri, 9 Oct 2020 10:54:23 +0500
Subject: [PATCH 061/322] refernce updated

---
 SOL003/VNFIndicator-API/ApiVersion.robot      | 20 +++++++-------
 .../IndividualSubscription.robot              | 14 +++++-----
 .../IndividualVNFindicator.robot              | 14 +++++-----
 SOL003/VNFIndicator-API/Subscriptions.robot   | 26 +++++++++----------
 SOL003/VNFIndicator-API/VNFIndicators.robot   | 26 +++++++++----------
 .../VnfIndicatorNotification.robot            |  2 +-
 .../VnfIndicatorsInVnfInstanceId.robot        | 20 +++++++-------
 7 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/SOL003/VNFIndicator-API/ApiVersion.robot b/SOL003/VNFIndicator-API/ApiVersion.robot
index 86dbd9074..856e31ed0 100644
--- a/SOL003/VNFIndicator-API/ApiVersion.robot
+++ b/SOL003/VNFIndicator-API/ApiVersion.robot
@@ -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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL003/VNFIndicator-API/IndividualSubscription.robot b/SOL003/VNFIndicator-API/IndividualSubscription.robot
index 161a48b87..0f83d27b3 100644
--- a/SOL003/VNFIndicator-API/IndividualSubscription.robot
+++ b/SOL003/VNFIndicator-API/IndividualSubscription.robot
@@ -12,7 +12,7 @@ GET Individual VNF Indicator Subscription
     ...    Test title: GET Individual VNF Indicator Subscription
     ...    Test objective: The objective is to test the retrieval of individual VNF indicator subscription and perform a JSON schema validation of the returned subscription data structure
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: Clause 8.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ GET Individual VNF Indicator Subscription with invalid resource identifier
     ...    Test title: GET Individual VNF Indicator Subscription with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of individual VNF indicator subscription fails when using an invalid resource identifier.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: Clause 8.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -37,7 +37,7 @@ DELETE Individual VNF Indicator Subscription
     ...    Test title: DELETE Individual VNF Indicator Subscription
     ...    Test objective: The objective is to test the deletion of an individual VNF indicator subscription.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: Clause 8.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The subscription to VNF indicators is deleted
@@ -50,7 +50,7 @@ DELETE Individual VNF Indicator Subscription with invalid resource identifier
     ...    Test title: DELETE Individual VNF Indicator Subscription with invalid resource identifier
     ...    Test objective: The objective is to test that the deletion of an individual VNF indicator subscription fails when using an invalid resource identifier.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: Clause 8.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -62,7 +62,7 @@ PUT Individual VNF Indicator Subscription - Method not implemented
     ...    Test title: PUT Individual VNF Indicator Subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an individual VNF indicator subscription
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: Clause 8.4.6.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.6.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The individual VNF indicator subscription is not modified by the operation
@@ -75,7 +75,7 @@ PATCH Individual VNF Indicator Subscription - Method not implemented
     ...    Test title: PATCH Individual VNF Indicator Subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update an individual VNF indicator subscription
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: Clause 8.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The individual VNF indicator subscription is not modified by the operation
@@ -88,7 +88,7 @@ POST Individual VNF Indicator Subscription - Method not implemented
     ...    Test title: POST Individual VNF Indicator Subscription - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF indicator subscription
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The individual VNF indicator subscription is not created by the operation
diff --git a/SOL003/VNFIndicator-API/IndividualVNFindicator.robot b/SOL003/VNFIndicator-API/IndividualVNFindicator.robot
index c88c89903..be201072a 100644
--- a/SOL003/VNFIndicator-API/IndividualVNFindicator.robot
+++ b/SOL003/VNFIndicator-API/IndividualVNFindicator.robot
@@ -11,7 +11,7 @@ Get Individual Indicator for VNF Instance
     ...    Test title: Get Individual Indicator for VNF Instance
     ...    Test objective: The objective is to test the retrieval of an indicator for a given VNF instance and perform a JSON schema validation of the returned indicator data structure
     ...    Pre-conditions: A VNF instance is instantiated. At least one measure of VNF indicator is available in the VNFM.
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -26,7 +26,7 @@ Get Individual Indicator for VNF Instance with invalid indicator identifier
     ...    Test title: Get Individual Indicator for VNF Instance with invalid indicator identifier
     ...    Test objective: The objective is to test that the retrieval of an indicator for a given VNF instance fails when using an invalid resource identifier. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. At least one measure of VNF indicator is available in the VNFM.
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -38,7 +38,7 @@ POST Individual VNF Indicator for VNF Instance - Method not implemented
     ...    Test title: POST Individual VNF Indicator for VNF Instance - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF indicator in the VNFM
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ PUT Individual VNF Indicator for VNF Instance - Method not implemented
     ...    Test title: PUT Individual VNF Indicator for VNF Instance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an existing indicator for a VNF instance
     ...    Pre-conditions: A VNF instance is instantiated. At least one measure of VNF indicator is available in the VNFM
-    ...    Reference: Clause 8.4.4.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.4.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -62,7 +62,7 @@ PATCH Individual VNF Indicator for VNF Instance - Method not implemented
     ...    Test title: PATCH Individual VNF Indicator for VNF Instance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update an existing indicator for a VNF instance
     ...    Pre-conditions: A VNF instance is instantiated. At least one measure of VNF indicator is available for the given VNF instance.
-    ...    Reference: Clause 8.4.4.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.4.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -74,10 +74,10 @@ DELETE Individual VNF Indicator for VNF Instance - Method not implemented
     ...    Test title: DELETE Individual VNF Indicator for VNF Instance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing indicator for a VNF instance
     ...    Pre-conditions: A VNF instance is instantiated. At least one measure of VNF indicator is available in the VNFM
-    ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: The individual indicator for the VNF instance is not deleted by the unsuccessful operation
+    ...    Post-Conditions: The individual indicator for the VNF instance is not deleted by the unsuccessful operations
     Send DELETE Request for individual indicator in VNF instance
     Check HTTP Response Status Code Is    405
     Check Postcondition Indicator for VNF instance Exist
\ No newline at end of file
diff --git a/SOL003/VNFIndicator-API/Subscriptions.robot b/SOL003/VNFIndicator-API/Subscriptions.robot
index 628e3a19a..251334e2b 100644
--- a/SOL003/VNFIndicator-API/Subscriptions.robot
+++ b/SOL003/VNFIndicator-API/Subscriptions.robot
@@ -17,7 +17,7 @@ GET All VNF Indicator Subscriptions
     ...    Test title: GET All VNF Indicator Subscriptions
     ...    Test objective: The objective is to test the retrieval of all VNF indicator subscriptions and perform a JSON schema validation of the returned subscriptions data structure
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none        
@@ -30,7 +30,7 @@ GET VNF Indicator Subscriptions with attribute-based filter
     ...    Test title: GET VNF Indicator Subscriptions with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of VNF indicator subscriptions using attribute-based filter, perform a JSON schema validation of the collected indicators data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -44,7 +44,7 @@ GET VNF Indicator Subscriptions with invalid attribute-based filter
     ...    Test title: GET VNF Indicator Subscriptions with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of VNF indicator subscriptions fails when using invalid attribute-based filters, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -57,7 +57,7 @@ GET VNF Indicator Subscriptions with invalid resource endpoint
     ...    Test title: GET VNF Indicator Subscriptions with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of all VNF indicator subscriptions fails when using invalid resource endpoint.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -69,7 +69,7 @@ Create new VNF indicator subscription
     ...    Test title: Create new VNF indicator subscription
     ...    Test objective: The objective is to test the creation of a new VNF indicator subscription and perform a JSON schema and content validation of the returned subscription data structure
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF indicator subscription is successfully set and it matches the issued subscription   
@@ -85,7 +85,7 @@ Create duplicated VNF indicator subscription with VNFM not creating duplicated s
     ...    Test title: Create duplicated VNF indicator subscription with VNFM not creating duplicated subscriptions
     ...    Test objective: The objective is to test the attempt of a creation of a duplicated VNF indicator subscription and check that no new subscription is created by the VNFM and a link to the original subscription is returned
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM does not support the creation of duplicated subscriptions
     ...    Post-Conditions: The existing VNF indicator subscription returned is available in the VNFM
@@ -101,7 +101,7 @@ Create duplicated VNF indicator subscription with VNFM creating duplicated subsc
     ...    Test title: Create duplicated VNF indicator subscription with VNFM creating duplicated subscriptions
     ...    Test objective: The objective is to test the creation of a duplicated VNF indicator subscription and perform a JSON schema and content validation of the returned duplicated subscription data structure
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM supports the creation of duplicated subscriptions
     ...    Post-Conditions: The duplicated VNF indicator subscription is successfully set and it matches the issued subscription
@@ -116,7 +116,7 @@ PUT VNF Indicator Subscriptions - Method not implemented
     ...    Test title: PUT VNF Indicator Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF indicator subscriptions
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: Clause 8.4.5.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.5.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -128,7 +128,7 @@ PATCH VNF Indicator Subscriptions - Method not implemented
     ...    Test title: PATCH VNF Indicator Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF indicator subscriptions
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: Clause 8.4.5.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.5.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -140,7 +140,7 @@ DELETE VNF Indicator Subscriptions - Method not implemented
     ...    Test title: DELETE VNF Indicator Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete VNF indicators subscriptions
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: Clause 8.4.5.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.5.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF indicator subscriptions are not deleted by the failed operation   
@@ -153,7 +153,7 @@ GET All VNF Indicator Subscriptions as Paged Response
     ...    Test title: GET All VNF Indicator Subscriptions as Paged Response
     ...    Test objective: The objective is to test the retrieval of all VNF indicator subscriptions as Paged Response.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none        
@@ -166,7 +166,7 @@ GET VNF Indicator Subscriptions - Bad Request Response too Big
     ...    Test title: GET VNF Indicator Subscriptions - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of VNF indicator subscriptions fails because reponse is too big, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -179,7 +179,7 @@ POST Create a new Subscription - Unprocessable Entity
     ...    Test title: POST Create a new Subscription - Unprocessable Entity
     ...    Test objective: The objective is to test that content type of the payload body is supported and the payload body of a request contains syntactically correct data but the data cannot be processed.
     ...    re-conditions: none
-    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL003/VNFIndicator-API/VNFIndicators.robot b/SOL003/VNFIndicator-API/VNFIndicators.robot
index b215736ac..ca591ab98 100644
--- a/SOL003/VNFIndicator-API/VNFIndicators.robot
+++ b/SOL003/VNFIndicator-API/VNFIndicators.robot
@@ -12,7 +12,7 @@ Get all VNF Indicators
     ...    Test title: Get all VNF Indicators
     ...    Test objective: The objective is to test the retrieval of all the available VNF indicators and perform a JSON schema validation of the collected indicators data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ Get VNF Indicators with attribute-based filter
     ...    Test title: Get VNF Indicators with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of VNF indicators using attribute-based filter, perform a JSON schema validation of the collected indicators data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +39,7 @@ Get VNF Indicators with invalid attribute-based filter
     ...    Test title: Get VNF Indicators with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of VNF indicators fails when using invalid attribute-based filters, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -52,7 +52,7 @@ Get all VNF Indicators with malformed authorization token
     ...    Test title: Get all VNF Indicators with malformed authorization token
     ...    Test objective: The objective is to test that the retrieval of VNF indicators fails when using malformed authorization token
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ Get all VNF Indicators without authorization token
     ...    Test title: Get all VNF Indicators without authorization token
     ...    Test objective: The objective is to test that the retrieval of VNF indicators fails when omitting the authorization token
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNF requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -76,7 +76,7 @@ GET all VNF Indicators with expired or revoked authorization token
     ...    Test title: GET all VNF Indicators with expired or revoked authorization token
     ...    Test objective: The objective is to test that the retrieval of VNF indicators fails when using expired or revoked authorization token
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNF requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -88,7 +88,7 @@ Get all VNF Indicators with invalid resource endpoint
     ...    Test title: Get all VNF Indicators with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of VNF indicators fails when using invalid resource endpoint
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -100,7 +100,7 @@ POST all VNF Indicators - Method not implemented
     ...    Test title: POST all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new VNF indicators
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM
-    ...    Reference: Clause 8.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -112,7 +112,7 @@ PUT all VNF Indicators - Method not implemented
     ...    Test title: PUT all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF indicators
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM
-    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -124,7 +124,7 @@ PATCH all VNF Indicators - Method not implemented
     ...    Test title: PATCH all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF indicators
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNF
-    ...    Reference: Clause 8.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -136,7 +136,7 @@ DELETE all VNF Indicators - Method not implemented
     ...    Test title: DELETE all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete VNF indicators
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNF
-    ...    Reference: Clause 8.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF indicators are not deleted by the unsuccessful operation
@@ -149,7 +149,7 @@ Get all VNF Indicators as Paged Response
     ...    Test title: Get all VNF Indicators as Paged Response
     ...    Test objective: The objective is to test the retrieval of all the available VNF indicators as Paged Response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -162,7 +162,7 @@ Get VNF Indicators - Bad Request Response too Big
     ...    Test title: Get VNF Indicators - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of VNF indicators fails because reponse is too big, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL003/VNFIndicator-API/VnfIndicatorNotification.robot b/SOL003/VNFIndicator-API/VnfIndicatorNotification.robot
index 057e7f1ef..79cd22af0 100644
--- a/SOL003/VNFIndicator-API/VnfIndicatorNotification.robot
+++ b/SOL003/VNFIndicator-API/VnfIndicatorNotification.robot
@@ -16,7 +16,7 @@ VNF Indicator Value Change Notification
     ...    Test title: VNF Indicator Value Change Notification
     ...    Test objective: The objective is to test the dispatch of VNF Indicator Value Change Notification when new indicator values are available in the VNFM, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF is instantiated, and a subscription for indicator value change notifications is available in the VNFM.
-    ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL003/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot b/SOL003/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
index a160eff47..2e6afb7c7 100644
--- a/SOL003/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
+++ b/SOL003/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
@@ -12,7 +12,7 @@ Get Indicators for VNF Instance
     ...    Test title: Get Indicators for VNF Instance
     ...    Test objective: The objective is to test the retrieval of all indicators for a given VNF instance and perform a JSON schema validation of the returned indicators data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -26,7 +26,7 @@ GET Indicators for VNF Instance with attribute-based filter
     ...    Test title: GET Indicators for VNF Instance with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of all indicators for a given VNF instance using attribute-based filter and perform a JSON schema validation of the returned indicators data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -40,7 +40,7 @@ Get Indicators for VNF Instance with invalid attribute-based filter
     ...    Test title: Get Indicators for VNF Instance with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of all indicators for a given VNF instance fails using invalid attribute-based filter. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -53,7 +53,7 @@ Get Indicators for VNF Instance with invalid resource identifier
     ...    Test title: Get Indicators for VNF Instance with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of all indicators for a given VNF instance fails when using invalid resource identifier. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -66,7 +66,7 @@ POST Indicators for VNF instance - Method not implemented
     ...    Test title: POST Indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new indicators for a VNF instance
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 8.4.3.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.3.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -78,7 +78,7 @@ PUT Indicators for VNF instance - Method not implemented
     ...    Test title: PUT Indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify existing indicators for a VNF instance
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -90,7 +90,7 @@ PATCH Indicators for VNF instance - Method not implemented
     ...    Test title: PATCH Indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update existing indicators for a VNF instance
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -102,7 +102,7 @@ DELETE Indicators for VNF instance - Method not implemented
     ...    Test title: DELETE Indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete indicators for a VNF instance
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The indicators for the VNF instance are not deleted by the unsuccessful operation
@@ -115,7 +115,7 @@ Get Indicators for VNF Instance as Paged Response
     ...    Test title: Get Indicators for VNF Instance as Paged Response
     ...    Test objective: The objective is to test the retrieval of all indicators for a given VNF instance as Paged Response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -128,7 +128,7 @@ Get Indicators for VNF Instance - Bad Request Response too Big
     ...    Test title: Get Indicators for VNF Instance - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of all indicators for a given VNF instance fails because response is too big. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-- 
GitLab


From de33b652db5ee93d39eb444293efc480bcdd9190 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Fri, 9 Oct 2020 11:37:07 +0500
Subject: [PATCH 062/322] templating, minor fix and new testcases added

---
 .../IndividualSubscription.robot              | 12 +++----
 .../IndividualVNFindicator.robot              |  6 ++--
 SOL003/VNFIndicator-API/Subscriptions.robot   |  5 ++-
 SOL003/VNFIndicator-API/VNFIndicators.robot   |  2 +-
 .../VNFIndicatorsKeywords.robot               | 34 ++++---------------
 .../VnfIndicatorsInVnfInstanceId.robot        |  5 ++-
 .../environment/variables.txt                 |  5 ++-
 .../VNFIndicator-API/jsons/subscriptions.json |  6 ++--
 8 files changed, 26 insertions(+), 49 deletions(-)

diff --git a/SOL003/VNFIndicator-API/IndividualSubscription.robot b/SOL003/VNFIndicator-API/IndividualSubscription.robot
index 0f83d27b3..839ed3e9c 100644
--- a/SOL003/VNFIndicator-API/IndividualSubscription.robot
+++ b/SOL003/VNFIndicator-API/IndividualSubscription.robot
@@ -31,6 +31,7 @@ GET Individual VNF Indicator Subscription with invalid resource identifier
     ...    Post-Conditions: none
     GET Individual VNF Indicator Subscription with invalid resource identifier
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 DELETE Individual VNF Indicator Subscription
     [Documentation]    Test ID: 7.3.6.5.3
@@ -68,7 +69,6 @@ PUT Individual VNF Indicator Subscription - Method not implemented
     ...    Post-Conditions: The individual VNF indicator subscription is not modified by the operation
     Send Put Request for Individual VNF Indicator Subscription
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF indicator subscription Unmodified (Implicit)
 
 PATCH Individual VNF Indicator Subscription - Method not implemented
     [Documentation]    Test ID: 7.3.6.5.6
@@ -78,11 +78,10 @@ PATCH Individual VNF Indicator Subscription - Method not implemented
     ...    Reference: Clause 8.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: The individual VNF indicator subscription is not modified by the operation
+    ...    Post-Conditions: none
     Send Patch Request for Individual VNF Indicator Subscription
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF indicator subscription Unmodified (Implicit) 
-
+    
 POST Individual VNF Indicator Subscription - Method not implemented
     [Documentation]    Test ID: 7.3.6.5.7
     ...    Test title: POST Individual VNF Indicator Subscription - Method not implemented
@@ -91,7 +90,6 @@ POST Individual VNF Indicator Subscription - Method not implemented
     ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: The individual VNF indicator subscription is not created by the operation
+    ...    Post-Conditions: none
     Send Post Request for Individual VNF Indicator Subscription
-    Check HTTP Response Status Code Is    405
-    Check Postcondition VNF indicator subscription is not created  
\ No newline at end of file
+    Check HTTP Response Status Code Is    405 
\ No newline at end of file
diff --git a/SOL003/VNFIndicator-API/IndividualVNFindicator.robot b/SOL003/VNFIndicator-API/IndividualVNFindicator.robot
index be201072a..52b04e414 100644
--- a/SOL003/VNFIndicator-API/IndividualVNFindicator.robot
+++ b/SOL003/VNFIndicator-API/IndividualVNFindicator.robot
@@ -32,6 +32,7 @@ Get Individual Indicator for VNF Instance with invalid indicator identifier
     ...    Post-Conditions: none
     Get Individual Indicator for a VNF instance with invalid indicator identifier
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 POST Individual VNF Indicator for VNF Instance - Method not implemented
     [Documentation]    Test ID: 7.3.6.3.3
@@ -77,7 +78,6 @@ DELETE Individual VNF Indicator for VNF Instance - Method not implemented
     ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: The individual indicator for the VNF instance is not deleted by the unsuccessful operations
+    ...    Post-Conditions: none
     Send DELETE Request for individual indicator in VNF instance
-    Check HTTP Response Status Code Is    405
-    Check Postcondition Indicator for VNF instance Exist
\ No newline at end of file
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL003/VNFIndicator-API/Subscriptions.robot b/SOL003/VNFIndicator-API/Subscriptions.robot
index 251334e2b..18cda29a4 100644
--- a/SOL003/VNFIndicator-API/Subscriptions.robot
+++ b/SOL003/VNFIndicator-API/Subscriptions.robot
@@ -143,10 +143,9 @@ DELETE VNF Indicator Subscriptions - Method not implemented
     ...    Reference: Clause 8.4.5.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: The VNF indicator subscriptions are not deleted by the failed operation   
+    ...    Post-Conditions: none
     Send Delete Request for VNF Indicator Subscriptions
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Indicator Subscriptions Exists
 
 GET All VNF Indicator Subscriptions as Paged Response
     [Documentation]    Test ID: 7.3.6.4.11
@@ -159,7 +158,7 @@ GET All VNF Indicator Subscriptions as Paged Response
     ...    Post-Conditions: none        
     Get All VNF Indicators Subscriptions
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contain Link
     
 GET VNF Indicator Subscriptions - Bad Request Response too Big
     [Documentation]    Test ID: 7.3.6.4.12
diff --git a/SOL003/VNFIndicator-API/VNFIndicators.robot b/SOL003/VNFIndicator-API/VNFIndicators.robot
index ca591ab98..5eb2cf7b7 100644
--- a/SOL003/VNFIndicator-API/VNFIndicators.robot
+++ b/SOL003/VNFIndicator-API/VNFIndicators.robot
@@ -155,7 +155,7 @@ Get all VNF Indicators as Paged Response
     ...    Post-Conditions: none
     Get all VNF indicators
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contain Link
 
 Get VNF Indicators - Bad Request Response too Big
     [Documentation]    Test ID: 7.3.6.1.13
diff --git a/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot b/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
index cb9e3925c..bc3c1d00d 100644
--- a/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
+++ b/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
@@ -103,7 +103,8 @@ Send Post Request for VNF Indicator Subscription
     Log    Trying to create a new subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    ${body}=    Get File    jsons/subscriptions.json
+    ${template}=    Get File    jsons/subscriptions.json
+    ${body}=        Format String   ${template}     callback=${callback}    {callback_subscribe}=${callback_subscribe}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${output}=    Output    response
@@ -125,7 +126,8 @@ Send Post Request for Duplicated VNF indicator Subscription
     Log    Trying to create a subscription with an already created content
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    ${body}=    Get File    jsons/subscriptions.json
+     ${template}=    Get File    jsons/subscriptions.json
+    ${body}=        Format String   ${template}     callback=${callback}    {callback_subscribe}=${callback_subscribe}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${output}=    Output    response
@@ -403,14 +405,6 @@ Check HTTP Response Body Includes Requested VNF Instances ID
     Log    Check Response includes Indicators according to resource identifier
     Should Be Equal As Strings   ${response['body'][0]['vnfInstanceId']}    ${vnfInstanceId}
 
-Check Postcondition Indicators for VNF instance Exist
-    Log    Check Postcondition Indicators for VNF instance Exist
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
-    Should Be Equal    ${response['status']}    200
-    
-
 Get Individual Indicator for a VNF instance
     Log    This resource represents a VNF indicator related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
@@ -471,11 +465,7 @@ Check Postcondition Indicator for VNF instance Exist
     Log    Check Response includes VNF Indicator
     Get Individual Indicator for a VNF instance
     Should Be Equal    ${response['body']['vnfInstanceId']}    ${vnfInstanceId}
-    Should Be Equal    ${response['body']['id']}    ${indicatorId}
-
-Check Postcondition VNF Indicator Subscriptions Exists
-    Log    Checking that subscriptions exists
-    Get all VNF Indicators Subscriptions  
+    Should Be Equal    ${response['body']['id']}    ${indicatorId}  
 
 GET Individual VNF Indicator Subscription
     Log    Trying to get a given subscription identified by subscriptionId
@@ -542,18 +532,6 @@ Check Postcondition Individual VNF Indicator Subscription is Deleted
     GET Individual VNF Indicator Subscription
     Check HTTP Response Status Code Is    404
 
-Check Postcondition VNF indicator subscription Unmodified (Implicit)
-    Log    Check Postcondition subscription is not modified
-    GET Individual VNF Indicator Subscription
-    Log    Check Response matches original subscription
-    ${subscription}=    evaluate    json.loads('''${response['body']}''')    json
-    Should Be Equal    ${origResponse['body']['callbackUri']}    ${subscription.callbackUri}
-    
-Check Postcondition VNF indicator subscription is not created
-    Log    Check Postcondition subscription is not created
-    GET Individual VNF Indicator Subscription with invalid resource identifier
-    Check HTTP Response Status Code Is    404
-
 Create Sessions
     Pass Execution If    ${VNFM_CHECKS_NOTIF_ENDPOINT} == 0   MockServer not necessary to run    
     Start Process  java  -jar  ${MOCK_SERVER_JAR}    -serverPort  ${callback_port}  alias=mockInstance
@@ -568,6 +546,6 @@ Check Notification Endpoint
     Wait Until Keyword Succeeds    ${total_polling_time}   ${polling_interval}   Verify Mock Expectation    ${notification_request}
     Clear Requests  ${callback_endpoint}
 
-Check LINK in Header
+Check HTTP Response Header Contain Link
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
diff --git a/SOL003/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot b/SOL003/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
index 2e6afb7c7..c2e54e5dd 100644
--- a/SOL003/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
+++ b/SOL003/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
@@ -105,10 +105,9 @@ DELETE Indicators for VNF instance - Method not implemented
     ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: The indicators for the VNF instance are not deleted by the unsuccessful operation
+    ...    Post-Conditions: none
     Send DELETE Request for indicators in VNF instance
     Check HTTP Response Status Code Is    405
-    Check Postcondition Indicators for VNF instance Exist
 
 Get Indicators for VNF Instance as Paged Response
     [Documentation]    Test ID: 7.3.6.2.9
@@ -121,7 +120,7 @@ Get Indicators for VNF Instance as Paged Response
     ...    Post-Conditions: none
     Get all indicators for a VNF instance
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contain Link
     
 Get Indicators for VNF Instance - Bad Request Response too Big
     [Documentation]    Test ID: 7.3.6.2.10
diff --git a/SOL003/VNFIndicator-API/environment/variables.txt b/SOL003/VNFIndicator-API/environment/variables.txt
index 5949e3c17..cc906c8a3 100644
--- a/SOL003/VNFIndicator-API/environment/variables.txt
+++ b/SOL003/VNFIndicator-API/environment/variables.txt
@@ -32,4 +32,7 @@ ${polling_interval}     10 sec
 ${notification_request}    []
 ${notification_response}    []
 
-${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
\ No newline at end of file
+${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+
+${callback}    http://172.22.1.7:${callback_port}
+${callback_subscribe}    /vnfind/subscribes
\ No newline at end of file
diff --git a/SOL003/VNFIndicator-API/jsons/subscriptions.json b/SOL003/VNFIndicator-API/jsons/subscriptions.json
index 3820370db..d48f9f99d 100644
--- a/SOL003/VNFIndicator-API/jsons/subscriptions.json
+++ b/SOL003/VNFIndicator-API/jsons/subscriptions.json
@@ -1,3 +1,3 @@
-{
-	"callbackUri": "http://172.22.1.7:9091/vnfind/subscribes"
-}
\ No newline at end of file
+{{
+	"callbackUri": "{callback}{callback_subscribe}"
+}}
\ No newline at end of file
-- 
GitLab


From da5b9e4b6b81fd5ec69634580a8a53c93062f7cc Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Fri, 9 Oct 2020 11:59:28 +0500
Subject: [PATCH 063/322] refernce updated

---
 .../ApiVersion.robot                          | 20 +++++++++----------
 .../Grants.robot                              | 14 ++++++-------
 .../IndividualGrant.robot                     | 14 ++++++-------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/SOL003/VNFLifecycleOperationGranting-API/ApiVersion.robot b/SOL003/VNFLifecycleOperationGranting-API/ApiVersion.robot
index 1740b98ed..6821a6e18 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/ApiVersion.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/ApiVersion.robot
@@ -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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
index 392ae4b54..347344aa9 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
@@ -18,7 +18,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 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.4.1
+    ...    Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.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.
@@ -33,7 +33,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 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.4.1
+    ...    Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.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.
@@ -48,7 +48,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.4.1
+    ...    Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -61,7 +61,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.4.1
+    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions:   none
@@ -73,7 +73,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.4.1
+    ...    Reference: Clause 9.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -85,7 +85,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.4.1
+    ...    Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -97,7 +97,7 @@ 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.4.1
+    ...    Reference: Clause 9.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions:  resources are not deleted
diff --git a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
index cb95734f5..10889e265 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
@@ -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.4.1
+    ...    Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -29,7 +29,7 @@ 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.
     ...    Pre-conditions: The  grant information is available to the VNFM
-    ...    Reference: Clause 9.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: Clause 9.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -43,7 +43,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.4.1
+    ...    Reference: Clause 9.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -57,7 +57,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.4.1
+    ...    Reference: Clause 9.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -70,7 +70,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.4.1
+    ...    Reference: Clause 9.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -82,7 +82,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.4.1
+    ...    Reference: Clause 9.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -94,7 +94,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.4.1
+    ...    Reference: Clause 9.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
-- 
GitLab


From 9296d9f6346482a916c738937ab527851a9239e5 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Fri, 9 Oct 2020 12:11:32 +0500
Subject: [PATCH 064/322] templating and minor fix added

---
 .../Grants.robot                              | 14 +++++++----
 .../IndividualGrant.robot                     |  3 ---
 .../environment/variables.txt                 | 12 +++++-----
 .../jsons/grantRejectedRequest.json           | 24 +++++++++----------
 .../jsons/grantRequest.json                   | 24 +++++++++----------
 5 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
index 347344aa9..b03e19a80 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
@@ -1,4 +1,5 @@
 *** Settings ***
+Library    String
 Resource   environment/variables.txt 
 Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
 Library    OperatingSystem
@@ -27,7 +28,6 @@ Requests a grant for a particular VNF lifecycle operation - Synchronous mode
     Check Operation Occurrence Id existence 
     Check HTTP Response Body Json Schema Is    grant
 
-
 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
@@ -114,7 +114,8 @@ Send Request Grant Request in Synchronous mode
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/grantRequest.json
+    ${template}=    Get File    jsons/grantRequest.json
+    ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${vnfdId}    flavourId=${flavourId}
     Post    ${apiRoot}/${apiName}/${apiVersion}/grants    ${body}
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
@@ -125,7 +126,8 @@ Send Request Grant Request in Asynchronous mode
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/grantRequest.json
+    ${template}=    Get File    jsons/grantRequest.json
+    ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${vnfdId}    flavourId=${flavourId}
     Post    ${apiRoot}/${apiName}/${apiVersion}/grants    ${body}
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
@@ -136,7 +138,8 @@ Send Request for a new Grant Forbiden Operation
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/grantRejectedRequest.json
+    ${template}=    Get File    jsons/grantRejectedRequest.json
+    ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${vnfdId}    flavourId=${flavourId}
     Post    ${apiRoot}/${apiName}/${apiVersion}/grants    ${body}
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
@@ -145,7 +148,8 @@ Send Request Grant Request
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/grantRequest.json
+    ${template}=    Get File    jsons/grantRequest.json
+    ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${vnfdId}    flavourId=${flavourId}
     Post    ${apiRoot}/${apiName}/${apiVersion}/grants    ${body}    allow_redirects=false
     ${resp}    Output    response
     ${result}=    evaluate    json.loads(json.dumps(${resp}))    json
diff --git a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
index 10889e265..da4150f8b 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
@@ -8,9 +8,6 @@ Documentation    This resource represents an individual grant. The client can us
 ...    It is determined by means outside the scope of the present document, such as configuration or policy,
 ...    how long an individual grant is available.
 
-*** Variables ***
-${response}    {}
-
 *** Test Cases ***
 POST Individual Grant - Method not implemented
     [Documentation]    Test ID: 7.3.2.2.1
diff --git a/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt b/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
index cfb446726..39e005a4d 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
+++ b/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
@@ -14,12 +14,7 @@ ${apiVersion}     v1
 
 ${SYNC_MODE}    1
 
-
-
-
-${response}
-
-
+${response}    {}
 
 ${VNFM_HOST}      localhost    # Hostname of the VNFM
 ${VNFM_PORT}      8080    # Listening port of the VNFM
@@ -42,3 +37,8 @@ ${sub_filter_invalid}    filter_invalid
 ${subscriptionId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
 ${notification_ep}    notification
 ${VrQuotaAvailNotification}    {}
+
+${vnfInstanceId}    myVnfInstanceId
+${vnfLcmOpOccId}    myLcmOccId
+${vnfdId}    myVnF
+${flavourId}    string
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleOperationGranting-API/jsons/grantRejectedRequest.json b/SOL003/VNFLifecycleOperationGranting-API/jsons/grantRejectedRequest.json
index d8ae1e897..f335ba633 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/jsons/grantRejectedRequest.json
+++ b/SOL003/VNFLifecycleOperationGranting-API/jsons/grantRejectedRequest.json
@@ -1,16 +1,16 @@
-{
-  "vnfInstanceId": "string",
-  "vnfLcmOpOccId": "string",
-  "vnfdId": "string",
-  "flavourId": "string",
+{{
+  "vnfInstanceId": "{vnfInstanceId}",
+  "vnfLcmOpOccId": "{vnfLcmOpOccId}",
+  "vnfdId": "{vnfdId}",
+  "flavourId": "{flavourId}",
   "operation": "INSTANTIATE",
   "isAutomaticInvocation": true,
-  "_links": {
-    "vnfLcmOpOcc": {
+  "_links": {{
+    "vnfLcmOpOcc": {{
       "href": "string"
-    },
-    "vnfInstance": {
+    }},
+    "vnfInstance": {{
       "href": "string"
-    }
-  }
-}
\ No newline at end of file
+    }}
+  }}
+}}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleOperationGranting-API/jsons/grantRequest.json b/SOL003/VNFLifecycleOperationGranting-API/jsons/grantRequest.json
index 74b326828..f335ba633 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/jsons/grantRequest.json
+++ b/SOL003/VNFLifecycleOperationGranting-API/jsons/grantRequest.json
@@ -1,16 +1,16 @@
-{
-  "vnfInstanceId": "myVnfInstanceId",
-  "vnfLcmOpOccId": "myLcmOccId",
-  "vnfdId": "myVnF",
-  "flavourId": "string",
+{{
+  "vnfInstanceId": "{vnfInstanceId}",
+  "vnfLcmOpOccId": "{vnfLcmOpOccId}",
+  "vnfdId": "{vnfdId}",
+  "flavourId": "{flavourId}",
   "operation": "INSTANTIATE",
   "isAutomaticInvocation": true,
-  "_links": {
-    "vnfLcmOpOcc": {
+  "_links": {{
+    "vnfLcmOpOcc": {{
       "href": "string"
-    },
-    "vnfInstance": {
+    }},
+    "vnfInstance": {{
       "href": "string"
-    }
-  }
-}
\ No newline at end of file
+    }}
+  }}
+}}
\ No newline at end of file
-- 
GitLab


From c1963d1f201d6e181f4e8f2daebcafbe16a36913 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Fri, 9 Oct 2020 12:15:57 +0500
Subject: [PATCH 065/322] refernce updated

---
 .../VNFPackageManagement-API/ApiVersion.robot | 20 +++----
 .../IndividualSubscription.robot              | 14 ++---
 .../IndividualVNFPackage.robot                | 24 ++++----
 .../IndividualVNFPackageArtifacts.robot       | 56 ++++++++---------
 .../ManifestInIndividualVNFPackage.robot      | 32 +++++-----
 .../PackageManagementNotification.robot       |  6 +-
 .../Subscriptions.robot                       | 26 ++++----
 .../VNFDInIndividualVNFPackage.robot          | 44 +++++++-------
 .../VNFPackageArtifacts.robot                 | 60 +++++++++----------
 .../VNFPackageContent.robot                   | 40 ++++++-------
 .../VNFPackages.robot                         | 56 ++++++++---------
 11 files changed, 189 insertions(+), 189 deletions(-)

diff --git a/SOL003/VNFPackageManagement-API/ApiVersion.robot b/SOL003/VNFPackageManagement-API/ApiVersion.robot
index 85c0567dc..79cf0157a 100644
--- a/SOL003/VNFPackageManagement-API/ApiVersion.robot
+++ b/SOL003/VNFPackageManagement-API/ApiVersion.robot
@@ -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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL003/VNFPackageManagement-API/IndividualSubscription.robot b/SOL003/VNFPackageManagement-API/IndividualSubscription.robot
index 2d97f97c9..2835612a5 100644
--- a/SOL003/VNFPackageManagement-API/IndividualSubscription.robot
+++ b/SOL003/VNFPackageManagement-API/IndividualSubscription.robot
@@ -13,7 +13,7 @@ GET Individual VNF Package Subscription
     ...    Test title: GET Individual VNF Package Subscription
     ...    Test objective: The objective is to test the retrieval of individual VNF package subscription and perform a JSON schema and content validation of the returned subscription data structure
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 10.4.8.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.8.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ GET Individual VNF Package Subscription with invalid resource identifier
     ...    Test title: GET Individual VNF Package Subscription with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package subscription fails when using an invalid resource identifier
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 10.4.8.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.8.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +39,7 @@ DELETE Individual VNF Package Subscription with invalid resource identifier
     ...    Test title: DELETE Individual VNF Package Subscription with invalid resource identifier
     ...    Test objective: The objective is to test that the deletion of an individual VNF package subscription fails when using an invalid resource identifier
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 10.4.8.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.8.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -51,7 +51,7 @@ POST Individual VNF Package Subscription - Method not implemented
     ...    Test title: POST Individual VNF Package Subscription - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF Package Subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.8.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.8.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package Subscription is not created on the NFVO
@@ -64,7 +64,7 @@ PUT Individual VNF Package Subscription - Method not implemented
     ...    Test title: PUT Individual VNF Package Subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF Package subscription
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 10.4.8.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.8.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package subscription is not modified by the operation
@@ -77,7 +77,7 @@ PATCH Individual VNF Package Subscription - Method not implemented
     ...    Test title: PATCH Individual VNF Package Subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing VNF Package subscription
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 10.4.8.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.8.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package subscription is not modified by the operation
@@ -90,7 +90,7 @@ DELETE Individual VNF Package Subscription
     ...    Test title: DELETE Individual VNF Package Subscription
     ...    Test objective: The objective is to test the deletion of an individual VNF package subscription
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 10.4.8.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.8.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package Subscription is not available anymore in the NFVO    
diff --git a/SOL003/VNFPackageManagement-API/IndividualVNFPackage.robot b/SOL003/VNFPackageManagement-API/IndividualVNFPackage.robot
index 2c2f1e3c8..f6cf4b76e 100644
--- a/SOL003/VNFPackageManagement-API/IndividualVNFPackage.robot
+++ b/SOL003/VNFPackageManagement-API/IndividualVNFPackage.robot
@@ -12,7 +12,7 @@ GET Individual VNF Package
     ...    Test title: GET Individual VNF Package
     ...    Test objective: The objective is to test the retrieval of an individual VNF package information perform a JSON schema validation of the collected data structure
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -26,7 +26,7 @@ GET Individual VNF Package with invalid resource identifier
     ...    Test title: GET Individual VNF Package with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package fails when using an invalid resource identifier
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -38,7 +38,7 @@ POST Individual VNF Package - Method not implemented
     ...    Test title: POST Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new VNF Package
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.3.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ PUT Individual VNF Package - Method not implemented
     ...    Test title: PUT Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNF Package
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -62,7 +62,7 @@ PATCH Individual VNF Package - Method not implemented
     ...    Test title: PATCH Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that PATCH  method is not allowed to update a VNF Package
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -74,7 +74,7 @@ DELETE Individual VNF Package - Method not implemented
     ...    Test title: DELETE Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNF Package
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package is not deleted by the failed operation
@@ -87,7 +87,7 @@ GET Individual OnBoarded VNF Package
     ...    Test title: GET Individual OnBoarded VNF Package
     ...    Test objective: The objective is to test the retrieval of an individual OnBoarded VNF package information perform a JSON schema validation of the collected data structure
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -101,7 +101,7 @@ GET Individual OnBoarded VNF Package with invalid resource identifier
     ...    Test title: GET Individual OnBoarded VNF Package with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual OnBoarded VNF package fails when using an invalid resource identifier
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -113,7 +113,7 @@ POST Individual OnBoarded VNF Package - Method not implemented
     ...    Test title: POST Individual OnBoarded VNF Package - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new OnBoarded VNF Package
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.3.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -125,7 +125,7 @@ PUT Individual OnBoarded VNF Package - Method not implemented
     ...    Test title: PUT Individual OnBoarded VNF Package - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNF Package
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -137,7 +137,7 @@ PATCH Individual OnBoarded VNF Package - Method not implemented
     ...    Test title: PATCH Individual OnBoarded VNF Package - Method not implemented
     ...    Test objective: The objective is to test that PATCH  method is not allowed to update a VNF Package
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -149,7 +149,7 @@ DELETE Individual OnBoarded VNF Package - Method not implemented
     ...    Test title: DELETE Individual OnBoarded VNF Package - Method not implemented
     ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNF Package
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package is not deleted by the failed operation
diff --git a/SOL003/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot b/SOL003/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot
index 323aa3c22..7acd8f4bf 100644
--- a/SOL003/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot
+++ b/SOL003/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot
@@ -12,7 +12,7 @@ GET Individual VNF Package Artifact
     ...    Test title: GET Individual VNF Package Artifact
     ...    Test objective: The objective is to test the retrieval of an individual VNF package artifact
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -24,7 +24,7 @@ GET Individual VNF Package Artifact in octet stream format
     ...    Test title: GET Individual VNF Package Artifact in octet stream format
     ...    Test objective: The objective is to test the retrieval of an individual VNF package artifact when the NFVO cannot determine the artifact content type. The test performs a validation that the returned artifcat in is octet-stream format 
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO cannot determine the content type of the artifact
     ...    Post-Conditions: none
@@ -37,7 +37,7 @@ GET Individual VNF Package Artifact with Range Request and NFVO supporting Range
     ...    Test title: GET Individual VNF Package Artifact with Range Request and NFVO supporting Range Requests
     ...    Test objective: The objective is to test the retrieval of an individual VNF package artifact when using a range request to return single range of bytes from the file, with the NFVO supporting it. The test also perform a validation that returned content matches the issued range
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
     ...    Post-Conditions: none
@@ -51,7 +51,7 @@ GET Individual VNF Package Artifact with Range Request and NFVO not supporting R
     ...    Test title: GET Individual VNF Package Artifact with Range Request and NFVO not supporting Range Requests
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package artifact, when using a range request to return single range of bytes from the file and the NFVO not supporting it, returns the full VNF Package artifact.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO does not support range requests to return single range of bytes from the VNF package artifact
     ...    Post-Conditions: none    
@@ -63,7 +63,7 @@ GET Individual VNF Package Artifact with invalid Range Request
     ...    Test title: GET Individual VNF Package Artifact with invalid Range Request
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package artifact fails when using a range request that does not match any available byte range in the file.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
     ...    Post-Conditions: none      
@@ -75,7 +75,7 @@ GET Individual VNF Package Artifact with invalid resource identifier
     ...    Test title: GET Individual VNF Package Artifact with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package artifact fails when using an invalid resource identifier
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -87,7 +87,7 @@ GET Individual VNF Package Artifact with conflict due to onboarding state
     ...    Test title: GET Individual VNF Package Artifact with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package artifact fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the VNF package for which the content is requested is different from ONBOARDED.
-    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -100,7 +100,7 @@ POST Individual VNF Package Artifact - Method not implemented
     ...    Test title: POST Individual VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new VNF Package artifact
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -112,7 +112,7 @@ PUT Individual VNF Package Artifact - Method not implemented
     ...    Test title: PUT Individual VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNF Package artifact
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -124,7 +124,7 @@ PATCH Individual VNF Package Artifact - Method not implemented
     ...    Test title: PATCH Individual VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that PATCH  method is not allowed to update a VNF Package artifact
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -136,7 +136,7 @@ DELETE Individual VNF Package Artifact - Method not implemented
     ...    Test title: DELETE Individual VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNF Package artifact
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package artifact is not deleted by the failed operation
@@ -149,7 +149,7 @@ GET Individual OnBoarded VNF Package Artifact
     ...    Test title: GET Individual OnBoarded VNF Package Artifact
     ...    Test objective: The objective is to test the retrieval of an individual OnBoarded VNF package artifact
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -161,7 +161,7 @@ GET Individual OnBoarded VNF Package Artifact in octet stream format
     ...    Test title: GET Individual OnBoarded VNF Package Artifact in octet stream format
     ...    Test objective: The objective is to test the retrieval of an individual OnBoarded VNF package artifact when the NFVO cannot determine the artifact content type. The test performs a validation that the returned artifcat in is octet-stream format 
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO cannot determine the content type of the artifact
     ...    Post-Conditions: none
@@ -174,7 +174,7 @@ GET Individual OnBoarded VNF Package Artifact with Range Request and NFVO suppor
     ...    Test title: GET Individual OnBoarded VNF Package Artifact with Range Request and NFVO supporting Range Requests
     ...    Test objective: The objective is to test the retrieval of an individual OnBoarded VNF package artifact when using a range request to return single range of bytes from the file, with the NFVO supporting it. The test also perform a validation that returned content matches the issued range
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
     ...    Post-Conditions: none
@@ -188,7 +188,7 @@ GET Individual OnBoarded VNF Package Artifact with Range Request and NFVO not su
     ...    Test title: GET Individual OnBoarded VNF Package Artifact with Range Request and NFVO not supporting Range Requests
     ...    Test objective: The objective is to test that the retrieval of an individual OnBoarded VNF package artifact, when using a range request to return single range of bytes from the file and the NFVO not supporting it, returns the full VNF Package artifact.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO does not support range requests to return single range of bytes from the VNF package artifact
     ...    Post-Conditions: none    
@@ -200,7 +200,7 @@ GET Individual OnBoarded VNF Package Artifact with invalid Range Request
     ...    Test title: GET Individual OnBoarded VNF Package Artifact with invalid Range Request
     ...    Test objective: The objective is to test that the retrieval of an individual OnBoarded VNF package artifact fails when using a range request that does not match any available byte range in the file.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
     ...    Post-Conditions: none      
@@ -212,7 +212,7 @@ GET Individual OnBoarded VNF Package Artifact with invalid resource identifier
     ...    Test title: GET Individual OnBoarded VNF Package Artifact with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual OnBoarded VNF package artifact fails when using an invalid resource identifier
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -224,7 +224,7 @@ GET Individual OnBoarded VNF Package Artifact with conflict due to onboarding st
     ...    Test title: GET Individual OnBoarded VNF Package Artifact with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of an individual OnBoarded VNF package artifact fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the VNF package for which the content is requested is different from ONBOARDED.
-    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -237,7 +237,7 @@ POST Individual OnBoarded VNF Package Artifact - Method not implemented
     ...    Test title: POST Individual OnBoarded VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new VNF Package artifact
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -249,7 +249,7 @@ PUT Individual OnBoarded VNF Package Artifact - Method not implemented
     ...    Test title: PUT Individual OnBoarded VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNF Package artifact
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -261,7 +261,7 @@ PATCH Individual OnBoarded VNF Package Artifact - Method not implemented
     ...    Test title: PATCH Individual OnBoarded VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that PATCH  method is not allowed to update a VNF Package artifact
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -273,7 +273,7 @@ DELETE Individual OnBoarded VNF Package Artifact - Method not implemented
     ...    Test title: DELETE Individual OnBoarded VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNF Package artifact
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package artifact is not deleted by the failed operation
@@ -286,7 +286,7 @@ GET Individual VNF Package Artifact with security information
     ...    Test title: GET Individual VNF Package Artifact with security information
     ...    Test objective: The objective is to test the retrieval of an individual VNF package artifact shall include in the ZIP archive the security information when requested with "include_signature" parameter 
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO cannot determine the content type of the artifact
     ...    Post-Conditions: none
@@ -299,7 +299,7 @@ GET Individual OnBoarded VNF Package Artifact with security information
     ...    Test title: GET Individual OnBoarded VNF Package Artifact with security information
     ...    Test objective: The objective is to test the retrieval of an individual OnBoarded VNF package artifact shall include in the ZIP archive the security information when requested with "include_signature" parameter 
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO cannot determine the content type of the artifact
     ...    Post-Conditions: none
@@ -312,7 +312,7 @@ GET Individual VNF Package Artifact with encrypted artifact
     ...    Test title: GET Individual VNF Package Artifact with encrypted artifact
     ...    Test objective: The objective is to test the retrieval of an individual VNF package artifact shall include an encrypted artifact 
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO cannot determine the content type of the artifact
     ...    Post-Conditions: none
@@ -325,7 +325,7 @@ GET Individual OnBoarded VNF Package Artifact with encrypted artifact
     ...    Test title: GET Individual OnBoarded VNF Package Artifact with encrypted artifact
     ...    Test objective: The objective is to test the retrieval of an individual OnBoarded VNF package artifact shall include an encrypted artifact 
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO cannot determine the content type of the artifact
     ...    Post-Conditions: none
@@ -338,7 +338,7 @@ GET Individual VNF Package Artifact - Not Acceptable
     ...    Test title: GET Individual VNF Package Artifact with invalid Range Request
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package artifact fails when related request contained an "Accept" header not compatible with the Content type "application/zip" but the "include_signatures" flag was provided
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none      
@@ -351,7 +351,7 @@ GET Individual OnBoarded VNF Package Artifact - Not Acceptable
     ...    Test title: GET Individual OnBoarded VNF Package Artifact with invalid Range Request
     ...    Test objective: The objective is to test that the retrieval of an individual OnBoarded VNF package artifact fails when related request contained an "Accept" header not compatible with the Content type "application/zip" but the "include_signatures" flag was provided
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none      
diff --git a/SOL003/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot b/SOL003/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot
index 9b7347bda..29e2aeb8b 100644
--- a/SOL003/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot
+++ b/SOL003/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot
@@ -11,7 +11,7 @@ Get Manifest in Individual VNF Package
     ...    Test title: Get Manifest in Individual VNF Package
     ...    Test objective: The objective is to test that the Get request read the content of manifest within a NVF Package and perform a validation that returned content is in plain text format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -24,7 +24,7 @@ Get Manifest in Individual VNF Package with security information
     ...    Test title: Get Manifest in Individual VNF Package with security information
     ...    Test objective: The objective is to test the retrieval of manifest for an individual VNF package shall also security certificates when requested with "include_signature" parameter, and perform a validation that returned content is in Zip format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -37,7 +37,7 @@ Get Manifest in Individual VNF Package - Not acceptable
     ...    Test title: Get Manifest in Individual VNF Package - Not acceptable
     ...    Test objective: The objective is to test that retriveal of the of manifest for an individual VNF package fails when request contained an "Accept" header not compatible with the Content type "application/zip" but the "include_signatures" flag was provided, and perform a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ Get Manifest in Individual VNF Package - Conflict
     ...    Test title: Get Manifest in Individual VNF Package - Conflict
     ...    Test objective: The objective is to test that the retrieval of the manifest for an individual VNF package fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the VNF package for which the VNFD is requested is different from ONBOARDED.
-    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -63,7 +63,7 @@ POST Manifest in Individual VNF Package - Method not implemented
     ...    Test title: POST Manifest in Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new resource
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4a.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4a.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -75,7 +75,7 @@ PUT Manifest in Individual VNF Package - Method not implemented
     ...    Test title: PUT Manifest in Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify resource
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4a.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4a.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -87,7 +87,7 @@ PATCH Manifest in Individual VNF Package - Method not implemented
     ...    Test title: PATCH Manifest in Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update resource
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4a.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4a.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -99,7 +99,7 @@ DELETE Manifest in Individual VNF Package - Method not implemented
     ...    Test title: DELETE Manifest in Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that DELETE  method is not allowed to delete resource
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4a.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4a.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: Resource is not deleted by the failed operation
@@ -112,7 +112,7 @@ Get Manifest in Individual OnBoarded VNF Package
     ...    Test title: Get Manifest in Individual OnBoarded VNF Package
     ...    Test objective: The objective is to test that the Get request read the content of manifest within a OnBoarded NVF Package and perform a validation that returned content is in plain text format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -125,7 +125,7 @@ Get Manifest in Individual OnBoarded VNF Package with security information
     ...    Test title: Get Manifest in Individual OnBoarded VNF Package with security information
     ...    Test objective: The objective is to test the retrieval of manifest for an individual OnBoarded VNF package shall also security certificates when requested with "include_signature" parameter, and perform a validation that returned content is in Zip format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -138,7 +138,7 @@ Get Manifest in Individual OnBoarded VNF Package - Not acceptable
     ...    Test title: Get Manifest in Individual OnBoarded VNF Package - Not acceptable
     ...    Test objective: The objective is to test that retriveal of the of manifest for an individual OnBoarded VNF package fails when request contained an "Accept" header not compatible with the Content type "application/zip" but the "include_signatures" flag was provided, and perform a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -151,7 +151,7 @@ Get Manifest in Individual OnBoarded VNF Package - Conflict
     ...    Test title: Get Manifest in Individual OnBoarded VNF Package - Conflict
     ...    Test objective: The objective is to test that the retrieval of the manifest for an individual OnBoarded VNF package fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the VNF package for which the VNFD is requested is different from ONBOARDED.
-    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -164,7 +164,7 @@ POST Manifest in Individual OnBoarded VNF Package - Method not implemented
     ...    Test title: POST Manifest in Individual OnBoarded VNF Package - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new resource
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4a.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4a.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -176,7 +176,7 @@ PUT Manifest in Individual OnBoarded VNF Package - Method not implemented
     ...    Test title: PUT Manifest in Individual OnBoarded VNF Package - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify resource
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4a.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4a.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -188,7 +188,7 @@ PATCH Manifest in Individual OnBoarded VNF Package - Method not implemented
     ...    Test title: PATCH Manifest in Individual OnBoarded VNF Package - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update resource
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4a.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4a.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -200,7 +200,7 @@ DELETE Manifest in Individual OnBoarded VNF Package - Method not implemented
     ...    Test title: DELETE Manifest in Individual OnBoarded VNF Package - Method not implemented
     ...    Test objective: The objective is to test that DELETE  method is not allowed to delete resource
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4a.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4a.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: Resource is not deleted by the failed operation
diff --git a/SOL003/VNFPackageManagement-API/PackageManagementNotification.robot b/SOL003/VNFPackageManagement-API/PackageManagementNotification.robot
index b775527f8..13830fc38 100644
--- a/SOL003/VNFPackageManagement-API/PackageManagementNotification.robot
+++ b/SOL003/VNFPackageManagement-API/PackageManagementNotification.robot
@@ -16,7 +16,7 @@ VNF Package Onboarding Notification
     ...    Test title: VNF Package Onboarding Notification
     ...    Test objective: The objective is to test the dispatch of VNF Package Onboarding notification when the VNF package onboarding operation is successfully completed, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF package subscription for onboarding notifications is available in the NFVO.
-    ...    Reference: Clause 10.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -29,7 +29,7 @@ VNF Package Operational State Change Notification
     ...    Test title: VNF Package Operational State Change Notification
     ...    Test objective: The objective is to test the dispatch of VNF Package Change notification when the VNF package operational state is modified, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF package subscription for change notifications is available in the NFVO.
-    ...    Reference: Clause 10.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -43,7 +43,7 @@ VNF Package Deletion Notification
     ...    Test title: VNF Package Deletion Notification
     ...    Test objective: The objective is to test the dispatch of VNF Package Change notification when the VNF package is deleted on the NFVO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF package subscription for change notifications is available in the NFVO.
-    ...    Reference: Clause 10.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL003/VNFPackageManagement-API/Subscriptions.robot b/SOL003/VNFPackageManagement-API/Subscriptions.robot
index 84f5e5242..ae20f847b 100644
--- a/SOL003/VNFPackageManagement-API/Subscriptions.robot
+++ b/SOL003/VNFPackageManagement-API/Subscriptions.robot
@@ -17,7 +17,7 @@ Get All VNF Package Subscriptions
     ...    Test title: GET all VNF Package Subscriptions
     ...    Test objective: The objective is to test the retrieval of all VNF package subscriptions and perform a JSON schema validation of the returned subscriptions data structure
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 10.4.7.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.7.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -31,7 +31,7 @@ Get VNF Package Subscriptions with attribute-based filter
     ...    Test title: Get VNF Package Subscriptions with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of VNF package subscriptions using attribute-based filter, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 10.4.7.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.7.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -46,7 +46,7 @@ Get VNF Package Subscriptions with invalid attribute-based filter
     ...    Test title: Get VNF Package Subscriptions with attribute-based filters
     ...    Test objective: The objective is to test that the retrieval of VNF package subscriptions fails when using invalid attribute-based filters, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 10.4.7.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.7.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -59,7 +59,7 @@ GET VNF Package Subscription with invalid resource endpoint
     ...    Test title: GET VNF Package Subscription with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of all VNF package subscriptions fails when using invalid resource endpoint.
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 10.4.7.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.7.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -71,7 +71,7 @@ Create new VNF Package subscription
     ...    Test title: Create new VNF Package subscription
     ...    Test objective: The objective is to test the creation of a new VNF package subscription and perform a JSON schema and content validation of the returned subscription data structure
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.7.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.7.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF package subscription is successfully set and it matches the issued subscription    
@@ -88,7 +88,7 @@ Create duplicated VNF Package subscription with NFVO not creating duplicated sub
     ...    Test title: Create duplicated VNF Package subscription with NFVO not creating duplicated subscriptions
     ...    Test objective: The objective is to test the attempt of a creation of a duplicated VNF package subscription and check that no new subscription is created by the NFVO and a link to the original subscription is returned
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 10.4.7.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.7.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO does not support the creation of duplicated subscriptions
     ...    Post-Conditions: The existing VNF package subscription returned is available in the NFVO
@@ -104,7 +104,7 @@ Create duplicated VNF Package subscription with NFVO creating duplicated subscri
     ...    Test title: Create duplicated VNF Package subscription with NFVO creating duplicated subscriptions
     ...    Test objective: The objective is to test the creation of a duplicated VNF package subscription and perform a JSON schema and content validation of the returned duplicated subscription data structure
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 10.4.7.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.7.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the creation of duplicated subscriptions
     ...    Post-Conditions: The duplicated VNF package subscription is successfully set and it matches the issued subscription
@@ -119,7 +119,7 @@ PUT VNF Package Subscriptions - Method not implemented
     ...    Test title: PUT VNF Package Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF package subscriptions
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 10.4.7.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.7.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -131,7 +131,7 @@ PATCH VNF Package Subscriptions - Method not implemented
     ...    Test title: PATCH VNF Package Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF package subscriptions
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 10.4.7.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.7.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -144,7 +144,7 @@ DELETE VNF Package Subscriptions - Method not implemented
     ...    Test title: DELETE VNF Package Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete VNF package subscriptions
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 10.4.7.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.7.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF package subscriptions are not deleted by the failed operation 
@@ -157,7 +157,7 @@ Get All VNF Package Subscriptions as Paged Response
     ...    Test title: GET all VNF Package Subscriptions as Paged Response
     ...    Test objective: The objective is to test the retrieval of all VNF package subscriptions as Paged Response.
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 10.4.7.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.7.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -170,7 +170,7 @@ Get VNF Package Subscriptions - Bad Request Response too Big
     ...    Test title: Get VNF Package Subscriptions - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of VNF package subscriptions fails because reponse is too big, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 10.4.7.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.7.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -183,7 +183,7 @@ Get VNF Package Subscriptions - Unprocessable Entity
     ...    Test title: Get VNF Package Subscriptions - Unprocessable Entity
     ...    Test objective: The objective is to test that content type of the payload body is supported and the payload body of a request contains syntactically correct data but the data cannot be processed., and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 10.4.7.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.7.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL003/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot b/SOL003/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
index e53cb0514..6c5fc0064 100644
--- a/SOL003/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
+++ b/SOL003/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
@@ -12,7 +12,7 @@ Get single file VNFD in Individual VNF Package in Plain Format
     ...    Test title: Get single file VNFD in Individual VNF Package in Plain Format
     ...    Test objective: The objective is to test the retrieval of the VNFD in plain format for an individual VNF package and perform a validation that returned content is in plain format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The VNFD is implemented as a single file
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ Get VNFD in Individual VNF Package in Zip Format
     ...    Test title: Get VNFD in Individual VNF Package in Zip Format
     ...    Test objective: The objective is to test the retrieval of the VNFD in zip format for an individual VNF package and perform a validation that returned content is in zip format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -38,7 +38,7 @@ Get single file VNFD in Individual VNF Package in Plain or Zip Format
     ...    Test title: Get single file VNFD in Individual VNF Package in Plain or Zip Format
     ...    Test objective: The objective is to test the retrieval of the single file VNFD for an individual VNF package when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that returned content is in Plain or Zip format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The VNFD is implemented as a single file
     ...    Post-Conditions: none
@@ -51,7 +51,7 @@ Get multi file VNFD in Individual VNF Package in Plain or Zip Format
     ...    Test title: Get multi file VNFD in Individual VNF Package in Plain or Zip Format
     ...    Test objective: The objective is to test the retrieval of the multi file VNFD for an individual VNF package when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that returned content is in Zip format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The VNFD is implemented as a multi file
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ Get VNFD in Individual VNF Package with invalid resource identifier
     ...    Test title: Get VNFD in Individual VNF Package with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of the VNFD for an individual VNF package content fails when using an invalid resource identifier
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -76,7 +76,7 @@ Get VNFD in Individual VNF Package Content with conflict due to onboarding state
     ...    Test title: Get VNFD in Individual VNF Package Content with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of the VNFD for an individual VNF package content fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the VNF package for which the VNFD is requested is different from ONBOARDED.
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -89,7 +89,7 @@ POST VNFD in Individual VNF Package Content - Method not implemented
     ...    Test title: POST VNFD in Individual VNF Package Content - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new VNFD
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -101,7 +101,7 @@ PUT VNFD in Individual VNF Package Content - Method not implemented
     ...    Test title: PUT VNFD in Individual VNF Package Content - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNFD
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -113,7 +113,7 @@ PATCH VNFD in Individual VNF Package Content - Method not implemented
     ...    Test title: PATCH VNFD in Individual VNF Package Content - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update a VNFD
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -125,7 +125,7 @@ DELETE VNFD in Individual VNF Package Content - Method not implemented
     ...    Test title: DELETE VNFD in Individual VNF Package Content - Method not implemented
     ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNFD
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNFD is not deleted by the failed operation
@@ -138,7 +138,7 @@ Get single file VNFD in Individual OnBoarded VNF Package in Plain Format
     ...    Test title: Get single file VNFD in Individual OnBoarded VNF Package in Plain Format
     ...    Test objective: The objective is to test the retrieval of the VNFD in plain format for an individual OnBoarded VNF package and perform a validation that returned content is in plain format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The VNFD is implemented as a single file
     ...    Post-Conditions: none
@@ -151,7 +151,7 @@ Get VNFD in Individual OnBoarded VNF Package in Zip Format
     ...    Test title: Get VNFD in Individual OnBoarded VNF Package in Zip Format
     ...    Test objective: The objective is to test the retrieval of the VNFD in zip format for an individual OnBoarded VNF package and perform a validation that returned content is in zip format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -164,7 +164,7 @@ Get single file VNFD in Individual OnBoarded VNF Package in Plain or Zip Format
     ...    Test title: Get single file VNFD in Individual OnBoarded VNF Package in Plain or Zip Format
     ...    Test objective: The objective is to test the retrieval of the single file VNFD for an individual OnBoarded VNF package when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that returned content is in Plain or Zip format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The VNFD is implemented as a single file
     ...    Post-Conditions: none
@@ -177,7 +177,7 @@ Get multi file VNFD in Individual OnBoarded VNF Package in Plain or Zip Format
     ...    Test title: Get multi file VNFD in Individual OnBoarded VNF Package in Plain or Zip Format
     ...    Test objective: The objective is to test the retrieval of the multi file VNFD for an individual OnBoarded VNF package when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that returned content is in Zip format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The VNFD is implemented as a multi file
     ...    Post-Conditions: none
@@ -190,7 +190,7 @@ Get VNFD in Individual OnBoarded VNF Package with invalid resource identifier
     ...    Test title: Get VNFD in Individual OnBoarded VNF Package with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of the VNFD for an individual OnBoarded VNF package content fails when using an invalid resource identifier
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -202,7 +202,7 @@ Get VNFD in Individual OnBoarded VNF Package Content with conflict due to onboar
     ...    Test title: Get VNFD in Individual OnBoarded VNF Package Content with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of the VNFD for an individual OnBoarded VNF package content fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the VNF package for which the VNFD is requested is different from ONBOARDED.
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -215,7 +215,7 @@ POST VNFD in Individual OnBoarded VNF Package Content - Method not implemented
     ...    Test title: POST VNFD in Individual OnBoarded VNF Package Content - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new VNFD
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -227,7 +227,7 @@ PUT VNFD in Individual OnBoarded VNF Package Content - Method not implemented
     ...    Test title: PUT VNFD in Individual OnBoarded VNF Package Content - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNFD
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -239,7 +239,7 @@ PATCH VNFD in Individual OnBoarded VNF Package Content - Method not implemented
     ...    Test title: PATCH VNFD in Individual OnBoarded VNF Package Content - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update a VNFD
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -251,7 +251,7 @@ DELETE VNFD in Individual OnBoarded VNF Package Content - Method not implemented
     ...    Test title: DELETE VNFD in Individual OnBoarded VNF Package Content - Method not implemented
     ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNFD
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNFD is not deleted by the failed operation
@@ -264,7 +264,7 @@ Get multi file VNFD in Individual VNF Package with security information
     ...    Test title: Get multi file VNFD in Individual VNF Package with security information
     ...    Test objective: The objective is to test the retrieval of the multi file VNFD for an individual VNF package shall include in the ZIP archive the security information when requested with "include_signature" parameter, and perform a validation that returned content is in Zip format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The VNFD is implemented as a multi file
     ...    Post-Conditions: none
@@ -277,7 +277,7 @@ Get multi file VNFD in Individual OnBoarded VNF Package with security informatio
     ...    Test title: Get multi file VNFD in Individual OnBoarded VNF Package with security information
     ...    Test objective: The objective is to test the retrieval of the multi file VNFD for an individual OnBoarded VNF package shall include in the ZIP archive the security information when requested with "include_signature" parameter, and perform a validation that returned content is in Zip format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The VNFD is implemented as a multi file
     ...    Post-Conditions: none
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot b/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot
index c4c3b9496..6d40203bf 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot
@@ -11,7 +11,7 @@ Get VNF Package Artifact
     ...    Test title: Get VNF Package Artifact
     ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully, and perform a validation that returned content is in Zip format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -24,7 +24,7 @@ Get VNF Package Artifact with "exclude_all_mano_artifacts" parameter
     ...    Test title: Get VNF Package Artifact with "exclude_all_mano_artifacts" parameter
     ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and it doesnot contain additional MANO artifacts  when requested with "exclude_all_mano_artifacts" parameter
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -37,7 +37,7 @@ Get VNF Package Artifact with "exclude_all_non_mano_artifacts" parameter
     ...    Test title: Get VNF Package Artifact with "exclude_all_non_mano_artifacts" parameter
     ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and it doesnot contain non-MANO Artifacts when requested with "exclude_all_non_mano_artifacts" parameter
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ Get VNF Package Artifact with "select_non_mano_artifact_sets" parameter
     ...    Test title: Get VNF Package Artifact with "select_non_mano_artifact_sets" parameter
     ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and also contain non_MANO artifacts set when requested with "select_non_mano_artifact_sets" parameter
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -63,7 +63,7 @@ Get VNF Package Artifact with "include_signatures" parameter
     ...    Test title: Get VNF Package Artifact with "include_signatures" parameter
     ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and also contain security certificates when requested with "include_signature" parameter, and perform a validation that returned content is in Zip format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -76,7 +76,7 @@ Get VNF Package Artifact with Range Request and NFVO supporting Range Requests
     ...    Test title: Get VNF Package Artifact with Range Request and NFVO supporting Range Requests
     ...    Test objective: The objective is to test the GET request read the whole content of the archive containing the artifact files successfully when using a range request to return single range of bytes from the file, with the NFVO supporting it. The test also perform a validation that returned content matches the issued range
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
     ...    Post-Conditions: none
@@ -90,7 +90,7 @@ Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artif
     ...    Test title: Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "select_non_mano_artifact_sets"
     ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when both "exclude_all_non_mano_artifacts" and "select_non_mano_artifact_sets" are present in request
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -103,7 +103,7 @@ Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artif
     ...    Test title: Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "exclude_all_mano_artifactss"
     ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when both "exclude_all_non_mano_artifacts" and "exclude_all_mano_artifacts" are present in request
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -116,7 +116,7 @@ Get VNF Package Artifact with invalid URI parameters undifend select_non_mano_ar
     ...    Test title: Get VNF Package Artifact with invalid URI parameters undefined select_non_mano_artifact_sets
     ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when one or more value provided in "select_non_mano_artifact_sets" are not provided in Manifest.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -129,7 +129,7 @@ Get VNF Package Artifact with conflict due to onboarding state
     ...    Test title: Get VNF Package Artifact with conflict due to onboarding state
     ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the VNF package for which the content is requested is different from ONBOARDED.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -142,7 +142,7 @@ GET VNF Package Artifact with invalid Range Request
     ...    Test title: GET VNF Package Artifact with invalid Range Request
     ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when using a range request that does not match any available byte range in the file.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
     ...    Post-Conditions: none      
@@ -154,7 +154,7 @@ POST VNF Package Artifact - Method not implemented
     ...    Test title: POST VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new VNF Package artifact
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.5a.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -166,7 +166,7 @@ PUT VNF Package Artifact - Method not implemented
     ...    Test title: PUT VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNF Package artifact
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -178,7 +178,7 @@ PATCH VNF Package Artifact - Method not implemented
     ...    Test title: PATCH VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that PATCH  method is not allowed to update a VNF Package artifact
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -190,7 +190,7 @@ DELETE VNF Package Artifact - Method not implemented
     ...    Test title: DELETE VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNF Package artifact
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package artifact is not deleted by the failed operation
@@ -203,7 +203,7 @@ Get OnBoarded VNF Package Artifact
     ...    Test title: Get OnBoarded VNF Package Artifact
     ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the OnBoarded VNF Package Artifact files successfully, and perform a validation that returned content is in Zip format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -216,7 +216,7 @@ Get OnBoarded VNF Package Artifact with "exclude_all_mano_artifacts" parameter
     ...    Test title: Get OnBoarded VNF Package Artifact with "exclude_all_mano_artifacts" parameter
     ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the OnBoarded VNF Package Artifact files successfully and it doesnot contain additional MANO artifacts  when requested with "exclude_all_mano_artifacts" parameter
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -229,7 +229,7 @@ Get OnBoarded VNF Package Artifact with "exclude_all_non_mano_artifacts" paramet
     ...    Test title: Get OnBoarded VNF Package Artifact with "exclude_all_non_mano_artifacts" parameter
     ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the OnBoarded VNF Package artifact files successfully and it doesnot contain non-MANO Artifacts when requested with "exclude_all_non_mano_artifacts" parameter
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -242,7 +242,7 @@ Get OnBoarded VNF Package Artifact with "select_non_mano_artifact_sets" paramete
     ...    Test title: Get OnBoarded VNF Package Artifact with "select_non_mano_artifact_sets" parameter
     ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the OnBoarded VNF Package artifact files successfully and also contain non_MANO artifacts set when requested with "select_non_mano_artifact_sets" parameter
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -255,7 +255,7 @@ Get OnBoarded VNF Package Artifact with "include_signatures" parameter
     ...    Test title: Get OnBoarded VNF Package Artifact with "include_signatures" parameter
     ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the OnBoarded VNF Package artifact files successfully and also contain security certificates when requested with "include_signature" parameter, and perform a validation that returned content is in Zip format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -268,7 +268,7 @@ Get OnBoarded VNF Package Artifact with Range Request and NFVO supporting Range
     ...    Test title: Get OnBoarded VNF Package Artifact with Range Request and NFVO supporting Range Requests
     ...    Test objective: The objective is to test the GET request read the whole content of the archive containing the OnBoarded VNF Package artifact files successfully when using a range request to return single range of bytes from the file, with the NFVO supporting it. The test also perform a validation that returned content matches the issued range
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
     ...    Post-Conditions: none
@@ -282,7 +282,7 @@ Get OnBoarded VNF Package Artifact with invalid URI parameters "exclude_all_non_
     ...    Test title: Get OnBoarded VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "select_non_mano_artifact_sets"
     ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the OnBoarded VNF Package artifact files fails when both "exclude_all_non_mano_artifacts" and "select_non_mano_artifact_sets" are present in request
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -295,7 +295,7 @@ Get OnBoarded VNF Package Artifact with invalid URI parameters "exclude_all_non_
     ...    Test title: Get OnBoarded VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "exclude_all_mano_artifactss"
     ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the OnBoarded VNF Package artifact files fails when both "exclude_all_non_mano_artifacts" and "exclude_all_mano_artifacts" are present in request
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -308,7 +308,7 @@ Get OnBoarded VNF Package Artifact with invalid URI parameters undifend select_n
     ...    Test title: Get OnBoarded VNF Package Artifact with invalid URI parameters undefined select_non_mano_artifact_sets
     ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the OnBoarded VNF Package artifact files fails when one or more value provided in "select_non_mano_artifact_sets" are not provided in Manifest.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -321,7 +321,7 @@ Get OnBoarded VNF Package Artifact with conflict due to onboarding state
     ...    Test title: Get OnBoarded VNF Package Artifact with conflict due to onboarding state
     ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the OnBoarded VNF Package artifact files fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the VNF package for which the content is requested is different from ONBOARDED.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -334,7 +334,7 @@ GET OnBoarded VNF Package Artifact with invalid Range Request
     ...    Test title: GET OnBoarded VNF Package Artifact with invalid Range Request
     ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the OnBoarded VNF Package artifact files fails when using a range request that does not match any available byte range in the file.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
     ...    Post-Conditions: none      
@@ -346,7 +346,7 @@ POST OnBoarded VNF Package Artifact - Method not implemented
     ...    Test title: POST OnBoarded VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new VNF Package artifact
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.5a.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -358,7 +358,7 @@ PUT OnBoarded VNF Package Artifact - Method not implemented
     ...    Test title: PUT OnBoarded VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNF Package artifact
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -370,7 +370,7 @@ PATCH OnBoarded VNF Package Artifact - Method not implemented
     ...    Test title: PATCH OnBoarded VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that PATCH  method is not allowed to update a VNF Package artifact
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5a.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -382,7 +382,7 @@ DELETE OnBoarded VNF Package Artifact - Method not implemented
     ...    Test title: DELETE OnBoarded VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNF Package artifact
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package artifact is not deleted by the failed operation
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageContent.robot b/SOL003/VNFPackageManagement-API/VNFPackageContent.robot
index 856c54c2e..7ab90b549 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageContent.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageContent.robot
@@ -12,7 +12,7 @@ GET Individual VNF Package Content
     ...    Test title: GET Individual VNF Package Content
     ...    Test objective: The objective is to test the retrieval of an individual VNF package content and perform a validation that returned content is in zip format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ GET Individual VNF Package Content with Range Request and NFVO supporting Range
     ...    Test title: GET Individual VNF Package Content with Range Request and NFVO supporting Range Requests
     ...    Test objective: The objective is to test the retrieval of an individual VNF package content when using a range request to return single range of bytes from the file, with the NFVO supporting it. The test also perform a validation that returned content matches the issued range
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package file
     ...    Post-Conditions: none
@@ -40,7 +40,7 @@ GET Individual VNF Package Content with Range Request and NFVO not supporting Ra
     ...    Test title: GET Individual VNF Package Content with Range Request and NFVO not supporting Range Requests
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package content, when using a range request to return single range of bytes from the file and the NFVO not supporting it, returns the full VNF Package file.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO does not support range requests to return single range of bytes from the VNF package file
     ...    Post-Conditions: none    
@@ -53,7 +53,7 @@ GET Individual VNF Package Content with invalid Range Request
     ...    Test title: GET Individual VNF Package Content with invalid Range Request
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package content fails when using a range request that does not match any available byte range in the file.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package file
     ...    Post-Conditions: none      
@@ -65,7 +65,7 @@ GET Individual VNF Package Content with invalid resource identifier
     ...    Test title: GET Individual VNF Package Content with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package content fails when using an invalid resource identifier
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -77,7 +77,7 @@ GET Individual VNF Package Content with conflict due to onboarding state
     ...    Test title: GET Individual VNF Package Content with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package content fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the VNF package for which the content is requested is different from ONBOARDED.
-    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -90,7 +90,7 @@ POST Individual VNF Package Content - Method not implemented
     ...    Test title: POST Individual VNF Package Content - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new VNF Package content
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.5.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.3.5.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -102,7 +102,7 @@ PUT Individual VNF Package Content - Method not implemented
     ...    Test title: PUT Individual VNF Package Content - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNF Package content
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.3.5.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.3.5.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -114,7 +114,7 @@ PATCH Individual VNF Package Content - Method not implemented
     ...    Test title: PATCH Individual VNF Package Content - Method not implemented
     ...    Test objective: The objective is to test that PATCH  method is not allowed to update a VNF Package content
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.3.5.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.3.5.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -126,7 +126,7 @@ DELETE Individual VNF Package Content - Method not implemented
     ...    Test title: DELETE Individual VNF Package Content - Method not implemented
     ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNF Package content
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.3.5.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.3.5.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package content is not deleted by the failed operation
@@ -139,7 +139,7 @@ GET Individual OnBoarded VNF Package Content
     ...    Test title: GET Individual OnBoarded VNF Package Content
     ...    Test objective: The objective is to test the retrieval of an individual OnBoarded VNF package content and perform a validation that returned content is in zip format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -152,7 +152,7 @@ GET Individual OnBoarded VNF Package Content with Range Request and NFVO support
     ...    Test title: GET Individual OnBoarded VNF Package Content with Range Request and NFVO supporting Range Requests
     ...    Test objective: The objective is to test the retrieval of an individual OnBoarded VNF package content when using a range request to return single range of bytes from the file, with the NFVO supporting it. The test also perform a validation that returned content matches the issued range
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package file
     ...    Post-Conditions: none
@@ -167,7 +167,7 @@ GET Individual OnBoarded VNF Package Content with Range Request and NFVO not sup
     ...    Test title: GET Individual OnBoarded VNF Package Content with Range Request and NFVO not supporting Range Requests
     ...    Test objective: The objective is to test that the retrieval of an individual OnBoarded VNF package content, when using a range request to return single range of bytes from the file and the NFVO not supporting it, returns the full VNF Package file.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO does not support range requests to return single range of bytes from the VNF package file
     ...    Post-Conditions: none    
@@ -180,7 +180,7 @@ GET Individual OnBoarded VNF Package Content with invalid Range Request
     ...    Test title: GET Individual OnBoarded VNF Package Content with invalid Range Request
     ...    Test objective: The objective is to test that the retrieval of an individual OnBoarded VNF package content fails when using a range request that does not match any available byte range in the file.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package file
     ...    Post-Conditions: none      
@@ -192,7 +192,7 @@ GET Individual OnBoarded VNF Package Content with invalid resource identifier
     ...    Test title: GET Individual OnBoarded VNF Package Content with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual OnBoarded VNF package content fails when using an invalid resource identifier
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -204,7 +204,7 @@ GET Individual OnBoarded VNF Package Content with conflict due to onboarding sta
     ...    Test title: GET Individual OnBoarded VNF Package Content with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package content fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the VNF package for which the content is requested is different from ONBOARDED.
-    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -217,7 +217,7 @@ POST Individual OnBoarded VNF Package Content - Method not implemented
     ...    Test title: POST Individual OnBoarded VNF Package Content - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new VNF Package content
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.5.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.3.5.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -229,7 +229,7 @@ PUT Individual OnBoarded VNF Package Content - Method not implemented
     ...    Test title: PUT Individual OnBoarded VNF Package Content - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNF Package content
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.3.5.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.3.5.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -241,7 +241,7 @@ PATCH Individual OnBoarded VNF Package Content - Method not implemented
     ...    Test title: PATCH Individual OnBoarded VNF Package Content - Method not implemented
     ...    Test objective: The objective is to test that PATCH  method is not allowed to update a VNF Package content
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.3.5.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.3.5.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -253,7 +253,7 @@ DELETE Individual OnBoarded VNF Package Content - Method not implemented
     ...    Test title: DELETE Individual OnBoarded VNF Package Content - Method not implemented
     ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNF Package content
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.3.5.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.3.5.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package content is not deleted by the failed operation
diff --git a/SOL003/VNFPackageManagement-API/VNFPackages.robot b/SOL003/VNFPackageManagement-API/VNFPackages.robot
index 0e55fa20c..f2d5a2197 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackages.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackages.robot
@@ -12,7 +12,7 @@ GET all VNF Packages
     ...    Test title: GET all VNF Packages
     ...    Test objective: The objective is to test the retrieval of all the available VNF packages information and perform a JSON schema and content validation of the collected data structure
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -28,7 +28,7 @@ GET VNF Packages with attribute-based filter
     ...    Test title: GET VNF Packages with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of VNF packages using attribute-based filter, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued attribute-based filter
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -42,7 +42,7 @@ GET VNF Packages with invalid attribute-based filter
     ...    Test title: GET VNF Packages with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of VNF packages fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -55,7 +55,7 @@ GET VNF Packages with "all_fields" attribute selector
     ...    Test title: GET VNF Packages with "all_fields" attribute selector
     ...    Test objective: The objective is to test the retrieval of VNF packages with "all_fields" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "all_fileds" selector
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -69,7 +69,7 @@ GET VNF Packages with "exclude_default" attribute selector
     ...    Test title: GET VNF Packages with exclude_default attribute selector
     ...    Test objective: The objective is to test the retrieval of VNF packages with "exclude_default" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "exclude_default" selector
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none        
@@ -83,7 +83,7 @@ GET VNF Packages with "fields" attribute selector
     ...    Test title: GET VNF Packages with fields attribute selector
     ...    Test objective: The objective is to test the retrieval of VNF packages with "fields" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "fields" selector
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The VNFM supports the use of fields attribute selector
     ...    Post-Conditions: none
@@ -97,7 +97,7 @@ GET VNF Packages with "exclude_fields" attribute selector
     ...    Test title: GET VNF Packages with exclude_fields attribute selector
     ...    Test objective: The objective is to test the retrieval of VNF packages with "exclude_fields" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "exclude_fields" selector
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The VNFM supports the use of exclude_fields attribute selector
     ...    Post-Conditions: none
@@ -111,7 +111,7 @@ GET all VNF Packages with invalid resource endpoint
     ...    Test title: GET VNF Packages with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of VNF packages fails when using invalid resource endpoint
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -123,7 +123,7 @@ POST all VNF Packages - Method not implemented
     ...    Test title: POST all VNF Packages - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new VNF Packages
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -135,7 +135,7 @@ PUT all VNF Packages - Method not implemented
     ...    Test title: PUT all VNF Packages - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify existing VNF Packages
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -147,7 +147,7 @@ PATCH all VNF Packages - Method not implemented
     ...    Test title: PATCH all VNF Packages - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update existing VNF Packages
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -159,7 +159,7 @@ DELETE all VNF Packages - Method not implemented
     ...    Test title: DELETE all VNF Packages - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete existing VNF Packages
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Packages are not deleted by the failed operation
@@ -172,7 +172,7 @@ GET all VNF Packages as a Paged Response
     ...    Test title: GET all VNF Packages as a Paged Response
     ...    Test objective: The objective is to test the retrieval of all the available VNF packages information as a Paged Response.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -185,7 +185,7 @@ GET VNF Packages - Bad Request Response too Big
     ...    Test title: GET VNF Packages - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of VNF packages fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -198,7 +198,7 @@ GET all OnBoarded VNF Packages
     ...    Test title: GET all OnBoarded VNF Packages
     ...    Test objective: The objective is to test the retrieval of all the available onboarded VNF packages information and perform a JSON schema and content validation of the collected data structure
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -214,7 +214,7 @@ GET OnBoarded VNF Packages with attribute-based filter
     ...    Test title: GET OnBoarded VNF Packages with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of OnBoarded VNF packages using attribute-based filter, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued attribute-based filter
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -228,7 +228,7 @@ GET OnBoarded VNF Packages with invalid attribute-based filter
     ...    Test title: GET OnBoarded VNF Packages with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of OnBoarded VNF packages fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -241,7 +241,7 @@ GET OnBoarded VNF Packages with "all_fields" attribute selector
     ...    Test title: GET OnBoarded VNF Packages with "all_fields" attribute selector
     ...    Test objective: The objective is to test the retrieval of OnBoarded VNF packages with "all_fields" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "all_fileds" selector
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 4.3.3.2.1, 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 4.3.3.2.1, 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -255,7 +255,7 @@ GET OnBoarded VNF Packages with "exclude_default" attribute selector
     ...    Test title: GET OnBoarded VNF Packages with exclude_default attribute selector
     ...    Test objective: The objective is to test the retrieval of OnBoarded VNF packages with "exclude_default" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "exclude_default" selector
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 4.3.3.2.1, 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 4.3.3.2.1, 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none        
@@ -269,7 +269,7 @@ GET OnBoarded VNF Packages with "fields" attribute selector
     ...    Test title: GET OnBoarded VNF Packages with fields attribute selector
     ...    Test objective: The objective is to test the retrieval of OnBoarded VNF packages with "fields" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "fields" selector
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 4.3.3.2.1, 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 4.3.3.2.1, 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The VNFM supports the use of fields attribute selector
     ...    Post-Conditions: none
@@ -283,7 +283,7 @@ GET OnBoarded VNF Packages with "exclude_fields" attribute selector
     ...    Test title: GET OnBoarded VNF Packages with exclude_fields attribute selector
     ...    Test objective: The objective is to test the retrieval of OnBoarded VNF packages with "exclude_fields" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "exclude_fields" selector
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 4.3.3.2.1, 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 4.3.3.2.1, 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The VNFM supports the use of exclude_fields attribute selector
     ...    Post-Conditions: none
@@ -297,7 +297,7 @@ GET all OnBoarded VNF Packages with invalid resource endpoint
     ...    Test title: GET OnBoarded VNF Packages with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of OnBoarded VNF packages fails when using invalid resource endpoint
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -309,7 +309,7 @@ POST all OnBoarded VNF Packages - Method not implemented
     ...    Test title: POST all OnBoarded VNF Packages - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new OnBoarded VNF Packages
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -321,7 +321,7 @@ PUT all OnBoarded VNF Packages - Method not implemented
     ...    Test title: PUT all OnBoarded VNF Packages - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify existing OnBoarded VNF Packages
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -333,7 +333,7 @@ PATCH all OnBoarded VNF Packages - Method not implemented
     ...    Test title: PATCH all OnBoarded VNF Packages - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update existing OnBoarded VNF Packages
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -345,7 +345,7 @@ DELETE all OnBoarded VNF Packages - Method not implemented
     ...    Test title: DELETE all OnBoarded VNF Packages - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete existing OnBoarded VNF Packages
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Packages are not deleted by the failed operation
@@ -358,7 +358,7 @@ GET all OnBoarded VNF Packages as a Paged Response
     ...    Test title: GET all OnBoarded VNF Packages as a Paged Response
     ...    Test objective: The objective is to test the retrieval of all the available OnBoarded VNF packages information as a Paged Response.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -371,7 +371,7 @@ GET OnBoarded VNF Packages - Bad Request Response too Big
     ...    Test title: GET OnBoarded VNF Packages - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of OnBoarded VNF packages fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
-- 
GitLab


From 3713af86b2a89f99274909f5898f855b42ac3e1e Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Fri, 9 Oct 2020 12:48:26 +0500
Subject: [PATCH 066/322] templating, minor fix and new testcases added

---
 .../IndividualSubscription.robot              |  14 +--
 .../IndividualVNFPackage.robot                |  10 +-
 .../IndividualVNFPackageArtifacts.robot       |   8 +-
 .../Subscriptions.robot                       |   8 +-
 .../VNFDInIndividualVNFPackage.robot          |   8 +-
 .../VNFPackageArtifacts.robot                 |   8 +-
 .../VNFPackageContent.robot                   |   9 +-
 .../VNFPackageManagementKeywords.robot        | 113 ++++++------------
 .../VNFPackages.robot                         |  36 +++++-
 .../jsons/subscriptions.json                  |   6 +-
 10 files changed, 95 insertions(+), 125 deletions(-)

diff --git a/SOL003/VNFPackageManagement-API/IndividualSubscription.robot b/SOL003/VNFPackageManagement-API/IndividualSubscription.robot
index 2835612a5..495e972ec 100644
--- a/SOL003/VNFPackageManagement-API/IndividualSubscription.robot
+++ b/SOL003/VNFPackageManagement-API/IndividualSubscription.robot
@@ -54,10 +54,9 @@ POST Individual VNF Package Subscription - Method not implemented
     ...    Reference: Clause 10.4.8.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Package Subscription is not created on the NFVO
+    ...    Post-Conditions: none
     Send Post request for individual VNF Package Subscription
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Package Subscription is not Created
 
 PUT Individual VNF Package Subscription - Method not implemented
     [Documentation]    Test ID: 7.3.3.7.5
@@ -67,10 +66,9 @@ PUT Individual VNF Package Subscription - Method not implemented
     ...    Reference: Clause 10.4.8.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Package subscription is not modified by the operation
+    ...    Post-Conditions: none
     Send Put request for individual VNF Package Subscription
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Package Subscription is Unmodified (Implicit)
 
 PATCH Individual VNF Package Subscription - Method not implemented
     [Documentation]    Test ID: 7.3.3.7.6
@@ -80,10 +78,9 @@ PATCH Individual VNF Package Subscription - Method not implemented
     ...    Reference: Clause 10.4.8.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Package subscription is not modified by the operation
+    ...    Post-Conditions: none
     Send Patch request for individual VNF Package Subscription
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Package Subscription is Unmodified (Implicit)
 
 DELETE Individual VNF Package Subscription
     [Documentation]    Test ID: 7.3.3.7.7
@@ -93,7 +90,6 @@ DELETE Individual VNF Package Subscription
     ...    Reference: Clause 10.4.8.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Package Subscription is not available anymore in the NFVO    
+    ...    Post-Conditions: none   
     Send Delete request for individual VNF Package Subscription
-    Check HTTP Response Status Code Is    204
-    Check Postcondition VNF Package Subscription is Deleted
\ No newline at end of file
+    Check HTTP Response Status Code Is    204
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/IndividualVNFPackage.robot b/SOL003/VNFPackageManagement-API/IndividualVNFPackage.robot
index f6cf4b76e..a5409db81 100644
--- a/SOL003/VNFPackageManagement-API/IndividualVNFPackage.robot
+++ b/SOL003/VNFPackageManagement-API/IndividualVNFPackage.robot
@@ -32,6 +32,7 @@ GET Individual VNF Package with invalid resource identifier
     ...    Post-Conditions: none    
     GET Individual VNF Package with invalid resource identifier
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 POST Individual VNF Package - Method not implemented
     [Documentation]    Test ID: 7.3.3.2.3
@@ -77,10 +78,9 @@ DELETE Individual VNF Package - Method not implemented
     ...    Reference: Clause 10.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Package is not deleted by the failed operation
+    ...    Post-Conditions: none
     Send DELETE Request for individual VNF Package
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Package Exist
     
 GET Individual OnBoarded VNF Package
     [Documentation]    Test ID: 7.3.3.2.7
@@ -107,6 +107,7 @@ GET Individual OnBoarded VNF Package with invalid resource identifier
     ...    Post-Conditions: none    
     GET Individual OnBoarded VNF Package with invalid resource identifier
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 POST Individual OnBoarded VNF Package - Method not implemented
     [Documentation]    Test ID: 7.3.3.2.9
@@ -152,7 +153,6 @@ DELETE Individual OnBoarded VNF Package - Method not implemented
     ...    Reference: Clause 10.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Package is not deleted by the failed operation
+    ...    Post-Conditions: none
     Send DELETE Request for individual OnBoarded VNF Package
-    Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Package Exist
\ No newline at end of file
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot b/SOL003/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot
index 7acd8f4bf..ae798271a 100644
--- a/SOL003/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot
+++ b/SOL003/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot
@@ -81,6 +81,7 @@ GET Individual VNF Package Artifact with invalid resource identifier
     ...    Post-Conditions: none    
     GET Individual VNF Package Artifact with invalid resource identifier
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 GET Individual VNF Package Artifact with conflict due to onboarding state
     [Documentation]    Test ID: 7.3.3.5.7
@@ -139,10 +140,9 @@ DELETE Individual VNF Package Artifact - Method not implemented
     ...    Reference: Clause 10.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Package artifact is not deleted by the failed operation
+    ...    Post-Conditions: none
     Send DELETE Request for individual VNF Package Artifact
     Check HTTP Response Status Code Is    405
-    Check Postcondition Individual VNF Package Artifact Exist
 
 GET Individual OnBoarded VNF Package Artifact
     [Documentation]    Test ID: 7.3.3.5.12
@@ -218,6 +218,7 @@ GET Individual OnBoarded VNF Package Artifact with invalid resource identifier
     ...    Post-Conditions: none    
     GET Individual OnBoarded VNF Package Artifact with invalid resource identifier
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 GET Individual OnBoarded VNF Package Artifact with conflict due to onboarding state
     [Documentation]    Test ID: 7.3.3.5.18
@@ -276,10 +277,9 @@ DELETE Individual OnBoarded VNF Package Artifact - Method not implemented
     ...    Reference: Clause 10.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Package artifact is not deleted by the failed operation
+    ...    Post-Conditions: none
     Send DELETE Request for individual OnBoarded VNF Package Artifact
     Check HTTP Response Status Code Is    405
-    Check Postcondition Individual OnBoarded VNF Package Artifact Exist
 
 GET Individual VNF Package Artifact with security information
     [Documentation]    Test ID: 7.3.3.5.23
diff --git a/SOL003/VNFPackageManagement-API/Subscriptions.robot b/SOL003/VNFPackageManagement-API/Subscriptions.robot
index ae20f847b..174ab56d4 100644
--- a/SOL003/VNFPackageManagement-API/Subscriptions.robot
+++ b/SOL003/VNFPackageManagement-API/Subscriptions.robot
@@ -25,7 +25,6 @@ Get All VNF Package Subscriptions
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    PkgmSubscriptions
 
-
 Get VNF Package Subscriptions with attribute-based filter
     [Documentation]    Test ID: 7.3.3.6.2
     ...    Test title: Get VNF Package Subscriptions with attribute-based filter
@@ -40,7 +39,6 @@ Get VNF Package Subscriptions with attribute-based filter
     Check HTTP Response Body Json Schema Is    PkgmSubscription
     Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filter
 
-
 Get VNF Package Subscriptions with invalid attribute-based filter
     [Documentation]    Test ID: 7.3.3.6.3
     ...    Test title: Get VNF Package Subscriptions with attribute-based filters
@@ -65,6 +63,7 @@ GET VNF Package Subscription with invalid resource endpoint
     ...    Post-Conditions: none    
     Get VNF Package Subscriptions with invalid resource endpoint
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 Create new VNF Package subscription
     [Documentation]    Test ID: 7.3.3.6.5
@@ -147,10 +146,9 @@ DELETE VNF Package Subscriptions - Method not implemented
     ...    Reference: Clause 10.4.7.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The VNF package subscriptions are not deleted by the failed operation 
+    ...    Post-Conditions: none
     Send Delete Request for VNF Package Subscriptions
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Package Subscriptions Exists
     
 Get All VNF Package Subscriptions as Paged Response
     [Documentation]    Test ID: 7.3.3.6.11
@@ -163,7 +161,7 @@ Get All VNF Package Subscriptions as Paged Response
     ...    Post-Conditions: none    
     Get all VNF Package Subscriptions
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contain Link
 
 Get VNF Package Subscriptions - Bad Request Response too Big
     [Documentation]    Test ID: 7.3.3.6.12
diff --git a/SOL003/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot b/SOL003/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
index 6c5fc0064..dce75ae61 100644
--- a/SOL003/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
+++ b/SOL003/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
@@ -128,10 +128,9 @@ DELETE VNFD in Individual VNF Package Content - Method not implemented
     ...    Reference: Clause 10.4.4.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The VNFD is not deleted by the failed operation
+    ...    Post-Conditions: none
     Send DELETE Request for VNFD in individual VNF Package
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNFD Exist
 
 Get single file VNFD in Individual OnBoarded VNF Package in Plain Format
     [Documentation]    Test ID: 7.3.3.4.12
@@ -254,10 +253,9 @@ DELETE VNFD in Individual OnBoarded VNF Package Content - Method not implemented
     ...    Reference: Clause 10.4.4.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The VNFD is not deleted by the failed operation
+    ...    Post-Conditions: none
     Send DELETE Request for VNFD in individual OnBoarded VNF Package
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNFD Exist
     
 Get multi file VNFD in Individual VNF Package with security information
     [Documentation]    Test ID: 7.3.3.4.23
@@ -283,4 +281,4 @@ Get multi file VNFD in Individual OnBoarded VNF Package with security informatio
     ...    Post-Conditions: none
     Get multi file VNFD in Individual OnBoarded VNF Package with security information
     Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
+    Check HTTP Response Header Content-Type Is    application/zip
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot b/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot
index 6d40203bf..35a1ad73a 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot
@@ -193,10 +193,9 @@ DELETE VNF Package Artifact - Method not implemented
     ...    Reference: Clause 10.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Package artifact is not deleted by the failed operation
+    ...    Post-Conditions: none
     Send DELETE Request for VNF Package Artifact
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Package Artifact Exist
     
 Get OnBoarded VNF Package Artifact
     [Documentation]    Test ID: 7.3.3.11.16
@@ -385,7 +384,6 @@ DELETE OnBoarded VNF Package Artifact - Method not implemented
     ...    Reference: Clause 10.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Package artifact is not deleted by the failed operation
+    ...    Post-Conditions: none
     Send DELETE Request for OnBoarded VNF Package Artifact
-    Check HTTP Response Status Code Is    405
-    Check Postcondition OnBoarded VNF Package Artifact Exist
\ No newline at end of file
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageContent.robot b/SOL003/VNFPackageManagement-API/VNFPackageContent.robot
index 7ab90b549..8a9d9c332 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageContent.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageContent.robot
@@ -71,6 +71,7 @@ GET Individual VNF Package Content with invalid resource identifier
     ...    Post-Conditions: none    
     GET Individual VNF Package Content with invalid resource identifier
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 GET Individual VNF Package Content with conflict due to onboarding state
     [Documentation]    Test ID: 7.3.3.3.6
@@ -129,10 +130,9 @@ DELETE Individual VNF Package Content - Method not implemented
     ...    Reference: Clause 10.4.3.5.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Package content is not deleted by the failed operation
+    ...    Post-Conditions: none
     Send DELETE Request for individual VNF Package
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Package Content Exist
     
 GET Individual OnBoarded VNF Package Content
     [Documentation]    Test ID: 7.3.3.3.11
@@ -256,7 +256,6 @@ DELETE Individual OnBoarded VNF Package Content - Method not implemented
     ...    Reference: Clause 10.4.3.5.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Package content is not deleted by the failed operation
+    ...    Post-Conditions: none
     Send DELETE Request for individual OnBoarded VNF Package
-    Check HTTP Response Status Code Is    405
-    GET Individual OnBoarded VNF Package Content
\ No newline at end of file
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 5e8ec3024..96beb3dd2 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -126,6 +126,25 @@ Check HTTP Response Body vnfPkgsInfo Matches the requested fields selector
     Validate Json    additionalArtifacts.schema.json    ${additional_artifacts[0]}
     Log    Validation for additionalArtifacts schema OK
     
+GET VNF Packages with fields and exclude_default attribute selector
+    Log    Trying to get all VNF Packages present in the NFVO Catalogue, using fields
+    Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages?fields=${fields}&exclude_default
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Check HTTP Response Body vnfPkgsInfo Matches the requested fields and exclude_default selector
+    Log    Trying to validate softwareImages schema
+    ${softwareImages}=    Get Value From Json    ${response['body']}    $..softwareImages
+    Validate Json    softwareImage.schema.json    ${softwareImages[0]}
+    Log    Validation for softwareImage schema OK
+    Log    Trying to validate additionalArtifacts schema
+    ${additional_artifacts}=    Get Value From Json    ${response['body']}    $..additionalArtifacts
+    Validate Json    additionalArtifacts.schema.json    ${additional_artifacts[0]}
+    Log    Validation for additionalArtifacts schema OK
+    
 GET VNF Packages with exclude_fields attribute selector
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using fields
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
@@ -185,10 +204,6 @@ Send DELETE Request for all VNF Packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
-Check Postcondition VNF Packages Exist
-    Log    Checking that Pm Job still exists
-    GET all VNF Packages
-
 GET Individual VNF Package
     Log    Trying to get a VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
@@ -241,10 +256,6 @@ Send DELETE Request for individual VNF Package
     DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
-
-Check Postcondition VNF Package Exist
-    Log    Checking that vnf pacakge still exists
-    GET Individual VNF Package
     
 GET Individual VNF Package Content  
     Log    Trying to get a VNF Package Content
@@ -338,10 +349,6 @@ Send DELETE Request for individual VNF Package Content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
-Check Postcondition VNF Package Content Exist
-    Log    Checking that vnf pacakge still exists
-    GET Individual VNF Package Content
-
 Get all VNF Package Subscriptions
     Log    Trying to get the list of subscriptions
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
@@ -378,7 +385,8 @@ Send Post Request for VNF Package Subscription
     Log    Trying to create a new subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    ${body}=    Get File    jsons/subscriptions.json
+    ${template}=    Get File    jsons/subscriptions.json
+    ${body}=        Format String   ${template}    callbackUri=${callbackUri} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${output}=    Output    response
@@ -390,7 +398,8 @@ Send Post Request for Duplicated VNF Package Subscription
     Log    Trying to create a subscription with an already created content
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    ${body}=    Get File    jsons/subscriptions.json
+    ${template}=    Get File    jsons/subscriptions.json
+    ${body}=        Format String   ${template}    callbackUri=${callbackUri} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${output}=    Output    response
@@ -418,11 +427,7 @@ Send Delete Request for VNF Package Subscriptions
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
     ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output} 
-
-Check Postcondition VNF Package Subscriptions Exists
-    Log    Checking that subscriptions exists
-    Get all VNF Package Subscriptions    
+    Set Suite Variable    ${response}    ${output}    
 
 Get single file VNFD in Individual VNF Package in Plain Format
     Log    Trying to get a VNFD from a given VNF Package present in the NFVO Catalogue
@@ -520,14 +525,6 @@ Send DELETE Request for VNFD in individual VNF Package
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
-Check Postcondition VNFD Exist
-    Log    Checking that vnf pacakge still exists
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
-    Check HTTP Response Status Code Is    200
-
 GET Individual VNF Package Artifact
     Log    Trying to get a VNF Package Artifact
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
@@ -606,13 +603,6 @@ Send DELETE Request for individual VNF Package Artifact
     DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
-
-Check Postcondition Individual VNF Package Artifact Exist
-    Log    Checking that vnf pacakge still exists
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
-    Check HTTP Response Status Code Is    200
     
 Check HTTP Response Status Code Is
     [Arguments]    ${expected_status}    
@@ -697,12 +687,7 @@ Send Delete request for individual VNF Package Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-Check Postcondition VNF Package Subscription is Deleted
-    Log    Check Postcondition Subscription is deleted
-    GET individual VNF Package Subscription
-    Check HTTP Response Status Code Is    404 
+    Set Suite Variable    ${response}    ${output} 
 
 Send Delete request for individual VNF Package Subscription with invalid resource identifier
     Log    Trying to perform a DELETE on a subscriptionId which doesn't exist
@@ -735,23 +720,6 @@ Send Patch request for individual VNF Package Subscription
     PATCH    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
-   
-Check Postcondition VNF Package Subscription is Unmodified (Implicit)
-    Log    Check postconidtion subscription not modified
-    GET individual VNF Package Subscription
-    Log    Check Response matches original VNF Threshold
-    ${subscription}=    evaluate    json.loads('''${response['body']}''')    json
-    Should Be Equal    ${origResponse['body']['id']}    ${subscription.id}
-    Should Be Equal    ${origResponse['body']['callbackUri']}    ${subscription.callbackUri}
-
-Check Postcondition VNF Package Subscription is not Created
-    Log    Trying to get a new subscription
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${newSubscriptionId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    Check HTTP Response Status Code Is    404
 
 Check HTTP Response Header Contains
     [Arguments]    ${CONTENT_TYPE}
@@ -768,8 +736,7 @@ Create Sessions
     Start Process  java  -jar  ${MOCK_SERVER_JAR}    -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
     Create Mock Session  ${callback_uri}:${callback_port}
-    
-    
+        
 Check Notification Endpoint
     &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}    
     &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
@@ -777,7 +744,7 @@ Check Notification Endpoint
     Wait Until Keyword Succeeds    ${total_polling_time}   ${polling_interval}   Verify Mock Expectation    ${notification_request}
     Clear Requests  ${callback_endpoint}
     
-Check LINK in Header
+Check HTTP Response Header Contain Link
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
 
@@ -1141,13 +1108,6 @@ Send DELETE Request for individual OnBoarded VNF Package Artifact
     DELETE    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
-
-Check Postcondition Individual OnBoarded VNF Package Artifact Exist
-    Log    Checking that vnf pacakge still exists
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
-    Check HTTP Response Status Code Is    200
     
 Get multi file VNFD in Individual OnBoarded VNF Package with security information
     Log    Trying to get a VNFD from a given OnBoarded VNF Package present in the NFVO Catalogue
@@ -1443,13 +1403,6 @@ Send DELETE Request for VNF Package Artifact
     DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
-
-Check Postcondition VNF Package Artifact Exist
-    Log    Checking that vnf pacakge still exists
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
-    Check HTTP Response Status Code Is    200
  
 Get Artifact in OnBoarded VNF Package
     Log    Trying to get Artifact in OnBoarded VNF Package
@@ -1565,10 +1518,12 @@ Send DELETE Request for OnBoarded VNF Package Artifact
     DELETE    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
-
-Check Postcondition OnBoarded VNF Package Artifact Exist
-    Log    Checking that OnBoarded vnf pacakge still exists
+    
+GET OnBoarded VNF Packages with fields and exclude_default attribute selector
+    Log    Trying to get all OnBoarded VNF Packages present in the NFVO Catalogue, using fields
+    Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
-    Check HTTP Response Status Code Is    200
\ No newline at end of file
+    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages?fields=${fields}&exclude_default
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/VNFPackages.robot b/SOL003/VNFPackageManagement-API/VNFPackages.robot
index f2d5a2197..f910cbd3b 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackages.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackages.robot
@@ -162,10 +162,9 @@ DELETE all VNF Packages - Method not implemented
     ...    Reference: Clause 10.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Packages are not deleted by the failed operation
+    ...    Post-Conditions: none
     Send DELETE Request for all VNF Packages
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Packages Exist
     
 GET all VNF Packages as a Paged Response
     [Documentation]    Test ID: 7.3.3.1.13
@@ -348,10 +347,9 @@ DELETE all OnBoarded VNF Packages - Method not implemented
     ...    Reference: Clause 10.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Packages are not deleted by the failed operation
+    ...    Post-Conditions: none
     Send OnBoarded DELETE Request for all VNF Packages
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Packages Exist
     
 GET all OnBoarded VNF Packages as a Paged Response
     [Documentation]    Test ID: 7.3.3.1.27
@@ -377,4 +375,32 @@ GET OnBoarded VNF Packages - Bad Request Response too Big
     ...    Post-Conditions: none
     Get all OnBoarded VNF Packages
     Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is   ProblemDetails
\ No newline at end of file
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+GET VNF Packages with "fields" and "exclude_default" attribute selector
+    [Documentation]    Test ID: 7.3.3.1.29
+    ...    Test title: GET VNF Packages with fields and exclude_default attribute selector
+    ...    Test objective: The objective is to test the retrieval of VNF packages with "fields" and "exclude_default" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "fields" selector
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The VNFM supports the use of fields attribute selector
+    ...    Post-Conditions: none
+    GET VNF Packages with fields and exclude_default attribute selector
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is   vnfPkgsInfo
+    Check HTTP Response Body vnfPkgsInfo Matches the requested fields and exclude_default selector
+    
+GET OnBoarded VNF Packages with "fields" and "exclude_default" attribute selector
+    [Documentation]    Test ID: 7.3.3.1.30
+    ...    Test title: GET OnBoarded VNF Packages with fields and exclude_default attribute selector
+    ...    Test objective: The objective is to test the retrieval of OnBoarded VNF packages with "fields" and "exclude_default" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "fields" selector
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 4.3.3.2.1, 10.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The VNFM supports the use of fields attribute selector
+    ...    Post-Conditions: none
+    GET OnBoarded VNF Packages with fields and exclude_default attribute selector
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is   vnfPkgsInfo
+    Check HTTP Response Body vnfPkgsInfo Matches the requested fields selector
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/jsons/subscriptions.json b/SOL003/VNFPackageManagement-API/jsons/subscriptions.json
index 1d5927979..35c8671eb 100644
--- a/SOL003/VNFPackageManagement-API/jsons/subscriptions.json
+++ b/SOL003/VNFPackageManagement-API/jsons/subscriptions.json
@@ -1,3 +1,3 @@
-{
-	"callbackUri": "http://172.22.1.7:9091/vnfpkgm/subscriptions"
-}
\ No newline at end of file
+{{
+	"callbackUri": "{callbackUri}"
+}}
\ No newline at end of file
-- 
GitLab


From 7d4f86655f4b28ee3ec9c4ed7870e15aca3f5084 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Fri, 9 Oct 2020 12:50:38 +0500
Subject: [PATCH 067/322] refernce updated

---
 .../ApiVersion.robot                          | 20 ++++++++--------
 .../IndividualSubscription.robot              | 10 ++++----
 .../NotificationEndpoint.robot                |  2 +-
 .../Subscriptions.robot                       | 24 +++++++++----------
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/ApiVersion.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/ApiVersion.robot
index dfb570e1d..223f8d37c 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/ApiVersion.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/ApiVersion.robot
@@ -11,7 +11,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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -23,7 +23,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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -36,7 +36,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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -48,7 +48,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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -60,7 +60,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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -72,7 +72,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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -84,7 +84,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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -97,7 +97,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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -109,7 +109,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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -121,7 +121,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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/IndividualSubscription.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/IndividualSubscription.robot
index a42c3215c..5f3c46264 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/IndividualSubscription.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/IndividualSubscription.robot
@@ -15,7 +15,7 @@ Create new Virtualised Resources Quota Available Notification individual subscri
     ...    Test title: Create new Virtualised Resources Quota Available Notification individual subscription
     ...    Test objective: The objective is to test that POST method is not allowed to create a new Virtualised Resources Quota Available Notification individual subscription instance on VNF 
     ...    Pre-conditions: A VNF instance is instantiated
-    ...    Reference: Clause 11.4.3.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 11.4.3.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ Get Information about an individual subscription
     ...    Test title: Get Information about an individual subscription
     ...    Test objective: The objective is to read an individual Virtualised Resources Quota Available Notification subscription subscribed by the client and perform a JSON schema and content validation of the returned individual subscription data structure 
     ...    Pre-conditions: The subscription with the given id exists
-    ...    Reference: Clause 11.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 11.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none 
     ...    Post-Conditions: none
@@ -40,7 +40,7 @@ PUT an individual subscription - Method not implemented
     ...    Test title: PUT an individual subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update a existing Virtualised Resources Quota Available Notification individual subscription instance on VNF 
     ...    Pre-conditions: A VNF instance is instantiated
-    ...    Reference: Clause 11.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 11.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -52,7 +52,7 @@ PATCH an individual subscription - Method not implemented
     ...    Test title: PATCH an individual subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify a existing Virtualised Resources Quota Available Notification individual subscription instance on VNF 
     ...    Pre-conditions: A VNF instance is instantiated
-    ...    Reference: Clause 11.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 11.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ DELETE an individual subscription
     ...    Test title: DELETE an individual subscription
     ...    Test objective: The objective is to test that Delete method is allowed to remove a existing Virtualised Resources Quota Available Notification individual subscription instance on VNF  
     ...    Pre-conditions: The subscription with the given id exists
-    ...    Reference: Clause 11.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 11.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot
index ae3bddf2b..9d81b4580 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot
@@ -16,7 +16,7 @@ Deliver a notification - Vr Quota Availibility
     ...    Test title: Deliver a notification - Vr Quota Availibility
     ...    Test objective: The objective is to notify related to the availability of the virtualised resources quota.
     ...    Pre-conditions: The VNF has subscribed to the Vr Quota Availibility resource
-    ...    Reference: Clause 11.4.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 11.4.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions:  
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/Subscriptions.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/Subscriptions.robot
index 0c0a309e2..a5b0e3938 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/Subscriptions.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/Subscriptions.robot
@@ -12,7 +12,7 @@ Create new Virtualised Resources Quota Available Notification subscription
     ...    Test title: Create new Virtualised Resources Quota Available Notification subscription
     ...    Test objective: The objective is to create a new Virtualised Resources Quota Available Notification subscription and perform a JSON schema and content validation of the returned subscription data structure 
     ...    Pre-conditions: no subscription with the same filter and callbackUri exists
-    ...    Reference: Clause 11.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 11.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ Create new Virtualised Resources Quota Available Notification subscription - DUP
     ...    Test title: Create new Virtualised Resources Quota Available Notification subscription - DUPLICATION
     ...    Test objective: The objective is to create a new Virtualised Resources Quota Available Notification subscription and perform a JSON schema and content validation of the returned duplicated subscription data structure
     ...    Pre-conditions: subscription with the same filter and callbackUri exists
-    ...    Reference: Clause 11.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 11.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: the VNFM allows creating a subscription resource if another subscription resource with the same filter and callbackUri already exists
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ Create new Virtualised Resources Quota Available Notification subscription - NO-
     ...    Test title: Create new Virtualised Resources Quota Available Notification subscription - NO-DUPLICATION
     ...    Test objective: The objective is to create a nduplicated Virtualised Resources Quota Available Notification subscription and verify that the VNF does not allow duplication
     ...    Pre-conditions: subscription with the same filter and callbackUri exists
-    ...    Reference: Clause 11.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 11.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: the VNFM decides to not create a duplicate subscription resource 
     ...    Post-Conditions: none
@@ -54,7 +54,7 @@ GET Virtualised Resources Quota Available Notification Subscriptions
     ...    Test title: GET Virtualised Resources Quota Available Notification Subscriptions 
     ...    Test objective: The objective is to retrieve the list of active Virtualised Resources Quota Available Notification subscriptions and perform a JSON schema and content validation of the returned  subscriptions data structure
     ...    Pre-conditions: none
-    ...    Reference: Clause 11.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 11.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -67,7 +67,7 @@ GET Virtualised Resources Quota Available Notification Subscriptions with attrib
     ...    Test title: GET Virtualised Resources Quota Available Notification Subscriptions with attribute-based Filter
     ...    Test objective: The objective is to retrieve the list of active Virtualised Resources Quota Available Notification subscriptions and perform a JSON schema and content validation of the returned subscriptions data structure, and verify that the retrieved information matches the issued attribute-based filters
     ...    Pre-conditions: none
-    ...    Reference: Clause 11.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 11.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -80,7 +80,7 @@ GET Virtualised Resources Quota Available Notification subscriptions - Bad Reque
     ...    Test title: GET Virtualised Resources Quota Available Notification subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to retrieve the list of active Virtualised Resources Quota Available Notification subscriptions with invalid attribute-based filtering parameters, and verify that problem details are returned 
     ...    Pre-conditions: none
-    ...    Reference: Clause 11.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 11.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none 
     ...    Post-Conditions: none
@@ -93,7 +93,7 @@ PUT Virtualised Resources Quota Available Notification subscriptions - Method no
     ...    Test title: PUT Virtualised Resources Quota Available Notification subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update existing Virtualised Resources Quota Available Notification subscriptions instance on VNF 
     ...    Pre-conditions: A VNF instance is instantiated
-    ...    Reference: Clause 11.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 11.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -105,7 +105,7 @@ PATCH Virtualised Resources Quota Available Notification subscriptions - Method
     ...    Test title: PATCH Virtualised Resources Quota Available Notification subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify Virtualised Resources Quota Available Notification subscriptions instance on VNF 
     ...    Pre-conditions: A VNF instance is instantiated
-    ...    Reference: Clause 11.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 11.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -117,7 +117,7 @@ DELETE Virtualised Resources Quota Available Notification subscriptions - Method
     ...    Test title: DELETE Virtualised Resources Quota Available Notification subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to delete Virtualised Resources Quota Available Notification subscriptions instance on VNF 
     ...    Pre-conditions: A VNF instance is instantiated
-    ...    Reference: Clause 11.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 11.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -130,7 +130,7 @@ GET Virtualised Resources Quota Available Notification Subscriptions as Paged Re
     ...    Test title: GET Virtualised Resources Quota Available Notification Subscriptions as Paged Response 
     ...    Test objective: The objective is to retrieve the list of active Virtualised Resources Quota Available Notification subscriptions as a Paged Response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 11.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 11.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -143,7 +143,7 @@ GET Virtualised Resources Quota Available Notification subscriptions - Bad Reque
     ...    Test title: GET Virtualised Resources Quota Available Notification subscriptions - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of active Virtualised Resources Quota Available Notification subscriptions list fails because response is too big, and verify that problem details are returned 
     ...    Pre-conditions: none
-    ...    Reference: Clause 11.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 11.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none 
     ...    Post-Conditions: none
@@ -156,7 +156,7 @@ Create new Virtualised Resources Quota Available Notification Subscription - Unp
     ...    Test title: Create new Virtualised Resources Quota Available Notification Subscription - Unprocessable Entity
     ...    Test objective: The objective is to test that content type of the payload body is supported and the payload body of a request contains syntactically correct data but the data cannot be processed.
     ...    re-conditions: none
-    ...    Reference: Clause 11.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 11.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-- 
GitLab


From d19e170743f9a810cdcb7b11cf5dcab9bb00bff7 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Fri, 9 Oct 2020 12:57:25 +0500
Subject: [PATCH 068/322] templating, minor fix and new testcases added

---
 .../IndividualSubscription.robot               | 18 +++++++++++++++---
 .../Subscriptions.robot                        |  2 --
 .../VRQANOperationKeywords.robot               | 14 +++++++-------
 .../environment/variables.txt                  |  1 +
 .../vrQuotaAvailSubscriptionRequest .json      |  6 +++---
 .../jsons/vrQuotaAvailSubscriptionRequest.json |  3 ---
 6 files changed, 26 insertions(+), 18 deletions(-)
 delete mode 100644 SOL003/VirtualisedResourcesQuotaAvailableNotification-API/jsons/vrQuotaAvailSubscriptionRequest.json

diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/IndividualSubscription.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/IndividualSubscription.robot
index 5f3c46264..e1de22b87 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/IndividualSubscription.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/IndividualSubscription.robot
@@ -10,9 +10,9 @@ Documentation    This resource represents an individual subscription. The client
 Suite Setup    Check Individual Subscription existence
 
 *** Test Cases ***
-Create new Virtualised Resources Quota Available Notification individual subscription
+Create new Virtualised Resources Quota Available Notification individual subscription - Method not implemented
     [Documentation]    Test ID: 7.3.7.2.1
-    ...    Test title: Create new Virtualised Resources Quota Available Notification individual subscription
+    ...    Test title: Create new Virtualised Resources Quota Available Notification individual subscription - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new Virtualised Resources Quota Available Notification individual subscription instance on VNF 
     ...    Pre-conditions: A VNF instance is instantiated
     ...    Reference: Clause 11.4.3.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
@@ -71,4 +71,16 @@ DELETE an individual subscription
     Delete Virtualised Resources Quota Available Notification individual subscription
     Check HTTP Response Status Code Is    204
     Check Postcondition VNF Virtualised Resources Quota Available Notification individual Subscriptions is Deleted
-    
\ No newline at end of file
+    
+Get Information about an individual subscription - Not Found
+    [Documentation]    Test ID: 7.3.7.2.2
+    ...    Test title: Get Information about an individual subscription - Not Found
+    ...    Test objective: The objective is to test that the retrieval of an individual Virtualised Resources Quota Available Notification subscription subscribed by the client fils when resource is not present 
+    ...    Pre-conditions: The subscription with the given id does not exists
+    ...    Reference: Clause 11.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none 
+    ...    Post-Conditions: none
+    Get Virtualised Resources Quota Available Notification individual subscription
+    Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
\ No newline at end of file
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/Subscriptions.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/Subscriptions.robot
index a5b0e3938..1b7cfe68a 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/Subscriptions.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/Subscriptions.robot
@@ -21,7 +21,6 @@ Create new Virtualised Resources Quota Available Notification subscription
     Check HTTP Response Header Contains    Location
     Check HTTP Response Body Json Schema Is    VrQuotaAvailSubscription
     
-
 Create new Virtualised Resources Quota Available Notification subscription - DUPLICATION
     [Documentation]    Test ID: 7.3.7.1.2
     ...    Test title: Create new Virtualised Resources Quota Available Notification subscription - DUPLICATION
@@ -123,7 +122,6 @@ DELETE Virtualised Resources Quota Available Notification subscriptions - Method
     ...    Post-Conditions: none
     Send Delete request for Virtualised Resources Quota Available Notification subscription   
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Virtualised Resources Quota Available Notification Subscriptions Exists
     
 GET Virtualised Resources Quota Available Notification Subscriptions as Paged Response
     [Documentation]    Test ID: 7.3.7.1.10
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot
index 20d4a9fc4..641ffcefc 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot
@@ -1,4 +1,5 @@
 *** Settings ***
+Library    String
 Resource    environment/variables.txt
 Library    REST     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
 Library    JSONLibrary
@@ -42,10 +43,6 @@ Check HTTP Response Header ContentType is
     Log    Validate content type
     Should Be Equal    ${response['headers']['Content-Type']}    ${expected_contentType}
     Log    Content Type validated 
-    
-Check Postcondition VNF Virtualised Resources Quota Available Notification Subscriptions Exists
-    Log    Checking that subscriptions exists
-    GET Virtualised Resources Quota Available Notification Subscriptions
       
 Check Postcondition VNF Virtualised Resources Quota Available Notification individual Subscriptions is Deleted
     Log    Check Postcondition Subscription is deleted
@@ -97,7 +94,8 @@ Send Post request for new Virtualised Resources Quota Available Notification sub
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/vrQuotaAvailSubscriptionRequest.json
+    ${template}=    Get File    jsons/vrQuotaAvailSubscriptionRequest.json
+    ${body}=        Format String   ${template}    callback_uri=${callback_uri}    callback_subscribe=${callback_subscribe}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}    
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
@@ -108,7 +106,8 @@ Send Post request for new Virtualised Resources Quota Available Notification sub
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/vrQuotaAvailSubscriptionRequest.json
+    ${template}=    Get File    jsons/vrQuotaAvailSubscriptionRequest.json
+    ${body}=        Format String   ${template}    callback_uri=${callback_uri}    callback_subscribe=${callback_subscribe}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
@@ -119,7 +118,8 @@ Send Post request for new Virtualised Resources Quota Available Notification sub
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/vrQuotaAvailSubscriptionRequest.json
+    ${template}=    Get File    jsons/vrQuotaAvailSubscriptionRequest.json
+    ${body}=        Format String   ${template}    callback_uri=${callback_uri}    callback_subscribe=${callback_subscribe}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt
index 87671b9f8..ea3559c2f 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt
@@ -14,6 +14,7 @@ ${sub_filter}    filter
 ${sub_filter_invalid}    filter_invalid
 
 ${callback_endpoint}    /notification
+${callback_subscribe}    /subscribe
 ${callback_port}    9091
 ${callback_uri}     http://localhost
 ${sleep_interval}    20s
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/jsons/vrQuotaAvailSubscriptionRequest .json b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/jsons/vrQuotaAvailSubscriptionRequest .json
index 8d91c2b81..ffed99d47 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/jsons/vrQuotaAvailSubscriptionRequest .json	
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/jsons/vrQuotaAvailSubscriptionRequest .json	
@@ -1,3 +1,3 @@
-{
-  "callbackUri": "http://127.0.0.1/subscribe"
-}
\ No newline at end of file
+{{
+  "callbackUri": "{callback_uri}{callback_subscribe}"
+}}
\ No newline at end of file
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/jsons/vrQuotaAvailSubscriptionRequest.json b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/jsons/vrQuotaAvailSubscriptionRequest.json
deleted file mode 100644
index 8d91c2b81..000000000
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/jsons/vrQuotaAvailSubscriptionRequest.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "callbackUri": "http://127.0.0.1/subscribe"
-}
\ No newline at end of file
-- 
GitLab


From afe37d7f6d2e7c90e6c5317e5403101bf4be2898 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Mon, 12 Oct 2020 15:47:29 +0500
Subject: [PATCH 069/322] added majoyAPIVersion

---
 .../ApiVersion.robot                          |  10 +-
 .../CancelOperationTask.robot                 |   2 +-
 .../ChangeExternalVNFConnectivityTask.robot   |   2 +-
 .../ChangeVNFFlavourTask.robot                |   2 +-
 .../HealVNFTask.robot                         |   2 +-
 .../InstantiateVNFTask.robot                  |   2 +-
 .../OperateVNFTask.robot                      |   2 +-
 .../RetryOperationTask.robot                  |   2 +-
 .../RollbackOperationTask.robot               |   2 +-
 .../ScaleVNFTask.robot                        |   2 +-
 .../ScaleVNFToLevelTask.robot                 |   2 +-
 .../TerminateVNFTask.robot                    |   2 +-
 .../VnfLcmOperationKeywords.robot             | 238 +++++++++---------
 .../environment/variables.txt                 |   2 +-
 14 files changed, 136 insertions(+), 136 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/ApiVersion.robot b/SOL002/VNFLifecycleManagement-API/ApiVersion.robot
index 076343d82..c85fc6ced 100644
--- a/SOL002/VNFLifecycleManagement-API/ApiVersion.robot
+++ b/SOL002/VNFLifecycleManagement-API/ApiVersion.robot
@@ -167,35 +167,35 @@ DELETE API Version
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/v1/api_version
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/v1/api_version
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/v1/api_version
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/v1/api_version
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/v1/api_version
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 
diff --git a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
index 326819aa0..60d04f4b8 100644
--- a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
@@ -101,5 +101,5 @@ DELETE Cancel operation task - Method not implemented
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot b/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
index 48589116c..f803d37fb 100644
--- a/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
@@ -87,5 +87,5 @@ Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot b/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
index d1a7d8634..bf6278856 100644
--- a/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
@@ -100,5 +100,5 @@ Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
index 68b5014f6..e8298325c 100644
--- a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
@@ -101,5 +101,5 @@ Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
index 200f0c387..0bf995edd 100644
--- a/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
@@ -89,5 +89,5 @@ Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
index a27748bc1..40448b7c6 100644
--- a/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
@@ -100,5 +100,5 @@ Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot b/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
index fff8c4816..8e7a7fd2a 100644
--- a/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
@@ -99,5 +99,5 @@ DELETE Retry operation task - Method not implemented
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot b/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
index c92083878..1ed4064c5 100644
--- a/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
@@ -100,5 +100,5 @@ DELETE Rollback operation task - Method not implemented
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
index 4b9ebed98..f34e1bf96 100644
--- a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
@@ -100,5 +100,5 @@ Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
index 75efe34bf..de97db01a 100644
--- a/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
@@ -99,5 +99,5 @@ Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
index 72690a90b..0656a1724 100644
--- a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
@@ -87,5 +87,5 @@ Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index 8b5b5d7de..f98becf2a 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -18,7 +18,7 @@ Get Vnf Instance
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}
     ${body}=    Output    response body
     [Return]    ${body}
 
@@ -52,7 +52,7 @@ Check VNF Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${response}=    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfId}
+    ${response}=    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfId}
 
 Check VNF Status
     [Arguments]    ${current}    ${expected}
@@ -61,12 +61,12 @@ Check VNF Status
 
 Check operation resource state is FAILED_TEMP
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body instantiationState    FAILED_TEMP   
 
 Check operation resource state is FINALLY_FAILED      
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body instantiationState    FINALLY_FAILED  
      
 Check HTTP Response Header Contains
@@ -75,13 +75,13 @@ Check HTTP Response Header Contains
     Log    Header is present
 
 POST Create a new vnfInstance	
-     Log    Create VNF instance by POST to ${apiRoot}/${apiName}/${apiVersion}/vnf_instances
+     Log    Create VNF instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template} =    Get File    jsons/createVnfRequest.json
     ${body}=        Format String   ${template}     vnfdId=${vnfdId}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 
@@ -90,7 +90,7 @@ GET multiple vnfInstances
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 		
 
@@ -99,7 +99,7 @@ GET multiple vnfInstances with bad attribute
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Set Headers    {"Authorization":"${AUTHORIZATION}"} 
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances?attribute_not_exist=some_value
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?attribute_not_exist=some_value
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 
@@ -108,42 +108,42 @@ GET multiple vnfInstances with bad filter
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"} 
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances?fields=wrong_field
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?fields=wrong_field
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 GET multiple vnfInstances with all_fields attribute selector
     Log    Query status information about multiple VNF instances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 GET multiple vnfInstances with exclude_default attribute selector
     Log    Query status information about multiple VNF instances using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 GET multiple vnfInstances with fields attribute selector
     Log    Query status information about multiple VNF instances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances?fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	    
 GET multiple vnfInstances with exclude_default and fields attribute selector
     Log    Query status information about multiple VNF instances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances?fields=${fields}&exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?fields=${fields}&exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 GET multiple vnfInstances with exclude_fields attribute selector
     Log    Query status information about multiple VNF instances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances?exclude_fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 	
 PUT multiple vnfInstances
@@ -151,21 +151,21 @@ PUT multiple vnfInstances
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances   	
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances   	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PATCH multiple vnfInstances
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfLcmOpOccId}	 	
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfLcmOpOccId}	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 DELETE multiple vnfInstances
     Log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfLcmOpOccId} 	 	
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfLcmOpOccId} 	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}   
 
@@ -174,7 +174,7 @@ POST individual vnfInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}    
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}    
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}        
 
@@ -183,7 +183,7 @@ GET individual vnfInstance
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 		
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}      
 	
@@ -192,7 +192,7 @@ PUT individual vnfInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}	  	
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}	  	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
@@ -203,13 +203,13 @@ PATCH individual vnfInstance
     Set Headers    {"If-Match": "${original_etag}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/patchBodyRequest.json
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}    ${body}	
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}    ${body}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 DELETE individual vnfInstance
     log    Trying to delete an individual VNF instance
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 
@@ -220,35 +220,35 @@ POST instantiate individual vnfInstance
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/instantiateVnfRequest.json
     ${body}=        Format String   ${template}     flavourId=${flavourId} 
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/instantiate    ${body}	
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/instantiate    ${body}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 	
 GET instantiate individual vnfInstance
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/instantiate 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/instantiate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 
 PUT instantiate individual vnfInstance
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/instantiate 
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/instantiate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 
 PATCH instantiate individual vnfInstance
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/instantiate 
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/instantiate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 
 DELETE instantiate individual vnfInstance
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/instantiate 
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/instantiate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 	
@@ -259,7 +259,7 @@ POST Scale vnfInstance
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/scaleVnfRequest.json
     ${body}=        Format String   ${template}     scaleVnfRequesttype=${scaleVnfRequesttype}    scaleVnfRequestAspect=${scaleVnfRequestAspect} 
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 GET Scale vnfInstance				
@@ -268,7 +268,7 @@ GET Scale vnfInstance
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/scaleVnfRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 PUT Scale vnfInstance				
@@ -277,7 +277,7 @@ PUT Scale vnfInstance
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/scaleVnfRequest.json
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale   
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale   
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 PATCH Scale vnfInstance				
@@ -286,7 +286,7 @@ PATCH Scale vnfInstance
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/scaleVnfRequest.json
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale   
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale   
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 DELETE Scale vnfInstance				
@@ -295,7 +295,7 @@ DELETE Scale vnfInstance
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/scaleVnfRequest.json
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale   
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale   
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 
@@ -306,34 +306,34 @@ POST Scale vnfInstance to level
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/scaleVnfToLevelRequest.json
     ${body}=        Format String   ${template}     newFlavourId=${newFlavourId} 
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 GET Scale vnfInstance to level
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PUT Scale vnfInstance to level
     log    Trying to perform a PUT. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level 
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PATCH Scale vnfInstance to level
     log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level 
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 	
 DELETE Scale vnfInstance to level
     log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level 
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 
@@ -344,34 +344,34 @@ POST Change VNF deployment flavour
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/changeVnfFlavourRequest.json
     ${body}=        Format String   ${template}     newFlavourId=${newFlavourId} 
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour    ${body} 
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_flavour    ${body} 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  	 
 GET Change VNF deployment flavour
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour 	
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_flavour 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PUT Change VNF deployment flavour
     log    Trying to perform a PUT. This method should not be implemented 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour 	
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_flavour 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PATCH Change VNF deployment flavour
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour   	 	
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_flavour   	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 DELETE Change VNF deployment flavour
     Log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour   	 	
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_flavour   	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 			
@@ -382,35 +382,35 @@ POST Terminate VNF
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/terminateVnfRequest.json
     ${body}=        Format String   ${template}     terminationType=${terminationType} 
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate    ${body}	
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/terminate    ${body}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 GET Terminate VNF
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/terminate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PUT Terminate VNF
     log    Trying to perform a PUT. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate 
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/terminate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PATCH Terminate VNF
     log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate 
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/terminate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 	
 DELETE Terminate VNF
     log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate 
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/terminate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 
@@ -421,35 +421,35 @@ POST Heal VNF
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/healVnfRequest.json
     ${body}=        Format String   ${template}     healingCause=${healingCause} 
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal    ${body}		
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/heal    ${body}		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 
 GET Heal VNF
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal  
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/heal  
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PUT Heal VNF
     log    Trying to perform a PUT. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal 
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/heal 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PATCH Heal VNF
     log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal 
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/heal 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 	
 DELETE Heal VNF
     log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal 
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/heal 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}			
 
@@ -459,35 +459,35 @@ POST Change External VNF Connectivity
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/changeExtVnfConnectivityRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  
 
 GET Change External VNF Connectivity
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn 	
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PUT Change External VNF Connectivity
     log    Trying to perform a PUT. This method should not be implemented 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn  		
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn  		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PATCH Change External VNF Connectivity
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn  	 	
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn  	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 DELETE Change External VNF Connectivity
     Log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn  	 	
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn  	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
@@ -498,35 +498,35 @@ POST Operate VNF
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/operateVnfRequest.json
     ${body}=        Format String   ${template}     changeStateTo=${changeStateTo} 
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/operate    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 
 GET Operate VNF
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate  
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/operate  
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PUT Operate VNF
     log    Trying to perform a PUT. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate 
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/operate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PATCH Operate VNF
     log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate 
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/operate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 	
 DELETE Operate VNF
     log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate 
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/operate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
@@ -534,7 +534,7 @@ Post VNF LCM OP occurrences
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs  	
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs  	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 GET VNF LCM OP occurrences
@@ -542,84 +542,84 @@ GET VNF LCM OP occurrences
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 GET VNF LCM OP occurrences invalid attribute
     Log    Query status information about multiple VNF lifecycle management operation occurrences.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"} 
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs?attribute_not_exist=some_value	
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?attribute_not_exist=some_value	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 GET VNF LCM OP occurrences invalid filter
     Log    Query status information about multiple VNF lifecycle management operation occurrences.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"} 
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs?fields=wrong_field	
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?fields=wrong_field	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 PUT VNF LCM OP occurrences	
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs	
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 PATCH VNF LCM OP occurrences	
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs	
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}			
 DELETE VNF LCM OP occurrences	
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs	
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Post Individual VNF LCM OP occurrences
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Get Individual VNF LCM OP occurrences
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Put Individual VNF LCM OP occurrences
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 Patch Individual VNF LCM OP occurrences
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch   ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
+    Patch   ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 Delete Individual VNF LCM OP occurrences
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}			
 Post Retry operation
     Log    Retry a VNF lifecycle operation if that operation has experienced a temporary failure
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	    
 Get Retry operation	
@@ -627,35 +627,35 @@ Get Retry operation
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Put Retry operation	
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Patch Retry operation	
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Delete Retry operation    
 	log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Post Rollback operation
     Log    Rollback a VNF lifecycle operation if that operation has experienced a temporary failure
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	    
 Get Rollback operation	
@@ -663,35 +663,35 @@ Get Rollback operation
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback	
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Put Rollback operation	
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback	
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Patch Rollback operation	
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback	
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Delete Rollback operation    
 	log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback	
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Post Fail operation
     Log    mark as Failed a VNF lifecycle operation if that operation has experienced a failure
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	    
 Get Fail operation	
@@ -699,28 +699,28 @@ Get Fail operation
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Put Fail operation	
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail	
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Patch Fail operation	
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Delete Fail operation    
 	log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 
@@ -728,7 +728,7 @@ POST Cancel operation task
     Log    Cancel an ongoing VNF lifecycle operation
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Cancel a VNF lifecycle operation
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel    ${CancelMode}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel    ${CancelMode}
     Log    Validate Status code
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -736,39 +736,39 @@ POST Cancel operation task
 GET Cancel operation task
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel 	
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PUT Cancel operation task
     log    Trying to perform a PUT. This method should not be implemented 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel  		
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel  		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PATCH Cancel operation task
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel  	 	
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel  	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 DELETE Cancel operation task
     Log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel  	 	
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel  	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}        
 
 Post Create subscription
-    Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
     ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}				
 Post Create subscription - DUPLICATION
@@ -779,7 +779,7 @@ Post Create subscription - DUPLICATION
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
     ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}		
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}			
 Post Create subscription - NO-DUPLICATION	
@@ -790,7 +790,7 @@ Post Create subscription - NO-DUPLICATION
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
     ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Get subscriptions
@@ -799,7 +799,7 @@ Get subscriptions
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions	
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Get subscriptions - filter
@@ -807,42 +807,42 @@ Get subscriptions - filter
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter}	
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Get subscriptions - invalid filter  
     Log    Get the list of active subscriptions using an invalid filter
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter_invalid}   
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter_invalid}   
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Get subscriptions with all_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get subscriptions with exclude_default attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get subscriptions with fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 Get subscriptions with exclude_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?exclude_fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 PUT subscriptions
@@ -850,7 +850,7 @@ PUT subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/subscriptions  	   
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions  	   
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 PATCH subscriptions
@@ -858,7 +858,7 @@ PATCH subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/subscriptions  	   
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions  	   
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 DELETE subscriptions
@@ -866,7 +866,7 @@ DELETE subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/subscriptions  	   
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions  	   
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Post Create Individual subscription
@@ -874,14 +874,14 @@ Post Create Individual subscription
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}  	
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Get Individual subscription	
     log    Trying to get information about an individual subscription
     Set Headers    {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Put Individual subscription	
@@ -889,7 +889,7 @@ Put Individual subscription
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} 
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Patch Individual subscription	
@@ -897,14 +897,14 @@ Patch Individual subscription
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} 	
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	    
 Delete Individual subscription
     log    Try to delete an individual subscription
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}  	
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 Put Notification subscription
@@ -974,13 +974,13 @@ Check Subscription resource exist
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     Integer    response status    200
 
 Get VNF LCM Operation occurrences with all_fields attribute selector
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs?all_fields
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?all_fields
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -988,28 +988,28 @@ Get VNF LCM Operation occurrences with all_fields attribute selector
 Get VNF LCM Operation occurrences with exclude_default attribute selector
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Get VNF LCM Operation occurrences with fields attribute selector
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs?fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Get VNF LCM Operation occurrences with exclude_default and fields attribute selector
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs?fields=${fields}&exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?fields=${fields}&exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Get VNF LCM Operation occurrences with exclude_fields attribute selector
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs?exclude_fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 	
     
diff --git a/SOL002/VNFLifecycleManagement-API/environment/variables.txt b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
index 71e5445a3..b15172d18 100644
--- a/SOL002/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
@@ -12,7 +12,7 @@ ${ACCEPT}         application/json
 ${ACCEPT_JSON}         application/json
 ${apiRoot}        /
 ${apiName}        vnflcm
-${apiVersion}     v1
+${apiMajorVersion}    v1
 ${AUTH_USAGE}     1
 ${WRONG_AUTHORIZATION}    Bearer    XXXXXWRONGXXXXX
 ${vnfInstanceId}       6fc3539c-e602-4afa-8e13-962fb5a7d81f
-- 
GitLab


From a2ea192d4c229b938aeb5d2cf4b4927613ce7c30 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Mon, 12 Oct 2020 15:53:06 +0500
Subject: [PATCH 070/322] added majorAPIVersion

---
 .../ApiVersion.robot                          | 10 ++---
 .../IndividualPmJob.robot                     | 18 ++++-----
 .../IndividualReport.robot                    | 18 ++++-----
 .../IndividualThreshold.robot                 | 18 ++++-----
 .../VNFPerformanceManagement-API/PMJobs.robot | 28 ++++++-------
 .../Thresholds.robot                          | 18 ++++-----
 .../VNFPerformanceManagementKeywords.robot    | 40 +++++++++----------
 .../environment/variables.txt                 |  2 +-
 8 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/SOL002/VNFPerformanceManagement-API/ApiVersion.robot b/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
index bb484bf34..5832a7af2 100644
--- a/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
+++ b/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
@@ -167,35 +167,35 @@ DELETE API Version
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/v1/api_version
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/v1/api_version
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/v1/api_version
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/v1/api_version
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/v1/api_version
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
index 5a84a1747..61cd4bd06 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
@@ -119,7 +119,7 @@ GET individual VNF Performance Job
     Log    Trying to get a Pm Job present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -127,7 +127,7 @@ GET individual VNF Performance Job with invalid resource identifier
     Log    Trying to perform a negative get, using erroneous PM Job identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${erroneousPmJobId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${erroneousPmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -135,7 +135,7 @@ Send Delete request for individual VNF Performance Job
     Log    Trying to delete an existing PM Job
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -143,7 +143,7 @@ Send Delete request for individual VNF Performance Job with invalid resource ide
     Log    Trying to perform a negative delete, using erroneous PM Job identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${erroneousPmJobId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${erroneousPmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -151,7 +151,7 @@ Send Post request for individual VNF Performance Job
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${newPmJobId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${newPmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -159,10 +159,10 @@ Send Put request for individual VNF Performance Job
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -171,7 +171,7 @@ Send Patch request for individual VNF Performance Job
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/PMJobModification.json
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}     ${body}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}     ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -179,7 +179,7 @@ Check Postcondition VNF Performance Job is not Created
     Log    Trying to get a new Pm Job
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${newPmJobId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${newPmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    404
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
index d6ba168b3..f42402876 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
@@ -88,7 +88,7 @@ Get Individual Performance Report
     Log    Trying to get a performance report present in the VNFM
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -96,41 +96,41 @@ Get Individual Performance Report with invalid resource endpoint
     Log    Trying to get a performance report with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${erroneousReportId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${erroneousReportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for Individual Performance Report
     Log    Trying to create new performance report
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for Individual Performance Report
     Log    Trying to update performance report
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Send Patch request for Individual Performance Report
     Log    Trying to update performance report
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for Individual Performance Report
     Log    Trying to delete performance report   
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -142,7 +142,7 @@ Check Postcondition VNF Individual Performance Report is not Created
     Log    Trying to get a new report
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    404
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
index d68f09617..429727d04 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -116,7 +116,7 @@ GET Individual VNF Performance Threshold
     Log    Trying to get a Threhsold present in the VNFM
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -124,28 +124,28 @@ GET individual VNF Performance Threshold with invalid resource identifier
     Log    Trying to get a Threhsold with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${erroneousThresholdId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${erroneousThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual VNF Performance Threshold
     Log    Trying to delete a Threhsold in the VNFM
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual VNF Performance Threshold with invalid resource identifier
     Log    Trying to delete a Threhsold in the VNFM with invalid id
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${erroneousThresholdId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${erroneousThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual VNF Performance Threshold
     Log    Trying to create new threshold
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${newThresholdId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${newThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -153,10 +153,10 @@ Send Put request for individual VNF Performance Threshold
     Log    Trying to PUT threshold
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -166,7 +166,7 @@ Send Patch request for individual VNF Performance Threshold
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/ThresholdModification.json
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -182,7 +182,7 @@ Check Postcondition VNF Performance Threshold is not Created
     Log    Trying to get a new Threshold
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${newThresholdId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${newThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    404
diff --git a/SOL002/VNFPerformanceManagement-API/PMJobs.robot b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
index 27a851129..84283d725 100644
--- a/SOL002/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
@@ -212,7 +212,7 @@ GET all VNF Performance Monitoring Jobs
     Log    Trying to get all PM Jobs present in the VNFM
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -220,7 +220,7 @@ GET VNF Performance Monitoring Jobs with attribute-based filter
     Log    Trying to get all PM Jobs present in the VNFM, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?${POS_FILTER}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?${POS_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -228,7 +228,7 @@ GET VNF Performance Monitoring Jobs with all_fields attribute selector
     Log    Trying to get all PM Jobs present in the VNFM, using 'all_fields' filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?all_fields
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?all_fields
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -236,7 +236,7 @@ GET VNF Performance Monitoring Jobs with exclude_default attribute selector
     Log    Trying to get all VNF Packages present in the VNFM, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -245,7 +245,7 @@ GET VNF Performance Monitoring Jobs with fields attribute selector
     Pass Execution If    ${FIELD_USAGE} == 0    Skipping test as VNFM is not supporting 'fields'
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -253,7 +253,7 @@ GET VNF Performance Monitoring Jobs with exclude_default and fields attribute se
     Log    Trying to get all VNF Packages present in the VNFM, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?fields=${fields}&exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?fields=${fields}&exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -262,7 +262,7 @@ GET VNF Performance Monitoring Jobs with exclude_fields attribute selector
     Pass Execution If    ${FIELD_USAGE} == 0    Skipping test as VNFM is not supporting 'fields'
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -270,7 +270,7 @@ GET VNF Performance Monitoring Jobs with invalid attribute-based filter
     Log    Trying to get all PM Jobs present in the VNFM, using an erroneous filter param
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?${NEG_FILTER}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?${NEG_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -278,7 +278,7 @@ GET VNF Performance Monitoring Jobs with invalid resource endpoint
     Log    Trying to perform a GET on a erroneous URI
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_job    # wrong URI /pm_job instead of /pm_jobs
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_job    # wrong URI /pm_job instead of /pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -289,7 +289,7 @@ Send Post Request Create new VNF Performance Monitoring Job
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/CreatePmJobRequest.json
     ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}    callback_uri=${callback_uri}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs    ${body}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -297,7 +297,7 @@ Send PUT Request for all VNF Performance Monitoring Jobs
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -305,7 +305,7 @@ Send PATCH Request for all VNF Performance Monitoring Jobs
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -313,7 +313,7 @@ Send DELETE Request for all VNF Performance Monitoring Jobs
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -325,7 +325,7 @@ Check Postcondition PmJob Exists
     Log    Checking that Pm Job exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${response['body']['id']}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
diff --git a/SOL002/VNFPerformanceManagement-API/Thresholds.robot b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
index a0fb710e9..c3804b28d 100644
--- a/SOL002/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
@@ -143,7 +143,7 @@ GET all Performance Thresholds
     Log    Trying to get all thresholds present in the VNFM    
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -151,7 +151,7 @@ GET Performance Thresholds with attribute-based filter
     Log    Trying to get thresholds present in the VNFM with filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds?${FILTER_OK}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds?${FILTER_OK}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -159,7 +159,7 @@ GET Performance Thresholds with invalid attribute-based filter
     Log    Trying to get thresholds present in the VNFM with invalid filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds?${FILTER_KO}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds?${FILTER_KO}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -167,7 +167,7 @@ GET VNF Performance Thresholds with invalid resource endpoint
     Log    Trying to get thresholds present in the VNFM with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/threshold
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/threshold
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -178,7 +178,7 @@ Send Post Request Create new Performance Threshold
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${template}=    Get File    jsons/CreateThresholdRequest.json
     ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}    callback_uri=${callback_uri}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/thresholds    ${body}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -187,7 +187,7 @@ Send PUT Request for all Performance Thresholds
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/thresholds
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -196,14 +196,14 @@ Send PATCH Request for all Performance Thresholds
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/thresholds
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send DELETE Request for all Performance Thresholds
     Log    DELETE THresholds
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/thresholds
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -215,7 +215,7 @@ Check Postcondition Threshold Exists
     Log    Checking that Threshold exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${response['body']['id']}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
diff --git a/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
index 80ac22c2d..9a6c90f90 100644
--- a/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
+++ b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
@@ -21,7 +21,7 @@ Get all VNF Performance Subscriptions
     Set headers    {"Accept": "application/json"}
     Set headers    {"Content-Type": "application/json"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     # Integer    response status    200
@@ -40,7 +40,7 @@ Get all VNF Performance Subscriptions
     ...    request and response data structures, and response codes.
     Set headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ok}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ok}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     # Integer    response status    200
@@ -60,7 +60,7 @@ Get VNF Performance Subscriptions with invalid attribute-based filters
     ...    request and response data structures, and response codes.
     Set headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ko}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ko}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     # Integer    response status    400
@@ -79,7 +79,7 @@ Get VNF Performance Subscriptions with invalid resource endpoint
     ...    request and response data structures, and response codes.
     Set headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscription
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     # Integer    response status    404
@@ -107,7 +107,7 @@ Send Post Request for VNF Performance Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
     ${template}=    Get File    jsons/subscriptions.json
     ${body_request}=        Format String   ${template}     callback_uri=${callback_uri}    subscribe=${subscribe}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body_request}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body_request}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Run Keyword If    ${VNFM_CHECKS_NOTIF_ENDPOINT} == 1
@@ -139,7 +139,7 @@ Send Post Request for Duplicated VNF Performance Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/subscriptions.json
     ${body_request}=        Format String   ${template}     callback_uri=${callback_uri}    subscribe=${subscribe}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body_request}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body_request}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}    
     # Integer    response status    303
@@ -159,7 +159,7 @@ Send Put Request for VNF Performance Subscriptions
     [Documentation]    This method is not supported. When this method is requested on this resource, the VNFM shall return a "405 Method
     ...    Not Allowed" response as defined in Clause 4.3.5.4.
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     # Integer    response status    405
@@ -169,7 +169,7 @@ Send Patch Request for VNF Performance Subscriptions
     [Documentation]    This method is not supported. When this method is requested on this resource, the VNFM shall return a "405 Method
     ...    Not Allowed" response as defined in Clause 4.3.5.4.
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     # Integer    response status    405
@@ -179,7 +179,7 @@ Send Delete Request for VNF Performance Subscriptions
     [Documentation]    This method is not supported. When this method is requested on this resource, the VNFM shall return a "405 Method
     ...    Not Allowed" response as defined in Clause 4.3.5.4.
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     # Integer    response status    405
@@ -188,52 +188,52 @@ Send Delete Request for VNF Performance Subscriptions
 Get Individual VNF Performance Subscription
     Set headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 GET individual VNF Performance Subscription with invalid resource identifier
     Set headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual VNF Performance Subscription
     Set headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual VNF Performance Subscription with invalid resource identifier
     Log    Trying to delete a subscription in the VNFM with invalid id
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual VNF Performance Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${newSubscriptionId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for individual VNF Performance Threshold
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Send Patch request for individual VNF Performance Threshold
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -249,7 +249,7 @@ Check Postcondition VNF Performance Subscription is not Created
     Log    Trying to get a new subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${newSubscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    404 
@@ -297,7 +297,7 @@ Check HTTP Response Body PmSubscription Attributes Values Match the Issued Subsc
 Check Postcondition VNF Performance Subscription Is Set
     Log    Check Postcondition subscription exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${response['body']['id']}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
diff --git a/SOL002/VNFPerformanceManagement-API/environment/variables.txt b/SOL002/VNFPerformanceManagement-API/environment/variables.txt
index 65cab3fbe..0772cedcc 100644
--- a/SOL002/VNFPerformanceManagement-API/environment/variables.txt
+++ b/SOL002/VNFPerformanceManagement-API/environment/variables.txt
@@ -4,7 +4,7 @@ ${VNFM_PORT}      8080    # Listening port of the VNFM
 ${VNFM_SCHEMA}    https
 
 ${apiRoot}        /
-${apiVersion}     v1
+${apiMajorVersion}     v1
 ${apiName}        vnfpm
 
 
-- 
GitLab


From a998341da674320351777800b778e7e2b66bac0b Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 13 Oct 2020 12:54:48 +0500
Subject: [PATCH 071/322] added majorApiVersion

---
 SOL002/VNFFaultManagement-API/Alarms.robot    | 34 +++++++--------
 .../VNFFaultManagement-API/ApiVersion.robot   | 10 ++---
 .../EscalatePerceivedSeverityTask.robot       | 12 +++---
 .../IndividualAlarm.robot                     | 16 +++----
 .../IndividualSubscription.robot              | 16 +++----
 .../Subscriptions.robot                       | 42 +++++++++----------
 .../environment/variables.txt                 |  2 +-
 7 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/SOL002/VNFFaultManagement-API/Alarms.robot b/SOL002/VNFFaultManagement-API/Alarms.robot
index 6bc714a21..fd51868aa 100644
--- a/SOL002/VNFFaultManagement-API/Alarms.robot
+++ b/SOL002/VNFFaultManagement-API/Alarms.robot
@@ -262,28 +262,28 @@ POST Alarms Task
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/alarms
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 PUT Alarms Task
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/alarms
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 PATCH Alarms Task
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/alarms
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 DELETE Alarms Task
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/alarms
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}			
 GET Alarms Task	
@@ -291,7 +291,7 @@ GET Alarms Task
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 GET Alarms Task with filter
@@ -299,7 +299,7 @@ GET Alarms Task with filter
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?${alarm_filter}=${managedObjectId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?${alarm_filter}=${managedObjectId} 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	   	
 GET Alarms Task with invalid filter
@@ -307,35 +307,35 @@ GET Alarms Task with invalid filter
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?${invalid_alarm_filter}=${managedObjectId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?${invalid_alarm_filter}=${managedObjectId} 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 GET Alarms Task with all_fields attribute selector
     Log    Query VNF The GET method queries information about multiple alarms, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/alarms?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 GET Alarms Task with exclude_default attribute selector
     Log    Query VNF The GET method queries information about multiple alarms, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/alarms?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 GET Alarms Task with fields attribute selector
     Log    Query VNF The GET method queries information about multiple alarms, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/alarms?fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 GET Alarms Task with exclude_fields attribute selector
     Log    Query VNF The GET method queries information about multiple alarms, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/alarms?exclude_fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -366,7 +366,7 @@ GET Alarms Task with filter "id"
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?id=${alarmId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?id=${alarmId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -378,7 +378,7 @@ GET Alarms Task with filter "vnfcInstanceIds"
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?vnfcInstanceIds=${vnfcInstanceIds}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?vnfcInstanceIds=${vnfcInstanceIds}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -392,7 +392,7 @@ GET Alarms Task with filter "rootCauseFaultyResource_faultyResourceType"
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?rootCauseFaultyResource.faultyResourceType=${faultyResourceType}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?rootCauseFaultyResource.faultyResourceType=${faultyResourceType}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -406,7 +406,7 @@ GET Alarms Task with filter "eventType"
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?eventType=${eventType}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?eventType=${eventType}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -420,7 +420,7 @@ GET Alarms Task with filter "perceivedSeverity"
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?perceivedSeverity=${perceivedSeverity}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?perceivedSeverity=${perceivedSeverity}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -434,7 +434,7 @@ GET Alarms Task with filter "probableCause"
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?probableCause=${probableCause}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?probableCause=${probableCause}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
diff --git a/SOL002/VNFFaultManagement-API/ApiVersion.robot b/SOL002/VNFFaultManagement-API/ApiVersion.robot
index ae7bb77b0..ea7c27ddc 100644
--- a/SOL002/VNFFaultManagement-API/ApiVersion.robot
+++ b/SOL002/VNFFaultManagement-API/ApiVersion.robot
@@ -169,35 +169,35 @@ DELETE API Version
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/v1/api_version
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/v1/api_version
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/v1/api_version
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/v1/api_version
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/v1/api_version
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
diff --git a/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot b/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
index 394a9c789..63f0d49d9 100644
--- a/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
+++ b/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
@@ -70,38 +70,38 @@ Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     Integer    response status    200
 POST escalate severity
     Log    escalate the perceived severity of an alarm with the VNFM
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}/escalate    ${PerceivedSeverity}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}/escalate    ${PerceivedSeverity}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 GET escalate severity
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}/escalate 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}/escalate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 PUT escalate severity	
 	log    Trying to perform a PUT. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}/escalate    
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}/escalate    
      ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 PATCH escalate severity
     log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}/escalate  
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}/escalate  
      ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 DELETE escalate severity        
     log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}/escalate  
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}/escalate  
      ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
diff --git a/SOL002/VNFFaultManagement-API/IndividualAlarm.robot b/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
index ada7690ea..0aa6b9e2f 100644
--- a/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
+++ b/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
@@ -116,7 +116,7 @@ POST Alarm Task
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 PUT Alarm Task
@@ -124,7 +124,7 @@ PUT Alarm Task
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/alarmModifications.json
-    Put    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}     ${body}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}     ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 PATCH Alarm Task
@@ -134,7 +134,7 @@ PATCH Alarm Task
     Set Headers  {"If-Match": "${original_etag[0]}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/alarmModifications.json
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}    ${body}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 PATCH Alarm Task with wrong precondition
@@ -143,14 +143,14 @@ PATCH Alarm Task with wrong precondition
     Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/alarmModifications.json
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}    ${body}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 DELETE Alarm Task
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}			
 GET Alarm Task	
@@ -158,7 +158,7 @@ GET Alarm Task
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${etag}    Output    response headers ETag
     Set Suite Variable    &{original_etag}    ${etag}
     ${outputResponse}=    Output    response
@@ -168,7 +168,7 @@ GET Alarm Task with filter
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?${alarm_filter}=${managedObjectId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?${alarm_filter}=${managedObjectId} 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 GET Alarm Task with invalid filter
@@ -176,7 +176,7 @@ GET Alarm Task with invalid filter
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?${invalid_alarm_filter}=${managedObjectId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?${invalid_alarm_filter}=${managedObjectId} 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Check HTTP Response Status Code Is
diff --git a/SOL002/VNFFaultManagement-API/IndividualSubscription.robot b/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
index 274b83385..245f27508 100644
--- a/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
+++ b/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
@@ -85,41 +85,41 @@ GET Information about an individual subscription - Not Found
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
     Integer    response status    200
 Post Create individual subscription
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}  
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}				
 Get individual subscription
     log    Trying to get information about an individual subscription
     Set Headers    {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Get individual subscription - filter
     Log    Get the list of active individual subscription using a filter
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Get individual subscription - invalid filter  
     Log    Get the list of active individual subscription using an invalid filter
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter_invalid}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter_invalid}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 PUT individual subscription
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}        
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}        
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 PATCH individual subscription
@@ -127,14 +127,14 @@ PATCH individual subscription
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} 
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 DELETE individual subscription
     log    Try to delete an individual subscription
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}    	   
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}    	   
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	      
 	
diff --git a/SOL002/VNFFaultManagement-API/Subscriptions.robot b/SOL002/VNFFaultManagement-API/Subscriptions.robot
index bc3bbb182..2a1461e1f 100644
--- a/SOL002/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL002/VNFFaultManagement-API/Subscriptions.robot
@@ -298,13 +298,13 @@ POST Create a new Subscription - Unprocessable Entity
 
 *** Keywords ***
 Post Create subscription
-    Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}				
 Post Create subscription - DUPLICATION
@@ -315,7 +315,7 @@ Post Create subscription - DUPLICATION
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}		
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}			
 Post Create subscription - NO-DUPLICATION	
@@ -326,7 +326,7 @@ Post Create subscription - NO-DUPLICATION
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Get subscriptions
@@ -335,70 +335,70 @@ Get subscriptions
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions	
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Get subscriptions - filter
     Log    Get the list of active subscriptions using a filter
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Get subscriptions - invalid filter  
     Log    Get the list of active subscriptions using an invalid filter
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter_invalid}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter_invalid}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Get subscriptions with all_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get subscriptions with exclude_default attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get subscriptions with fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 Get subscriptions with exclude_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?exclude_fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 	
 PUT subscriptions
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/subscriptions       
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions       
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 PATCH subscriptions
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/subscriptions     
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions     
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 DELETE subscriptions
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/subscriptions 	   
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions 	   
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	  
 
@@ -422,7 +422,7 @@ Get subscriptions with filter "id"
     Log    Get the list of active subscriptions using a filter "id"
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?id=${subscription_id}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?id=${subscription_id}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -433,7 +433,7 @@ Get subscriptions with filter "filter_notificationTypes"
     Log    Get the list of active subscriptions using a filter "filter.notificationTypes"
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?filter.notificationTypes=${notification_type}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.notificationTypes=${notification_type}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -446,7 +446,7 @@ Get subscriptions with filter "filter_faultyResourceTypes"
     Log    Get the list of active subscriptions using a filter "filter.faultyResourceTypes"
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?filter.faultyResourceTypes=${faultyResourceType}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.faultyResourceTypes=${faultyResourceType}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -459,7 +459,7 @@ Get subscriptions with filter "filter_perceivedSeverities"
     Log    Get the list of active subscriptions using a filter "filter.perceivedSeverities"
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?filter.perceivedSeverities=${perceivedSeverity}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.perceivedSeverities=${perceivedSeverity}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -472,7 +472,7 @@ Get subscriptions with filter "filter_eventTypes"
     Log    Get the list of active subscriptions using a filter "filter.eventTypes"
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?filter.eventTypes=${eventType}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.eventTypes=${eventType}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -485,7 +485,7 @@ Get subscriptions with filter "filter_probableCauses"
     Log    Get the list of active subscriptions using a filter "filter.probableCauses"
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?filter.probableCauses=${probableCause}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.probableCauses=${probableCause}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -497,6 +497,6 @@ Check PostCondition HTTP Response Body Subscriptions Matches the requested attri
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
     Integer    response status    200
 
diff --git a/SOL002/VNFFaultManagement-API/environment/variables.txt b/SOL002/VNFFaultManagement-API/environment/variables.txt
index 1264a6aa9..dbc40ec86 100644
--- a/SOL002/VNFFaultManagement-API/environment/variables.txt
+++ b/SOL002/VNFFaultManagement-API/environment/variables.txt
@@ -11,7 +11,7 @@ ${managedObjectId}    007c111c-38a1-42c0-a666-7475ecb1567c
 ${invalid_alarm_filter}    badFilter 
 ${apiRoot}        /
 ${apiName}        vnffm
-${apiVersion}     v1
+${apiMajorVersion}     v1
 ${CONTENT_TYPE}    application/json
 
 ${VNFM_ALLOWS_DUPLICATE_SUBS}    0
-- 
GitLab


From f0191caab33d2c97f0cca5d164bc6677b7c42ac6 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 13 Oct 2020 12:57:26 +0500
Subject: [PATCH 072/322] added majorApiVersion

---
 SOL002/VNFIndicator-API/ApiVersion.robot      | 10 +++----
 .../IndividualSubscription.robot              | 18 ++++++-------
 .../IndividualVNFindicator.robot              | 26 +++++++++----------
 SOL002/VNFIndicator-API/Subscriptions.robot   | 22 ++++++++--------
 SOL002/VNFIndicator-API/VNFIndicators.robot   | 22 ++++++++--------
 .../VnfIndicatorsInVnfInstanceId.robot        | 18 ++++++-------
 .../environment/variables.txt                 |  2 +-
 7 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/SOL002/VNFIndicator-API/ApiVersion.robot b/SOL002/VNFIndicator-API/ApiVersion.robot
index 25aa1403f..9a9b25f3b 100644
--- a/SOL002/VNFIndicator-API/ApiVersion.robot
+++ b/SOL002/VNFIndicator-API/ApiVersion.robot
@@ -169,35 +169,35 @@ DELETE API Version
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/v1/api_version
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/v1/api_version
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/v1/api_version
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/v1/api_version
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/v1/api_version
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 
diff --git a/SOL002/VNFIndicator-API/IndividualSubscription.robot b/SOL002/VNFIndicator-API/IndividualSubscription.robot
index d8a8eb5a0..dc83acc73 100644
--- a/SOL002/VNFIndicator-API/IndividualSubscription.robot
+++ b/SOL002/VNFIndicator-API/IndividualSubscription.robot
@@ -102,7 +102,7 @@ Get Individual VNF Indicator Subscription
     Log    Trying to get a given subscription identified by subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -110,7 +110,7 @@ GET Individual VNF Indicator Subscription with invalid resource identifier
     Log    Trying to perform a request on a subscriptionID which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -118,7 +118,7 @@ Send Delete Request for Individual VNF Indicator Subscription
     Log    Trying to perform a DELETE on a subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -126,14 +126,14 @@ Send Delete Request for Individual VNF Indicator Subscription with invalid resou
     Log    Trying to perform a DELETE on a subscriptionId which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Send Post Request for Individual VNF Indicator Subscription
     Log    Trying to create a new subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
 
@@ -141,20 +141,20 @@ Send Put Request for Individual VNF Indicator Subscription
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
 
 Send Patch Request for Individual VNF Indicator Subscription
     Log    Trying to create a new subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
diff --git a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
index 08a04f106..5e5cdf32d 100644
--- a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
+++ b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
@@ -163,7 +163,7 @@ Get Individual Indicator for a VNF instance
     Log    This resource represents a VNF indicator related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -171,7 +171,7 @@ Get Individual Indicator for a VNF instance with invalid indicator identifier
     Log    Trying to perform a negative get, using wrong identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${erroneousIndicatorId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${erroneousIndicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -179,7 +179,7 @@ Send POST Request for individual indicator in VNF instance
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${notAllowedIndicatorId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${notAllowedIndicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -187,7 +187,7 @@ Send PUT Request for individual indicator in VNF instance
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -195,7 +195,7 @@ Send PATCH Request for individual indicator in VNF instance
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
      
@@ -203,7 +203,7 @@ Send DELETE Request for individual indicator in VNF instance
     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": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -244,7 +244,7 @@ Get Individual Indicator
     Log    This resource represents a VNF indicator related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${indicatorId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -252,7 +252,7 @@ Get Individual Indicator with invalid indicator identifier
     Log    Trying to perform a negative get, using wrong identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${erroneousIndicatorId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${erroneousIndicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -260,7 +260,7 @@ Send POST Request for individual indicator
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${notAllowedIndicatorId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${notAllowedIndicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -268,7 +268,7 @@ Send PUT Request for individual indicator
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/indicators/${indicatorId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -276,7 +276,7 @@ Send PATCH Request for individual indicator
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/indicators/${indicatorId}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -284,7 +284,7 @@ Send DELETE Request for individual indicator
     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": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/indicators/${indicatorId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -292,5 +292,5 @@ Check PostCondition Individual Indicator exist
     Log    This resource represents a VNF indicator related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
     Integer    response status    200	
\ No newline at end of file
diff --git a/SOL002/VNFIndicator-API/Subscriptions.robot b/SOL002/VNFIndicator-API/Subscriptions.robot
index 65cfcde57..a2624bada 100644
--- a/SOL002/VNFIndicator-API/Subscriptions.robot
+++ b/SOL002/VNFIndicator-API/Subscriptions.robot
@@ -185,7 +185,7 @@ Get VNF Indicators Subscriptions
     Log    Trying to get the list of subscriptions
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -193,7 +193,7 @@ Get VNF Indicators Subscriptions with filter
     Log    Trying to get the list of subscriptions using filters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${POS_FILTER}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${POS_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -201,7 +201,7 @@ Get VNF Indicators Subscriptions with invalid filter
     Log    Trying to get the list of subscriptions using filters with wrong attribute name
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${NEG_FILTER}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${NEG_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
     
@@ -209,7 +209,7 @@ Get VNF Indicators Subscriptions with invalid resource endpoint
         Log    Trying to perform a request on a Uri which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscription
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
 
@@ -220,7 +220,7 @@ Send Post Request for VNF Indicator Subscription
     ${template}=    Get File    jsons/subscriptions.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}  
     Run Keyword If    ${VNFM_CHECKS_NOTIF_ENDPOINT} == 1
@@ -230,7 +230,7 @@ Send Put Request for VNF Indicator Subscriptions
     Log    Trying to create a new subscription
     ${body}=    Get File    jsons/subscriptions.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -238,7 +238,7 @@ Send Patch Request for VNF Indicator Subscriptions
     Log    Trying to create a new subscription
     ${body}=    Get File    jsons/subscriptions.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -246,7 +246,7 @@ Send Delete Request for VNF Indicator Subscriptions
     Log    Trying to create a new subscription
     ${body}=    Get File    jsons/subscriptions.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -280,7 +280,7 @@ Check Postcondition VNF Indicator Subscription Is Set
     Log    Trying to get the subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${response['body']['id']}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
@@ -314,7 +314,7 @@ Post Create subscription - DUPLICATION
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${body}=    Get File    jsons/subscriptions.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}		
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 		
@@ -325,7 +325,7 @@ Post Create subscription - NO-DUPLICATION
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${body}=    Get File    jsons/subscriptions.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 	
diff --git a/SOL002/VNFIndicator-API/VNFIndicators.robot b/SOL002/VNFIndicator-API/VNFIndicators.robot
index a4e5e7b46..11b8d7b01 100644
--- a/SOL002/VNFIndicator-API/VNFIndicators.robot
+++ b/SOL002/VNFIndicator-API/VNFIndicators.robot
@@ -177,7 +177,7 @@ Get all VNF indicators
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -186,7 +186,7 @@ Get VNF indicators with filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators?${POS_FIELDS}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators?${POS_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -195,7 +195,7 @@ Get VNF indicators with invalid filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators?${NEG_FIELDS}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators?${NEG_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -205,7 +205,7 @@ Get all VNF indicators with malformed authorization token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Authorization": "${BAD_AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -215,7 +215,7 @@ Get all VNF indicators with expired or revoked authorization token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Authorization": "${NEG_AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -224,7 +224,7 @@ Get all VNF indicators without authorization token
     Log    The GET method queries multiple VNF indicators omitting token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -233,7 +233,7 @@ Get all VNF indicators with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/indicator
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicator
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -241,7 +241,7 @@ Send POST Request for all VNF indicators
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/indicators
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -249,7 +249,7 @@ Send PUT Request for all VNF indicators
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/indicators
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -257,7 +257,7 @@ Send PATCH Request for all VNF indicators
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/indicators
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -265,7 +265,7 @@ Send DELETE Request for all VNF indicators
     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":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/indicators
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
diff --git a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
index 1ab37fc66..06cc15ba8 100644
--- a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
+++ b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
@@ -142,7 +142,7 @@ Get all indicators for a VNF instance
     Log    This resource represents VNF indicators related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -150,7 +150,7 @@ Get all indicators for a VNF instance with filter
     Log    This resource represents VNF indicators related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}?${POS_FIELDS}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}?${POS_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
        
@@ -158,7 +158,7 @@ Get all indicators for a VNF instance with invalid filter
     Log    This resource represents VNF indicators related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}?${NEG_FIELDS}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}?${NEG_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -166,7 +166,7 @@ Get all indicators for a VNF instance with invalid resource identifier
     Log    Trying to perform a negative get, using wrong identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${erroneousVnfInstanceId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${erroneousVnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -174,7 +174,7 @@ Send POST Request for indicators in VNF instance
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -182,7 +182,7 @@ Send PUT Request for indicators in VNF instance
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -190,7 +190,7 @@ Send PATCH Request for indicators in VNF instance
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
      
@@ -198,7 +198,7 @@ Send DELETE Request for indicators in VNF instance
     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": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -234,7 +234,7 @@ Check Postcondition Indicators for VNF instance Exist
     Log    Check Postcondition Indicators for VNF instance Exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
     Should Be Equal    ${response['status']}    200
     
 Check LINK in Header
diff --git a/SOL002/VNFIndicator-API/environment/variables.txt b/SOL002/VNFIndicator-API/environment/variables.txt
index 58dff1e61..22f32a1fb 100644
--- a/SOL002/VNFIndicator-API/environment/variables.txt
+++ b/SOL002/VNFIndicator-API/environment/variables.txt
@@ -12,7 +12,7 @@ ${EM-VNF_SCHEMA}    https
 ${ACCEPT_JSON}    application/json
 ${AUTH_USAGE}     1
 ${apiRoot}        /
-${apiVersion}     v1
+${apiMajorVersion}     v1
 ${apiName}        vnfind
 
 
-- 
GitLab


From 07e687cda8f915e2da07fe1dbcf8dbf935943ada Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 13 Oct 2020 12:59:59 +0500
Subject: [PATCH 073/322] added majorApiVersion

---
 SOL002/VNFConfiguration-API/ApiVersion.robot         | 10 +++++-----
 SOL002/VNFConfiguration-API/Configuration.robot      | 12 ++++++------
 .../VNFConfiguration-API/environment/variables.txt   |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/SOL002/VNFConfiguration-API/ApiVersion.robot b/SOL002/VNFConfiguration-API/ApiVersion.robot
index f0e1fe455..47abb5a53 100644
--- a/SOL002/VNFConfiguration-API/ApiVersion.robot
+++ b/SOL002/VNFConfiguration-API/ApiVersion.robot
@@ -167,35 +167,35 @@ DELETE API Version
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/v1/api_version
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/v1/api_version
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/v1/api_version
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/v1/api_version
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/v1/api_version
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 
diff --git a/SOL002/VNFConfiguration-API/Configuration.robot b/SOL002/VNFConfiguration-API/Configuration.robot
index 13dda5c88..f520a7578 100644
--- a/SOL002/VNFConfiguration-API/Configuration.robot
+++ b/SOL002/VNFConfiguration-API/Configuration.robot
@@ -110,7 +110,7 @@ Get VNF configuration
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/configuration
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/configuration
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -120,7 +120,7 @@ Send VNF configuration
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/vnfConfigModifications.json
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/configuration    ${body}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/configuration    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -165,7 +165,7 @@ Send Duplicated VNF configuration
     Set Headers    {"If-Match": "${etag}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/vnfConfigModifications.json
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/configuration    ${body}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/configuration    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -173,7 +173,7 @@ Send POST Request for VNF Configuration
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/configuration
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/configuration
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -181,7 +181,7 @@ Send PUT Request for VNF Configuration
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/configuration
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/configuration
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -189,6 +189,6 @@ Send DELETE Request for VNF Configuration
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/configuration
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/configuration
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
\ No newline at end of file
diff --git a/SOL002/VNFConfiguration-API/environment/variables.txt b/SOL002/VNFConfiguration-API/environment/variables.txt
index 40bbd9343..0cd66a08c 100644
--- a/SOL002/VNFConfiguration-API/environment/variables.txt
+++ b/SOL002/VNFConfiguration-API/environment/variables.txt
@@ -16,7 +16,7 @@ ${CONTENT_TYPE}    application/json
 
 ${apiRoot}        /
 ${apiName}        vnfconfig
-${apiVersion}     v1
+${apiMajorVersion}     v1
 
 ${WRONG_AUTHORIZATION}    Bearer    XXXXXWRONGXXXXX
 
-- 
GitLab


From b0d78bdad90c2747cf2cbf7a705c5f31d4b6f707 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 13 Oct 2020 13:07:29 +0500
Subject: [PATCH 074/322] added majorApiVersion

---
 .../ApiVersion.robot                          |  10 +-
 .../CancelOperationTask.robot                 |   8 +-
 .../CancelOperationWorkflow.robot             |   8 +-
 .../ChangeExternalVNFConnectivityTask.robot   |   4 +-
 .../ChangeVNFFlavourTask.robot                |  10 +-
 .../FailOperationTask.robot                   |   6 +-
 .../FailOperationWorkflow.robot               |   4 +-
 .../HealVNFTask.robot                         |   8 +-
 .../IndividualSubscription.robot              |   2 +-
 .../IndividualVNFInstance.robot               |   6 +-
 .../InstantiateVNFTask.robot                  |   4 +-
 .../InstantiateVNFTaskWorkflow.robot          |   2 +-
 .../OperateVNFTask.robot                      |   8 +-
 .../RetryOperationTask.robot                  |   6 +-
 .../RetryOperationWorkflow.robot              |   6 +-
 .../RollBackOperationWorkflow.robot           |   6 +-
 .../RollbackOperationTask.robot               |   6 +-
 .../ScaleVNFTask.robot                        |   8 +-
 .../ScaleVNFToLevelTask.robot                 |   8 +-
 .../SubscriptionKeywords.robot                |   4 +-
 .../TerminateVNFTask.robot                    |   8 +-
 .../VnfLcmMntOperationKeywords.robot          | 272 +++++++++---------
 .../environment/configuration.txt             |   2 +-
 23 files changed, 203 insertions(+), 203 deletions(-)

diff --git a/SOL003/VNFLifecycleManagement-API/ApiVersion.robot b/SOL003/VNFLifecycleManagement-API/ApiVersion.robot
index 3af9e2c16..9b644479d 100644
--- a/SOL003/VNFLifecycleManagement-API/ApiVersion.robot
+++ b/SOL003/VNFLifecycleManagement-API/ApiVersion.robot
@@ -168,35 +168,35 @@ DELETE API Version
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/v1/api_version
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/v1/api_version
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/v1/api_version
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/v1/api_version
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/v1/api_version
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
diff --git a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
index a716a2d1e..a59afa065 100644
--- a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
@@ -99,20 +99,20 @@ DELETE Cancel operation task - Method not implemented
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     Integer    response status    200
 
 Launch another error handling action
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry
     Integer    response status    202
     
 Check Fail not supported
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     # how to check if Fail is not supported?
 
 Check resource FAILED_TEMP
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body operationState    FAILED_TEMP
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot
index 05c970fa6..b3a52eb84 100644
--- a/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot
@@ -55,22 +55,22 @@ Initialize System
     
 Precondition Checks - STARTING
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body operationState    STARTING
 
 Precondition Checks - PROCESSING - ROLLING_BACK
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body operationState    PROCESSING 
 
 Check Postcondition VNF Cancel - STARTING
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body operationState    ROLLED_BACK
 
 Check Postcondition VNF Cancel - PROCESSING - ROLLING_BACK
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body operationState    FAILED_TEMP
  
 Check Operation Notification For Cancel 
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
index 8cabe1bbb..be2f16094 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
@@ -74,7 +74,7 @@ Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
 
 Launch another LCM operation
@@ -82,5 +82,5 @@ Launch another LCM operation
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/scaleVnfRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
     Integer    response status    202
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
index 26326b039..8ebf82909 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
@@ -101,28 +101,28 @@ Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
 
 Check resource not instantiated
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     String    response body instantiationState    NOT_INSTANTIATED
 
 Check resource instantiated
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     String    response body instantiationState    INSTANTIATED    
 
 Check change flavour not supported
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     # how to check if change floavour is not supported? "flavourId" doesn't exist?
 
 Launch another LCM operation
@@ -130,5 +130,5 @@ Launch another LCM operation
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/scaleVnfRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
     Integer    response status    202
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot b/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
index 5e0c6ba82..a5db3b48d 100644
--- a/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
@@ -101,16 +101,16 @@ DELETE Fail operation task - Method not implemented
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     Integer    response status    200
 
 Launch another error handling action
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry
     Integer    response status    202
     
 Check Fail not supported
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     # how to check if Fail is not supported?
 
diff --git a/SOL003/VNFLifecycleManagement-API/FailOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/FailOperationWorkflow.robot
index 35c87ff12..be9b602e0 100644
--- a/SOL003/VNFLifecycleManagement-API/FailOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/FailOperationWorkflow.robot
@@ -36,12 +36,12 @@ Initialize System
     
 Precondition Checks
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body operationState    FAILED_TEMP
 
 Check Postcondition VNF Fail
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body operationState    FAILED
  
 Check Operation Notification For Fail 
diff --git a/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot b/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
index dadd2ea47..c30791d82 100644
--- a/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
@@ -104,21 +104,21 @@ Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
 
 Check resource not instantiated
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     String    response body instantiationState    NOT_INSTANTIATED
 
 Check heal not supported
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     # how to check if heal is not supported? "flavourId" doesn't exist?
 
 Launch another LCM operation
@@ -126,5 +126,5 @@ Launch another LCM operation
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/scaleVnfRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
     Integer    response status    202
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot b/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot
index 8088c0856..9d00ce943 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot
@@ -85,5 +85,5 @@ Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
     Integer    response status    200
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index da668687a..c1fd08129 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
@@ -132,14 +132,14 @@ Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
 
 Check resource instantiated
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     String    response body instantiationState    INSTANTIATED
 
 Launch another LCM operation
@@ -147,7 +147,7 @@ Launch another LCM operation
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/scaleVnfToLevelRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
     Integer    response status    202
 SET etag
     ${etag}    Output    response headers ETag
diff --git a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
index 1990c4dc4..87d127b99 100644
--- a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
@@ -90,12 +90,12 @@ Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
 
 Check resource instantiated
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     String    response body instantiationState    INSTANTIATED
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot
index 24fb72421..839d28a97 100644
--- a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot
@@ -42,7 +42,7 @@ Send VNF Instantiation Request
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/instantiateVnfRequest.json
-    ${response}=    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/instantiate    ${body}
+    ${response}=    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/instantiate    ${body}
     
 Check Operation Notification For Instantiation
     [Arguments]    ${status}
diff --git a/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
index c5dba8677..d7d01667b 100644
--- a/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
@@ -102,21 +102,21 @@ Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
 
 Check resource not instantiated
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     String    response body instantiationState    NOT_INSTANTIATED
 
 Check operate not supported
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     # how to check if operate is not supported? "flavourId" doesn't exist?
 
 Launch another LCM operation
@@ -124,5 +124,5 @@ Launch another LCM operation
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/scaleVnfRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
     Integer    response status    202
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot b/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
index ff057a941..eb8d440e9 100644
--- a/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
@@ -101,16 +101,16 @@ DELETE Retry operation task - Method not implemented
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     Integer    response status    200
 
 Launch another error handling action
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback
     Integer    response status    202
     
 Check retry not supported
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     # how to check if retry is not supported?
 
diff --git a/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
index 8a62a5f30..f9858ebea 100644
--- a/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
@@ -53,17 +53,17 @@ Initialize System
     
 Precondition Checks
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body operationState    FAILED_TEMP
 
 Check Postcondition VNF Retry Successful
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body operationState    COMPLETED
 
 Check Postcondition VNF Retry Unsuccessful
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body operationState    FAILED_TEMP
     
 Check Operation Notification For Retry 
diff --git a/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
index e22b001c8..92734b6f9 100644
--- a/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
@@ -56,17 +56,17 @@ Initialize System
     
 Precondition Checks
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body operationState    FAILED_TEMP
 
 Check Postcondition VNF Roll Back Successful
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body operationState    ROLLED_BACK
 
 Check Postcondition VNF Roll Back Unsuccessful
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body operationState    FAILED_TEMP
     
 Check Operation Notification For Roll Back 
diff --git a/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot b/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
index 4f5fc7688..dcc5f288b 100644
--- a/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
@@ -101,16 +101,16 @@ DELETE Rollback operation task - Method not implemented
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     Integer    response status    200
 
 Launch another error handling action
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry
     Integer    response status    202
     
 Check Rollback not supported
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     # how to check if Rollback is not supported?
     
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
index d5f81b268..b8caee904 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
@@ -104,21 +104,21 @@ Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
 
 Check resource not instantiated
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     String    response body instantiationState    NOT_INSTANTIATED
 
 Check scale not supported
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Missing    response body instantiatedVnfInfo scaleStatus
 
 Launch another LCM operation
@@ -126,5 +126,5 @@ Launch another LCM operation
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/scaleVnfToLevelRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
     Integer    response status    202
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
index b57e54726..6706ed342 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
@@ -105,21 +105,21 @@ Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
 
 Check resource not instantiated
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${notInstantiatedVnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notInstantiatedVnfInstanceId} 
     String    response body instantiationState    NOT_INSTANTIATED
 
  Check scale to level not supported
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Missing    response body instantiatedVnfInfo scaleStatus
 
 Launch another LCM operation
@@ -127,5 +127,5 @@ Launch another LCM operation
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/scaleVnfRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
     Integer    response status    202
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/SubscriptionKeywords.robot b/SOL003/VNFLifecycleManagement-API/SubscriptionKeywords.robot
index 54fa12754..6c858da67 100644
--- a/SOL003/VNFLifecycleManagement-API/SubscriptionKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/SubscriptionKeywords.robot
@@ -14,8 +14,8 @@ Check subscriptions about one VNFInstance and operation type
     [Arguments]    ${vnfInstanceId}    ${notificationType}    ${operationType}=""    ${operationState}=""
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    Run Keyword If    ${notificationType}=="VnfIdentifierCreationNotification" or ${notificationType}=="VnfIdentifierDeletionNotification"    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?vnfInstanceIds=${vnfInstanceId}&notificationTypes=${notificationType} 
-    ...    ELSE    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?vnfInstanceIds=${vnfInstanceId}&notificationTypes=${notificationType}&operationTypes=${operationType}&operationStates=${operationState}
+    Run Keyword If    ${notificationType}=="VnfIdentifierCreationNotification" or ${notificationType}=="VnfIdentifierDeletionNotification"    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?vnfInstanceIds=${vnfInstanceId}&notificationTypes=${notificationType} 
+    ...    ELSE    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?vnfInstanceIds=${vnfInstanceId}&notificationTypes=${notificationType}&operationTypes=${operationType}&operationStates=${operationState}
     Integer    response status    200
     Array    response body    minItems=1
     ${body}    Output    response body
diff --git a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
index 94fa1a7f3..928f931a8 100644
--- a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
@@ -89,21 +89,21 @@ Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
 
 Check resource not instantiated
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     String    response body instantiationState    NOT_INSTANTIATED
 
 Check change flavour not supported
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     # how to check if change floavour is not supported? "flavourId" doesn't exist?
 
 Launch another LCM operation
@@ -111,5 +111,5 @@ Launch another LCM operation
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/scaleVnfRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
     Integer    response status    202
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index 8fde64a7e..723712d75 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -18,7 +18,7 @@ Get Vnf Instance
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}
     ${body}=    Output    response body
     [Return]    ${body}
 
@@ -56,7 +56,7 @@ Check VNF Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${response}=    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfId}
+    ${response}=    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfId}
 
 Check VNF Status
     [Arguments]    ${current}    ${expected}
@@ -65,12 +65,12 @@ Check VNF Status
 
 Check operation resource state is FAILED_TEMP
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body instantiationState    FAILED_TEMP     
     
 Check operation resource state is FINALLY_FAILED
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body instantiationState    FINALLY_FAILED      
 Get Vnf Scale Info
     [Arguments]    ${vnfInstanceId}
@@ -108,7 +108,7 @@ Send VNF Scale Out Request
     ${body}=    Get File    jsons/scaleVnfOutRequest.json
     ${json}=    evaluate    json.loads('''${body}''')    json
     ${aspectId}=    Set Variable    ${json.aspectId}  
-    ${response}=    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
+    ${response}=    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
     
 Send VNF Scale To Level Request
     [Documentation]    Instantiate VNF The POST method instantiates a VNF instance.
@@ -119,20 +119,20 @@ Send VNF Scale To Level Request
     ${body}=    Get File    jsons/scaleVnfToLevelRequest.json
     ${json}=    evaluate    json.loads('''${body}''')    json
     ${aspectId}=    Set Variable    ${json.aspectId}  
-    ${response}=    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
+    ${response}=    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
     
 Send VNF Instance Resource Create Request
-    Log    Create VNF instance by POST to ${apiRoot}/${apiName}/${apiVersion}/vnf_instances
+    Log    Create VNF instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/createVnfRequest.json
-    ${response}=    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances    ${body}
+    ${response}=    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances    ${body}
 
 Send VNF Instance Resource Delete Request
     log    Delete an individual VNF instance
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${response}=    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}
+    ${response}=    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}
 
 Send Change VNF Flavour Request
     Log    Trying to change the deployment flavour of a VNF instance.
@@ -140,7 +140,7 @@ Send Change VNF Flavour Request
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/changeVnfFlavourRequest.json
-    ${response}=    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour    ${body}
+    ${response}=    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_flavour    ${body}
 
 Send Change VNF Operational State Request
     Log    Trying to change the operational state of a VNF instance.
@@ -148,7 +148,7 @@ Send Change VNF Operational State Request
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/operateVnfRequest.json
-    ${response}=    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate    ${body}
+    ${response}=    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/operate    ${body}
 
 Send Heal VNF Request
     Log    Trying to heal a VNF instance.
@@ -156,7 +156,7 @@ Send Heal VNF Request
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/healVnfRequest.json
-    ${response}=    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal    ${body}
+    ${response}=    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/heal    ${body}
 
 Send Change Ext Connectivity Request
     Log    Trying to change the external connectivity of a VNF instance.
@@ -164,7 +164,7 @@ Send Change Ext Connectivity Request
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/changeExtVnfConnectivityRequest.json
-    ${response}=    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn    ${body}
+    ${response}=    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn    ${body}
 
 Send Terminate VNF Request
     Log    Trying to terminate a VNF instance.
@@ -172,7 +172,7 @@ Send Terminate VNF Request
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/terminateVnfRequest.json
-    ${response}=    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate    ${body}
+    ${response}=    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/terminate    ${body}
 
 Send Info Modification Request
     Log    Trying to update information of a VNF instance.
@@ -180,31 +180,31 @@ Send Info Modification Request
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/patchBodyRequest.json
-    ${response}=    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}    ${body}
+    ${response}=    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}    ${body}
 
 Send Retry Operation Request
     Log    Retry a VNF lifecycle operation if that operation has experienced a temporary failure
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${response}=    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry
+    ${response}=    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry
 
 Send Roll back Operation Request
     Log    Rollback a VNF lifecycle operation if that operation has experienced a temporary failure
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${response}=    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback
+    ${response}=    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback
 
 Send Fail Operation Request
     Log    Fail a VNF lifecycle operation if that operation has experienced a temporary failure
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${response}=    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
+    ${response}=    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
 
 Send Cancel Operation Request
     Log    Cancel an ongoing VNF lifecycle operation
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${response}=    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel     ${CancelMode}
+    ${response}=    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel     ${CancelMode}
 
 Create a new Grant - Synchronous mode
     [Arguments]    ${vnfInstanceId}    ${vnfLcmOpOccId}    ${operation}
-    Log    Request a new Grant for a VNF LCM operation by POST to ${apiRoot}/${apiName}/${apiVersion}/grants
+    Log    Request a new Grant for a VNF LCM operation by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/grants
     Pass Execution If    ${SYNC_MODE} == 0    The Granting process is asynchronous mode. Skipping the test
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
@@ -213,7 +213,7 @@ Create a new Grant - Synchronous mode
     ${json_body}=    evaluate    json.loads('''${body}''')    json
     Set To Dictionary     ${json_body}    vnfInstanceId=${vnfInstanceId}    vnfLcmOpOccId=${vnfLcmOpOccId}    operation=${operation}  
     ${body}=    evaluate    json.dumps(${json_body})    json  
-    Post    ${apiRoot}/${apiName}/${apiVersion}/grants    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/grants    ${body}
     Integer    response status    201
     Log    Status code validated 
     ${headers}=    Output    response headers
@@ -226,7 +226,7 @@ Create a new Grant - Synchronous mode
 
 Create a new Grant - Asynchronous mode
     [Arguments]    ${vnfInstanceId}    ${vnfLcmOpOccId}    ${operation}
-    Log    Request a new Grant for a VNF LCM operation by POST to ${apiRoot}/${apiName}/${apiVersion}/grants
+    Log    Request a new Grant for a VNF LCM operation by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/grants
     Pass Execution If    ${SYNC_MODE} == 1    The Granting process is synchronous mode. Skipping the test
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
@@ -235,7 +235,7 @@ Create a new Grant - Asynchronous mode
     ${json_body}=    evaluate    json.loads('''${body}''')    json
     Set To Dictionary     ${json_body}    vnfInstanceId=${vnfInstanceId}    vnfLcmOpOccId=${vnfLcmOpOccId}    operation=${operation}    
     ${body}=    evaluate    json.dumps(${json_body})    json 
-    Post    ${apiRoot}/${apiName}/${apiVersion}/grants    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/grants    ${body}
     Output    response
     Integer    response status    202
     Log    Status code validated
@@ -249,7 +249,7 @@ POST Cancel operation task
     Log    Cancel an ongoing VNF lifecycle operation
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Cancel a VNF lifecycle operation
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel    ${CancelMode}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel    ${CancelMode}
     Log    Validate Status code
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -257,28 +257,28 @@ POST Cancel operation task
 GET Cancel operation task
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel 	
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PUT Cancel operation task
     log    Trying to perform a PUT. This method should not be implemented 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel  		
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel  		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PATCH Cancel operation task
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel  	 	
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel  	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 DELETE Cancel operation task
     Log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel  	 	
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel  	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}        
 
@@ -288,35 +288,35 @@ POST Change External VNF Connectivity
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/changeExtVnfConnectivityRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  
 
 GET Change External VNF Connectivity
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn 	
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PUT Change External VNF Connectivity
     log    Trying to perform a PUT. This method should not be implemented 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn  		
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn  		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PATCH Change External VNF Connectivity
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn  	 	
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn  	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 DELETE Change External VNF Connectivity
     Log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn  	 	
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn  	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  
 	
@@ -327,34 +327,34 @@ POST Change VNF deployment flavour
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/changeVnfFlavourRequest.json
     ${body}=        Format String   ${template}     newFlavourId=${newFlavourId}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour    ${body} 
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_flavour    ${body} 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  	 
 GET Change VNF deployment flavour
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour 	
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_flavour 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PUT Change VNF deployment flavour
     log    Trying to perform a PUT. This method should not be implemented 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour 	
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_flavour 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PATCH Change VNF deployment flavour
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour   	 	
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_flavour   	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 DELETE Change VNF deployment flavour
     Log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour   	 	
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_flavour   	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	 	
@@ -365,7 +365,7 @@ POST Create a new vnfInstance
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/createVnfRequest.json
     ${body}=        Format String   ${template}     vnfdId=${vnfdId} 
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 
@@ -375,7 +375,7 @@ GET multiple vnfInstances
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances    
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances    
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 		
 
@@ -385,7 +385,7 @@ GET multiple vnfInstances with bad attribute
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances?attribute_not_exist=some_value  
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?attribute_not_exist=some_value  
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 
@@ -395,7 +395,7 @@ GET multiple vnfInstances with bad filter
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances?attribute_not_exist=some_value  
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?attribute_not_exist=some_value  
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 
@@ -403,35 +403,35 @@ GET multiple vnfInstances with all_fields attribute selector
     Log    Query status information about multiple VNF instances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 GET multiple vnfInstances with exclude_default attribute selector
     Log    Query status information about multiple VNF instances using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 GET multiple vnfInstances with fields attribute selector
     Log    Query status information about multiple VNF instances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances?fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 GET multiple vnfInstances with exclude_default and fields attribute selector
     Log    Query status information about multiple VNF instances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances?fields=${fields}&exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?fields=${fields}&exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 GET multiple vnfInstances with exclude_fields attribute selector
     Log    Query status information about multiple VNF instances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances?exclude_fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 	
          		     	
@@ -440,7 +440,7 @@ PUT VNFInstances
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances   
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances   
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 		     	
 
@@ -449,7 +449,7 @@ PATCH VNFInstances
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances   
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances   
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 		
 
@@ -458,7 +458,7 @@ DELETE VNFInstances
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances   
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances   
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 		  
     
@@ -467,7 +467,7 @@ POST individual vnfInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}    
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}    
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}        
 
@@ -476,7 +476,7 @@ GET individual vnfInstance
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 		
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}      
 	
@@ -485,7 +485,7 @@ PUT individual vnfInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}	  	
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}	  	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
@@ -495,13 +495,13 @@ PATCH individual vnfInstance
     Set Headers    {"Content-Type": "${CONTENT_TYPE_PATCH}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/patchBodyRequest.json
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}    ${body}	
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}    ${body}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 DELETE individual vnfInstance
     log    Trying to delete an individual VNF instance
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 POST instantiate individual vnfInstance	
@@ -510,35 +510,35 @@ POST instantiate individual vnfInstance
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/instantiateVnfRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/instantiate    ${body}	
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/instantiate    ${body}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 	
 GET instantiate individual vnfInstance
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/instantiate 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/instantiate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 
 PUT instantiate individual vnfInstance
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/instantiate 
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/instantiate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 
 PATCH instantiate individual vnfInstance
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/instantiate 
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/instantiate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 
 DELETE instantiate individual vnfInstance
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/instantiate 
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/instantiate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 POST Scale vnfInstance	
@@ -548,7 +548,7 @@ POST Scale vnfInstance
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/scaleVnfRequest.json
     ${body}=        Format String   ${template}     scaletype=${scaletype}    scaleAspectId=${scaleAspectId}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 GET Scale vnfInstance				
@@ -557,7 +557,7 @@ GET Scale vnfInstance
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/scaleVnfRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 PUT Scale vnfInstance				
@@ -566,7 +566,7 @@ PUT Scale vnfInstance
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/scaleVnfRequest.json
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale   
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale   
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 PATCH Scale vnfInstance				
@@ -575,7 +575,7 @@ PATCH Scale vnfInstance
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/scaleVnfRequest.json
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale   
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale   
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 DELETE Scale vnfInstance				
@@ -584,7 +584,7 @@ DELETE Scale vnfInstance
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/scaleVnfRequest.json
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale   
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale   
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 POST Scale vnfInstance to level
@@ -594,34 +594,34 @@ POST Scale vnfInstance to level
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/scaleVnfToLevelRequest.json
     ${body}=        Format String   ${template}     instantiationLevelId=${instantiationLevelId}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 GET Scale vnfInstance to level
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PUT Scale vnfInstance to level
     log    Trying to perform a PUT. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level 
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PATCH Scale vnfInstance to level
     log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level 
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 	
 DELETE Scale vnfInstance to level
     log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level 
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 		
@@ -632,35 +632,35 @@ POST Terminate VNF
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/terminateVnfRequest.json
     ${body}=        Format String   ${template}     terminationType=${terminationType}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate    ${body}	
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/terminate    ${body}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 GET Terminate VNF
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/terminate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PUT Terminate VNF
     log    Trying to perform a PUT. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate 
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/terminate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PATCH Terminate VNF
     log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate 
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/terminate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 	
 DELETE Terminate VNF
     log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate 
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/terminate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 
@@ -671,35 +671,35 @@ POST Heal VNF
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/healVnfRequest.json
     ${body}=        Format String   ${template}     healingCause=${healingCause}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal    ${body}		
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/heal    ${body}		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 
 GET Heal VNF
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal  
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/heal  
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PUT Heal VNF
     log    Trying to perform a PUT. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal 
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/heal 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PATCH Heal VNF
     log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal 
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/heal 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 	
 DELETE Heal VNF
     log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal 
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/heal 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 
@@ -710,35 +710,35 @@ POST Operate VNF
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/operateVnfRequest.json
     ${body}=        Format String   ${template}     changeStateTo=${changeStateTo}    stopType=${stopType}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/operate    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 
 GET Operate VNF
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate  
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/operate  
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PUT Operate VNF
     log    Trying to perform a PUT. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate 
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/operate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PATCH Operate VNF
     log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate 
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/operate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 	
 DELETE Operate VNF
     log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate 
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/operate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 	
@@ -746,7 +746,7 @@ Post VNF LCM Operation occurrences
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs  	
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs  	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 GET VNF LCM Operation occurrences
@@ -754,84 +754,84 @@ GET VNF LCM Operation occurrences
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 GET VNF LCM Operation occurrences invalid attribute
     Log    Query status information about multiple VNF lifecycle management operation occurrences.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"} 
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs?attribute_not_exist=some_value	
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?attribute_not_exist=some_value	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 GET VNF LCM Operation occurrences invalid filter
     Log    Query status information about multiple VNF lifecycle management operation occurrences.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"} 
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs?fields=wrong_field	
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?fields=wrong_field	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Get VNF LCM Operation occurrences with all_fields attribute selector
     Log    Query status information about multiple VNF lifecycle management operation occurrences, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get VNF LCM Operation occurrences with exclude_default and fields attribute selector
     Log    Query status information about multiple VNF lifecycle management operation occurrences, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs?fields=${fields}&exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?fields=${fields}&exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get VNF LCM Operation occurrences with exclude_default attribute selector
     Log    Query status information about multiple VNF lifecycle management operation occurrences using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get VNF LCM Operation occurrences with fields attribute selector
     Log    Query status information about multiple VNF lifecycle management operation occurrences, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs?fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 Get VNF LCM Operation occurrences with exclude_fields attribute selector
     Log    Query status information about multiple VNF lifecycle management operation occurrences, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs?exclude_fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 	
 PUT VNF LCM Operation occurrences	
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs	
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 PATCH VNF LCM Operation occurrences	
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs	
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}			
 DELETE VNF LCM Operation occurrences	
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs	
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Post Individual VNF LCM Operation occurrences 
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Get Individual VNF LCM Operation occurrences
@@ -839,35 +839,35 @@ Get Individual VNF LCM Operation occurrences
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	   
 Put multiple VNF instances	
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Patch multiple VNF instances	
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Delete multiple VNF instances    
 	log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Post Retry operation
     Log    Retry a VNF lifecycle operation if that operation has experienced a temporary failure
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	    
 Get Retry operation	
@@ -875,35 +875,35 @@ Get Retry operation
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Put Retry operation	
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Patch Retry operation	
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Delete Retry operation    
 	log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Post Rollback operation
     Log    Rollback a VNF lifecycle operation if that operation has experienced a temporary failure
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	    
 Get Rollback operation	
@@ -911,35 +911,35 @@ Get Rollback operation
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback	
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Put Rollback operation	
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback	
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Patch Rollback operation	
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback	
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Delete Rollback operation    
 	log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback	
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Post Fail operation
     Log    mark as Failed a VNF lifecycle operation if that operation has experienced a temporary failure
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	    
 Get Fail operation	
@@ -947,38 +947,38 @@ Get Fail operation
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Put Fail operation	
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail	
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Patch Fail operation	
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Delete Fail operation    
 	log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Post Create subscription
-    Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_notification=${callback_notification}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}				
 Post Create subscription - DUPLICATION
@@ -989,7 +989,7 @@ Post Create subscription - DUPLICATION
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_notification=${callback_notification}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}		
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}			
 Post Create subscription - NO-DUPLICATION	
@@ -1000,7 +1000,7 @@ Post Create subscription - NO-DUPLICATION
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_notification=${callback_notification}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Get subscriptions
@@ -1009,7 +1009,7 @@ Get subscriptions
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions	
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Get subscriptions - filter
@@ -1017,42 +1017,42 @@ Get subscriptions - filter
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter}	
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Get subscriptions - invalid filter  
     Log    Get the list of active subscriptions using an invalid filter
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter_invalid}   
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter_invalid}   
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Get subscriptions with all_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get subscriptions with exclude_default attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get subscriptions with fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 Get subscriptions with exclude_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?exclude_fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}     		
 PUT subscriptions
@@ -1060,7 +1060,7 @@ PUT subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/subscriptions  	   
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions  	   
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 PATCH subscriptions
@@ -1068,7 +1068,7 @@ PATCH subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/subscriptions  	   
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions  	   
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 DELETE subscriptions
@@ -1076,7 +1076,7 @@ DELETE subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/subscriptions  	   
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions  	   
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Post Create Individual subscription
@@ -1084,14 +1084,14 @@ Post Create Individual subscription
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}  	
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Get Individual subscription	
     log    Trying to get information about an individual subscription
     Set Headers    {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Put Individual subscription	
@@ -1099,7 +1099,7 @@ Put Individual subscription
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} 
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Patch Individual subscription	
@@ -1107,14 +1107,14 @@ Patch Individual subscription
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} 	
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	    
 Delete Individual subscription
     log    Try to delete an individual subscription
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}  	
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 Put Notification subscription
diff --git a/SOL003/VNFLifecycleManagement-API/environment/configuration.txt b/SOL003/VNFLifecycleManagement-API/environment/configuration.txt
index 5363f3f0c..91cc810be 100644
--- a/SOL003/VNFLifecycleManagement-API/environment/configuration.txt
+++ b/SOL003/VNFLifecycleManagement-API/environment/configuration.txt
@@ -11,7 +11,7 @@ ${CONTENT_TYPE_PATCH}    application/merge-patch+json
 
 ${apiRoot}        /
 ${apiName}        vnflcm
-${apiVersion}     v1
+${apiMajorVersion}     v1
 
 ${CancelMode}    GRACEFUL
 ${VNFM_DUPLICATION}    0
-- 
GitLab


From 904e4f0456b7567d5b8a3b9ad9d6c4f49834cced Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 13 Oct 2020 13:09:57 +0500
Subject: [PATCH 075/322] added majorApiVersion

---
 .../ApiVersion.robot                          | 10 +++----
 .../IndividualPmJob.robot                     | 18 ++++++------
 .../IndividualReport.robot                    | 16 +++++------
 .../IndividualThreshold.robot                 | 16 +++++------
 .../VNFPerformanceManagement-API/PMJobs.robot | 28 +++++++++----------
 .../Thresholds.robot                          | 18 ++++++------
 .../environment/variables.txt                 |  2 +-
 7 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/SOL003/VNFPerformanceManagement-API/ApiVersion.robot b/SOL003/VNFPerformanceManagement-API/ApiVersion.robot
index 6b87e7997..b1cfc474c 100644
--- a/SOL003/VNFPerformanceManagement-API/ApiVersion.robot
+++ b/SOL003/VNFPerformanceManagement-API/ApiVersion.robot
@@ -169,35 +169,35 @@ DELETE API Version
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/v1/api_version
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/v1/api_version
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/v1/api_version
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/v1/api_version
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/v1/api_version
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
index 122cb090c..f93eae424 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
@@ -115,7 +115,7 @@ GET individual VNF Performance Job
     Log    Trying to get a Pm Job present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -123,7 +123,7 @@ GET individual VNF Performance Job with invalid resource identifier
     Log    Trying to perform a negative get, using erroneous PM Job identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${erroneousPmJobId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${erroneousPmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -131,7 +131,7 @@ Send Delete request for individual VNF Performance Job
     Log    Trying to delete an existing PM Job
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -139,7 +139,7 @@ Send Delete request for individual VNF Performance Job with invalid resource ide
     Log    Trying to perform a negative delete, using erroneous PM Job identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${erroneousPmJobId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${erroneousPmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -147,7 +147,7 @@ Send Post request for individual VNF Performance Job
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${newPmJobId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${newPmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -155,10 +155,10 @@ Send Put request for individual VNF Performance Job
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -167,7 +167,7 @@ Send Patch request for individual VNF Performance Job
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/PMJobModifications.json
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}     ${body}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}     ${body}
 
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -176,7 +176,7 @@ Check Postcondition VNF Performance Job is not Created
     Log    Trying to get a new Pm Job
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${newPmJobId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${newPmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    404
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualReport.robot b/SOL003/VNFPerformanceManagement-API/IndividualReport.robot
index a3d5d6347..4a4837916 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualReport.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualReport.robot
@@ -85,7 +85,7 @@ Get Individual Performance Report
     Log    Trying to get a performance report present in the VNFM
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -93,41 +93,41 @@ Get Individual Performance Report with invalid resource endpoint
     Log    Trying to get a performance report with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${erroneousReportId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${erroneousReportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for Individual Performance Report
     Log    Trying to create new performance report
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for Individual Performance Report
     Log    Trying to update performance report
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Send Patch request for Individual Performance Report
     Log    Trying to update performance report
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for Individual Performance Report
     Log    Trying to delete performance report   
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
index 76bc00b86..a1372c72d 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -115,7 +115,7 @@ GET Individual VNF Performance Threshold
     Log    Trying to get a Threhsold present in the VNFM
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -123,28 +123,28 @@ GET individual VNF Performance Threshold with invalid resource identifier
     Log    Trying to get a Threhsold with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${erroneousThresholdId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${erroneousThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual VNF Performance Threshold
     Log    Trying to delete a Threhsold in the VNFM
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual VNF Performance Threshold with invalid resource identifier
     Log    Trying to delete a Threhsold in the VNFM with invalid id
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${erroneousThresholdId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${erroneousThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual VNF Performance Threshold
     Log    Trying to create new threshold
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${newThresholdId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${newThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -152,10 +152,10 @@ Send Put request for individual VNF Performance Threshold
     Log    Trying to PUT threshold
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -165,7 +165,7 @@ Send Patch request for individual VNF Performance Threshold
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/ThresholdModifications.json
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
diff --git a/SOL003/VNFPerformanceManagement-API/PMJobs.robot b/SOL003/VNFPerformanceManagement-API/PMJobs.robot
index c0772ad12..978e21542 100644
--- a/SOL003/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL003/VNFPerformanceManagement-API/PMJobs.robot
@@ -214,7 +214,7 @@ GET all VNF Performance Monitoring Jobs
     Log    Trying to get all PM Jobs present in the VNFM
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -222,7 +222,7 @@ GET VNF Performance Monitoring Jobs with attribute-based filter
     Log    Trying to get all PM Jobs present in the VNFM, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?${POS_FILTER}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?${POS_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -230,7 +230,7 @@ GET VNF Performance Monitoring Jobs with all_fields attribute selector
     Log    Trying to get all PM Jobs present in the VNFM, using 'all_fields' filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?all_fields
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?all_fields
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -238,7 +238,7 @@ GET VNF Performance Monitoring Jobs with exclude_default attribute selector
     Log    Trying to get all VNF Packages present in the VNFM, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -247,7 +247,7 @@ GET VNF Performance Monitoring Jobs with fields attribute selector
     Pass Execution If    ${FIELD_USAGE} == 0    Skipping test as VNFM is not supporting 'fields'
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -256,7 +256,7 @@ GET VNF Performance Monitoring Jobs with fields and exclude_default attribute se
     Pass Execution If    ${FIELD_USAGE} == 0    Skipping test as VNFM is not supporting 'fields'
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?fields=${fields}&exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?fields=${fields}&exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -265,7 +265,7 @@ GET VNF Performance Monitoring Jobs with exclude_fields attribute selector
     Pass Execution If    ${FIELD_USAGE} == 0    Skipping test as VNFM is not supporting 'fields'
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -273,7 +273,7 @@ GET VNF Performance Monitoring Jobs with invalid attribute-based filter
     Log    Trying to get all PM Jobs present in the VNFM, using an erroneous filter param
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?${NEG_FILTER}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?${NEG_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -281,7 +281,7 @@ GET VNF Performance Monitoring Jobs with invalid resource endpoint
     Log    Trying to perform a GET on a erroneous URI
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_job    # wrong URI /pm_job instead of /pm_jobs
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_job    # wrong URI /pm_job instead of /pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -292,7 +292,7 @@ Send Post Request Create new VNF Performance Monitoring Job
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/CreatePmJobRequest.json
     ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs    ${body}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -300,7 +300,7 @@ Send PUT Request for all VNF Performance Monitoring Jobs
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -308,7 +308,7 @@ Send PATCH Request for all VNF Performance Monitoring Jobs
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -316,7 +316,7 @@ Send DELETE Request for all VNF Performance Monitoring Jobs
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -328,7 +328,7 @@ Check Postcondition PmJob Exists
     Log    Checking that Pm Job exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${response['body']['id']}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
diff --git a/SOL003/VNFPerformanceManagement-API/Thresholds.robot b/SOL003/VNFPerformanceManagement-API/Thresholds.robot
index e05108b1c..945547029 100644
--- a/SOL003/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL003/VNFPerformanceManagement-API/Thresholds.robot
@@ -142,7 +142,7 @@ GET all Performance Thresholds
     Log    Trying to get all thresholds present in the VNFM    
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -150,7 +150,7 @@ GET Performance Thresholds with attribute-based filter
     Log    Trying to get thresholds present in the VNFM with filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds?${FILTER_OK}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds?${FILTER_OK}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -158,7 +158,7 @@ GET Performance Thresholds with invalid attribute-based filter
     Log    Trying to get thresholds present in the VNFM with invalid filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds?${FILTER_KO}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds?${FILTER_KO}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -166,7 +166,7 @@ GET VNF Performance Thresholds with invalid resource endpoint
     Log    Trying to get thresholds present in the VNFM with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/threshold
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/threshold
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -177,7 +177,7 @@ Send Post Request Create new Performance Threshold
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${template}=    Get File    jsons/CreateThresholdRequest.json
     ${request}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/thresholds    ${request}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds    ${request}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -186,7 +186,7 @@ Send PUT Request for all Performance Thresholds
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/thresholds
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -195,14 +195,14 @@ Send PATCH Request for all Performance Thresholds
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/thresholds
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send DELETE Request for all Performance Thresholds
     Log    DELETE THresholds
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/thresholds
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -214,7 +214,7 @@ Check Postcondition Threshold Exists
     Log    Checking that Threshold exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${response['body']['id']}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
diff --git a/SOL003/VNFPerformanceManagement-API/environment/variables.txt b/SOL003/VNFPerformanceManagement-API/environment/variables.txt
index 170e9cee2..348ad4738 100644
--- a/SOL003/VNFPerformanceManagement-API/environment/variables.txt
+++ b/SOL003/VNFPerformanceManagement-API/environment/variables.txt
@@ -16,7 +16,7 @@ ${VNFM_CHECKS_NOTIF_ENDPOINT}    1        ## If true, during subscription, the F
 ${VNFM_ALLOWS_DUPLICATE_SUBS}    1
 
 ${apiRoot}        /
-${apiVersion}     v1
+${apiMajorVersion}     v1
 ${apiName}        vnfpm
 
 ${callback_port}    9091
-- 
GitLab


From 52d3dd97d863016678127dd03c26e9a8c039a056 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 13 Oct 2020 13:12:25 +0500
Subject: [PATCH 076/322] added majorApiVersion

---
 .../VNFFaultManagement-API/ApiVersion.robot   |  10 +-
 .../FaultManagement-APIKeyword.robot          | 100 +++++++++---------
 .../environment/variables.txt                 |   2 +-
 3 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/SOL003/VNFFaultManagement-API/ApiVersion.robot b/SOL003/VNFFaultManagement-API/ApiVersion.robot
index 1f3796a7c..298ac757e 100644
--- a/SOL003/VNFFaultManagement-API/ApiVersion.robot
+++ b/SOL003/VNFFaultManagement-API/ApiVersion.robot
@@ -169,35 +169,35 @@ DELETE API Version
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/v1/api_version
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/v1/api_version
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/v1/api_version
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/v1/api_version
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/v1/api_version
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
diff --git a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
index 077fe2c6f..1f9b5e86e 100644
--- a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
+++ b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
@@ -16,12 +16,12 @@ ${original_etag}    1234
 Check created Subscription existence
     Set Headers    {"Accept":"${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${response['body']['id']}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
     Integer    response status    200  
 Check Postcondition FaultManagement Subscription Is Set
     Log    Check Postcondition subscription exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${response['body']['id']}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
@@ -38,13 +38,13 @@ Check Precondition VNF fault management individual alarm Exists
 Check Individual Subscription existence
     Set Headers    {"Accept":"${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
     Integer    response status    200
     
 Check Individual Subscription deleted
     Set Headers    {"Accept":"${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
     Integer    response status    404
     
 Check HTTP Response Status Code Is
@@ -86,7 +86,7 @@ Send POST request for fault management Alarms
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/alarms
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -94,7 +94,7 @@ PATCH Fault management Alarms
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/alarms
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse} =    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -102,7 +102,7 @@ PUT Fault management Alarms
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/alarms
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -110,7 +110,7 @@ DELETE Fault management Alarms
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/alarms
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -119,7 +119,7 @@ GET Fault Management Alarms
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -128,7 +128,7 @@ GET Fault Management Alarms With Filters
 	Set Headers  {"Accept":"${ACCEPT}"}  
 	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
 	Log    Execute Query
-	Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?${alarm_filter}=${nsInstanceId}
+	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?${alarm_filter}=${nsInstanceId}
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -137,7 +137,7 @@ GET Fault Management Alarms With Invalid Filters
 	Set Headers  {"Accept":"${ACCEPT}"}  
 	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
 	Log    Execute Query
-	Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?${invalid_alarm_filter}=${nsInstanceId}
+	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?${invalid_alarm_filter}=${nsInstanceId}
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 GET Alarms Task with all_fields attribute selector
@@ -145,7 +145,7 @@ GET Alarms Task with all_fields attribute selector
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/alarms?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 GET Alarms Task with exclude_default attribute selector
@@ -153,7 +153,7 @@ GET Alarms Task with exclude_default attribute selector
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/alarms?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 GET Alarms Task with fields attribute selector
@@ -161,7 +161,7 @@ GET Alarms Task with fields attribute selector
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/alarms?fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 GET Alarms Task with exclude_fields attribute selector
@@ -169,14 +169,14 @@ GET Alarms Task with exclude_fields attribute selector
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/alarms?exclude_fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 	
 Send POST request for fault management Individual Alarm
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -184,7 +184,7 @@ DELETE Fault Management Individual Alarm
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -192,7 +192,7 @@ PUT Fault Management Individual Alarm
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
 
@@ -202,7 +202,7 @@ GET Fault Management Individual Alarm
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${etag}    Output    response headers ETag
     Set Suite Variable    &{original_etag}    ${etag}
     ${outputResponse}=    Output    response
@@ -214,7 +214,7 @@ GET Fault Management Individual Alarm with invalid id
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query 
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms/${invalidAlarmId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${invalidAlarmId}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
    
@@ -224,7 +224,7 @@ PATCH Fault Management Individual Alarm
     Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/alarmModifications.json
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}    ${body}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}    ${body}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -235,7 +235,7 @@ PATCH Fault Management Individual Alarm - precondition failed
     Set Headers    {"If-Match": "${original_etag[0]}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/alarmModifications.json
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}    ${body}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}    ${body}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
    
@@ -246,42 +246,42 @@ PATCH Fault Management Individual Alarm Conflict
     Set Headers    {"If-Match": "${Etag}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/alarmModifications.json
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}    ${body}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}    ${body}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
        
 POST Subscription
-    Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
     ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}      callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
 Send POST Request for duplicated subscription
-    Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     Pass Execution If    ${VNFM_DUPLICATION} == 0    NVFO is not permitting duplication. Skipping the test
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
     ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
 
 Send POST Request for duplicated subscription not permitted
-    Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     Pass Execution If    ${VNFM_DUPLICATION} == 1    NVFO is not permitting duplication. Skipping the test
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
     ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
 
@@ -289,7 +289,7 @@ GET Subscriptions
     Log    Get the list of active subscriptions
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
         
@@ -297,7 +297,7 @@ GET Subscriptions with filter
     Log    Get the list of active subscriptions using a filter
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}    
     
@@ -305,42 +305,42 @@ GET Subscriptions with Invalid filter
     Log    Get the list of active subscriptions using an invalid filter
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter_invalid}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter_invalid}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
 Get subscriptions with all_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get subscriptions with exclude_default attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get subscriptions with fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 Get subscriptions with exclude_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?exclude_fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}     
 PUT Subscriptions
     log    Trying to perform a PUT Subscriptions. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -348,7 +348,7 @@ PATCH Subscriptions
     log    Trying to perform a PATCH Subscriptions. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -356,7 +356,7 @@ DELETE Subscriptions
     log    Trying to perform a DELETE Subscriptions. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -364,7 +364,7 @@ POST Individual Subscription
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}  
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -372,7 +372,7 @@ GET Individual Subscription
     log    Trying to get information about an individual subscription
     Set Headers    {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}   
     
@@ -380,7 +380,7 @@ PUT Individual Subscription
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}  
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -388,7 +388,7 @@ PATCH Individual Subscription
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}  
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
 
@@ -396,7 +396,7 @@ DELETE Individual Subscription
     log    Trying to perform a DELETE.
     Set Headers  {"Accept":"${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}  
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -408,7 +408,7 @@ Get subscriptions with filter "id"
     Log    Get the list of active subscriptions using a filter "id"
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?id=${subscription_id}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?id=${subscription_id}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -419,7 +419,7 @@ Get subscriptions with filter "filter_notificationTypes"
     Log    Get the list of active subscriptions using a filter "filter.notificationTypes"
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?filter.notificationTypes=${notification_type}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.notificationTypes=${notification_type}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -432,7 +432,7 @@ Get subscriptions with filter "filter_faultyResourceTypes"
     Log    Get the list of active subscriptions using a filter "filter.faultyResourceTypes"
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?filter.faultyResourceTypes=${faultyResourceType}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.faultyResourceTypes=${faultyResourceType}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -445,7 +445,7 @@ Get subscriptions with filter "filter_perceivedSeverities"
     Log    Get the list of active subscriptions using a filter "filter.perceivedSeverities"
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?filter.perceivedSeverities=${perceivedSeverity}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.perceivedSeverities=${perceivedSeverity}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -458,7 +458,7 @@ Get subscriptions with filter "filter_eventTypes"
     Log    Get the list of active subscriptions using a filter "filter.eventTypes"
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?filter.eventTypes=${eventType}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.eventTypes=${eventType}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -471,7 +471,7 @@ Get subscriptions with filter "filter_probableCauses"
     Log    Get the list of active subscriptions using a filter "filter.probableCauses"
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?filter.probableCauses=${probableCause}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.probableCauses=${probableCause}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
diff --git a/SOL003/VNFFaultManagement-API/environment/variables.txt b/SOL003/VNFFaultManagement-API/environment/variables.txt
index 14ec6985d..f34b4ec6a 100644
--- a/SOL003/VNFFaultManagement-API/environment/variables.txt
+++ b/SOL003/VNFFaultManagement-API/environment/variables.txt
@@ -26,7 +26,7 @@ ${NFVO_FIELDS}    1
 
 ${apiRoot}        /
 ${apiName}        vnffm
-${apiVersion}     v1
+${apiMajorVersion}     v1
 
 
 ${subscriptionId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
-- 
GitLab


From ec34c3d24719d27150aebcddde319a8ab0d5c26e Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 13 Oct 2020 15:44:13 +0500
Subject: [PATCH 077/322] removed subscription and fixed minor bugs

---
 .../IndividualPmJob.robot                     |  19 +-
 .../IndividualReport.robot                    |  41 +--
 .../IndividualSubscription.robot              |  99 ------
 .../IndividualThreshold.robot                 |  19 +-
 .../VNFPerformanceManagement-API/PMJobs.robot |  24 +-
 .../Subscriptions.robot                       | 176 -----------
 .../Thresholds.robot                          |  18 +-
 .../VNFPerformanceManagementKeywords.robot    | 295 +-----------------
 .../environment/individualSubscription.txt    |   6 -
 .../environment/subscriptions.txt             |   8 -
 .../environment/variables.txt                 |   2 +-
 .../jsons/subscriptions.json                  |   6 -
 .../schemas/PmSubscription.schema.json        | 142 ---------
 .../schemas/PmSubscriptions.schema.json       |   1 -
 14 files changed, 34 insertions(+), 822 deletions(-)
 delete mode 100644 SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot
 delete mode 100644 SOL002/VNFPerformanceManagement-API/Subscriptions.robot
 delete mode 100644 SOL002/VNFPerformanceManagement-API/environment/individualSubscription.txt
 delete mode 100644 SOL002/VNFPerformanceManagement-API/environment/subscriptions.txt
 delete mode 100644 SOL002/VNFPerformanceManagement-API/jsons/subscriptions.json
 delete mode 100644 SOL002/VNFPerformanceManagement-API/schemas/PmSubscription.schema.json
 delete mode 100644 SOL002/VNFPerformanceManagement-API/schemas/PmSubscriptions.schema.json

diff --git a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
index 61cd4bd06..eeced512b 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
@@ -65,27 +65,25 @@ POST Individual VNF Performance Job - Method not implemented
     [Documentation]    Test ID: 6.3.3.2.5
     ...    Test title: POST Individual VNF Performance Job - method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF Performance Monitoring Job
-    ...    Pre-conditions: A VNF instance is instantiated
+    ...    Pre-conditions: none
     ...    Reference: Clause 6.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Performance Job is not created on the VNFM
+    ...    Post-Conditions: none
     Send Post request for individual VNF Performance Job
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Performance Job is not Created
 
 PUT Individual VNF Performance Job - Method not implemented
     [Documentation]    Test ID: 6.3.3.2.6
     ...    Test title: PUT Individual VNF Performance Job - method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF Performance Monitoring Job
-    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
+    ...    Pre-conditions: none
     ...    Reference: Clause 6.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Performance Job is not modified by the operation
+    ...    Post-Conditions: none
     Send Put request for individual VNF Performance Job
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Performance Job is Unmodified (Implicit)
 
 PATCH Individual VNF Performance Job
     [Documentation]    Test ID: 6.3.3.2.7
@@ -175,15 +173,6 @@ Send Patch request for individual VNF Performance Job
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
-Check Postcondition VNF Performance Job is not Created
-    Log    Trying to get a new Pm Job
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${newPmJobId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    Check HTTP Response Status Code Is    404
-
 Check Postcondition VNF Performance Job is Unmodified (Implicit)
     Log    Check Postcondition VNF PM job is not modified
     GET individual VNF Performance Job
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
index f42402876..7570068dd 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
@@ -30,58 +30,55 @@ Get Individual Performance Report with invalid resource endpoint
     ...    Post-Conditions: none
     Get Individual Performance Report with invalid resource endpoint
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 POST Individual Performance Report - Method not implemented
     [Documentation]    Test ID: 6.3.3.3.3
     ...    Test title: POST Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF performance report within a monitoring job
-    ...    Pre-conditions: A VNF instance is instantiated.
+    ...    Pre-conditions: none
     ...    Reference: Clause 6.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: The VNF performance report is not created on the VNFM
+    ...    Post-Conditions: none
     Send Post request for Individual Performance Report
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Individual Performance Report is not Created
 
 PUT Individual Performance Report - Method not implemented
     [Documentation]    Test ID: 6.3.3.3.4
     ...    Test title: PUT Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF performance report within a monitoring job
-    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
+    ...    Pre-conditions: none
     ...    Reference: Clause 6.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: The VNF performance report is not modified by the operation
+    ...    Post-Conditions: none
     Send Put request for Individual Performance Report
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Individual Performance Report is Unmodified (Implicit)
 
 PATCH Individual Performance Report - Method not implemented
     [Documentation]    Test ID: 6.3.3.3.5
     ...    Test title: PATCH Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing VNF performance report within a monitoring job
-    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
+    ...    Pre-conditions: none
     ...    Reference: Clause 6.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: The VNF performance report is not modified by the operation
+    ...    Post-Conditions: none
     Send Patch request for Individual Performance Report
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Individual Performance Report is Unmodified (Implicit)
 
 DELETE Individual Performance Report - Method not implemented
     [Documentation]    Test ID: 6.3.3.3.6
     ...    Test title: DELETE Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing VNF performance report within a monitoring job
-    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
+    ...    Pre-conditions: none
     ...    Reference: Clause 6.4.4.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: The VNF performance report is not deleted by the operation
+    ...    Post-Conditions: none
     Send Delete request for Individual Performance Report
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Individual Performance Report Exists
 
 *** Keywords ***
 Get Individual Performance Report
@@ -134,26 +131,6 @@ Send Delete request for Individual Performance Report
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
-Check Postcondition VNF Individual Performance Report Exists
-    Log    Checking that report still exists
-    Get Individual Performance Report
-
-Check Postcondition VNF Individual Performance Report is not Created
-    Log    Trying to get a new report
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    Check HTTP Response Status Code Is    404
-
-Check Postcondition VNF Individual Performance Report is Unmodified (Implicit)
-    Log    Check Postcondition VNF PM job is not modified
-    Get Individual Performance Report
-    Log    Check Response matches original VNF report
-    ${report}=    evaluate    json.loads('''${response['body']}''')    json
-    Should Be Equal    ${origResponse['body']['entries'][0]['objectInstanceId']}    ${report['entries'][0]['objectInstanceId']}
-
 Check HTTP Response Status Code Is
     [Arguments]    ${expected_status}
     ${status}=    Convert To Integer    ${expected_status}    
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot b/SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot
deleted file mode 100644
index 4f34fd5c0..000000000
--- a/SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot
+++ /dev/null
@@ -1,99 +0,0 @@
-*** Settings ***
-Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt    # Generic Parameters
-Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
-Library           OperatingSystem
-Library           JSONLibrary
-Resource          environment/individualSubscription.txt
-Resource          VNFPerformanceManagementKeywords.robot
-
-*** Test Cases ***
-GET Individual VNF Performance Subscription
-    [Documentation]    Test ID: 6.3.3.7.1
-    ...    Test title: GET Individual VNF Performance Subscription
-    ...    Test objective: The objective is to test the retrieval of individual VNF performance subscription and perform a JSON schema and content validation of the returned subscription data structure
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.8.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Individual VNF Performance Subscription
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is   PmSubscription
-    Check HTTP Response Body Subscription Identifier matches the requested Subscription
-
-GET Individual VNF Performance Subscription with invalid resource identifier
-    [Documentation]    Test ID: 6.3.3.7.2
-    ...    Test title: GET Individual VNF Performance Subscription with invalid resource identifier
-    ...    Test objective: The objective is to test that the retrieval of an individual VNF performance subscription fails when using an invalid resource identifier
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.8.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    GET individual VNF Performance Subscription with invalid resource identifier
-    Check HTTP Response Status Code Is    404
-
-DELETE Individual VNF Performance Subscription
-    [Documentation]    Test ID: 6.3.3.7.3
-    ...    Test title: DELETE Individual VNF Performance Subscription
-    ...    Test objective: The objective is to test the deletion of an individual VNF performance subscription
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.8.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: The VNF Performance Subscription is not available anymore in the VNFM    
-    Send Delete request for individual VNF Performance Subscription
-    Check HTTP Response Status Code Is    204
-    Check Postcondition VNF Performance Subscription is Deleted
-
-DELETE Individual VNF Performance Subscription with invalid resource identifier
-    [Documentation]    Test ID: 6.3.3.7.4
-    ...    Test title: DELETE Individual VNF Performance Subscription with invalid resource identifier
-    ...    Test objective: The objective is to test that the deletion of an individual VNF performance subscription fails when using an invalid resource identifier
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.8.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none   
-    Send Delete request for individual VNF Performance Subscription with invalid resource identifier
-    Check HTTP Response Status Code Is    404
-
-POST Individual VNF Performance Subscription - Method not implemented
-    [Documentation]    Test ID: 6.3.3.7.5
-    ...    Test title: POST Individual VNF Performance Subscription - Method not implemented
-    ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF Performance Subscription
-    ...    Pre-conditions: A VNF instance is instantiated
-    ...    Reference: Clause 6.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: The VNF Performance Subscription is not created on the VNFM
-    Send Post request for individual VNF Performance Subscription
-    Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Performance Subscription is not Created
-
-PUT Individual VNF Performance Subscription - Method not implemented
-    [Documentation]    Test ID: 6.3.3.7.6
-    ...    Test title: PUT Individual VNF Performance Subscription - Method not implemented
-    ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF Performance subscription
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.8.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: The VNF Performance subscription is not modified by the operation
-    Send Put request for individual VNF Performance Threshold
-    Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Performance Subscription is Unmodified (Implicit)
-
-PATCH Individual VNF Performance Subscription - Method not implemented
-    [Documentation]    Test ID: 6.3.3.7.7
-    ...    Test title: PATCH Individual VNF Performance Subscription - Method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing VNF Performance subscription
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.8.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: The VNF Performance subscription is not modified by the operation
-    Send Patch request for individual VNF Performance Threshold
-    Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Performance Subscription is Unmodified (Implicit)
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
index 429727d04..003817da6 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -32,6 +32,7 @@ GET Individual Threshold with invalid resource identifier
     ...    Post-Conditions: none
     GET individual VNF Performance Threshold with invalid resource identifier
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 DELETE Individual Threshold
     [Documentation]    Test ID: 6.3.3.5.3
@@ -57,32 +58,31 @@ DELETE Individual Threshold with invalid resource identifier
     ...    Post-Conditions: none   
     Send Delete request for individual VNF Performance Threshold with invalid resource identifier
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 POST Individual Threshold - Method not implemented
     [Documentation]    Test ID: 6.3.3.5.5
     ...    Test title: POST Individual Threshold - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF Performance Threshold
-    ...    Pre-conditions: A VNF instance is instantiated
+    ...    Pre-conditions: none
     ...    Reference: Clause 6.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Threshold is not created on the VNFM
     Send Post request for individual VNF Performance Threshold
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Performance Threshold is not Created
 
 PUT Individual Threshold - Method not implemented
     [Documentation]    Test ID: 6.3.3.5.6
     ...    Test title: PUT Individual Threshold - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF Performance threshold
-    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
+    ...    Pre-conditions: none
     ...    Reference: Clause 6.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Performance Threshold is not modified by the operation
+    ...    Post-Conditions: none
     Send Put request for individual VNF Performance Threshold
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Performance Threshold is Unmodified (Implicit)
 
 PATCH Individual Threshold 
     [Documentation]    Test ID: 6.3.3.5.7
@@ -177,15 +177,6 @@ Check Postcondition VNF Performance Threshold is Unmodified (Implicit)
     ${threshold}=    evaluate    json.loads('''${response['body']}''')    json
     Should Be Equal    ${origresponse['body']['id']}    ${threshold.id}
     Should Be Equal    ${origresponse['body']['criteria']}    ${threshold.criteria}
-    
-Check Postcondition VNF Performance Threshold is not Created
-    Log    Trying to get a new Threshold
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${newThresholdId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    Check HTTP Response Status Code Is    404
 
 Check Postcondition VNF Performance Threshold is Deleted
     Log    Check Postcondition Threshold is deleted
diff --git a/SOL002/VNFPerformanceManagement-API/PMJobs.robot b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
index 84283d725..62747fa37 100644
--- a/SOL002/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
@@ -20,7 +20,6 @@ GET all VNF Performance Monitoring Jobs
     GET all VNF Performance Monitoring Jobs
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   PmJobs
-    Check HTTP Response Body Does Not Contain reports
 
 GET VNF Performance Monitoring Jobs with attribute-based filter
     [Documentation]    Test ID: 6.3.3.1.2
@@ -136,7 +135,7 @@ PUT all VNF Performance Monitoring Jobs - Method not implemented
     [Documentation]    Test ID: 6.3.3.1.10
     ...    Test title: PUT all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF Performance Monitoring Jobs
-    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
+    ...    Pre-conditions: none
     ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
@@ -144,11 +143,11 @@ PUT all VNF Performance Monitoring Jobs - Method not implemented
     Send PUT Request for all VNF Performance Monitoring Jobs
     Check HTTP Response Status Code Is    405
     
-PATCH all VNF Performance Monitoring Jobs - (Method not implemented)
+PATCH all VNF Performance Monitoring Jobs - Method not implemented
     [Documentation]    Test ID: 6.3.3.1.11
     ...    Test title: PATCH all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF Performance Monitoring Jobs
-    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
+    ...    Pre-conditions: none
     ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
@@ -160,14 +159,13 @@ DELETE all VNF Performance Monitoring Jobs - Method not implemented
     [Documentation]    Test ID: 6.3.3.1.12
     ...    Test title: DELETE all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to update VNF Performance Monitoring Jobs
-    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
+    ...    Pre-conditions: none
     ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
     Send PATCH Request for all VNF Performance Monitoring Jobs
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Performance Monitoring Jobs Exist
     
 GET VNF Performance Monitoring Jobs to get Paged Response   
     [Documentation]    Test ID: 6.3.3.1.13
@@ -180,7 +178,7 @@ GET VNF Performance Monitoring Jobs to get Paged Response
     ...    Post-Conditions: none   
     GET all VNF Performance Monitoring Jobs
     Check HTTP Response Status Code Is    200
-    Check LINK in Header 
+    Check HTTP Response Header Contain Link
     
 GET VNF Performance Monitoring Jobs for Bad Request Response too big
     [Documentation]    Test ID: 6.3.3.1.14
@@ -316,10 +314,6 @@ Send DELETE Request for all VNF Performance Monitoring Jobs
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
-
-Check Postcondition VNF Performance Monitoring Jobs Exist
-    Log    Checking that Pm Job still exists
-    GET all VNF Performance Monitoring Jobs
     
 Check Postcondition PmJob Exists
     Log    Checking that Pm Job exists
@@ -374,12 +368,6 @@ Check HTTP Response Body Matches filter
     Log    Checking that attribute-based filter is matched
     @{words} =  Split String    ${POS_FILTER}       ,${SEPERATOR} 
     Should Be Equal As Strings    ${response['body'][0]['objectInstanceIds']}    @{words}[1]
-
-Check HTTP Response Body Does Not Contain reports
-    Log    Checking that field element is missing
-    ${reports}=    Get Value From Json    ${response['body']}    $..reports
-    Should Be Empty    ${reports}
-    Log    Reports element is empty as expected
     
 Check HTTP Response Status Code Is
     [Arguments]    ${expected_status}
@@ -402,6 +390,6 @@ Check HTTP Response Body Json Schema Is
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
     
-Check LINK in Header
+Check HTTP Response Header Contain Link
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/Subscriptions.robot b/SOL002/VNFPerformanceManagement-API/Subscriptions.robot
deleted file mode 100644
index 2ba4751cb..000000000
--- a/SOL002/VNFPerformanceManagement-API/Subscriptions.robot
+++ /dev/null
@@ -1,176 +0,0 @@
-*** Settings ***
-Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt    # Generic Parameters
-Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
-Library           OperatingSystem
-Library           JSONLibrary
-Resource          VNFPerformanceManagementKeywords.robot
-Resource          environment/subscriptions.txt
-Library           MockServerLibrary
-Library           Process
-Suite Setup       Create Sessions
-Suite Teardown    Terminate All Processes    kill=true
-
-*** Test Cases ***
-GET all VNF Performance Subscriptions
-    [Documentation]    Test ID: 6.3.3.6.1
-    ...    Test title: GET all VNF Performance Subscriptions
-    ...    Test objective: The objective is to test the retrieval of all VNF performance subscriptions and perform a JSON schema validation of the returned subscriptions data structure
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    Get all VNF Performance Subscriptions
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    PmSubscriptions
-
-GET VNF Performance Subscriptions with attribute-based filter
-    [Documentation]    Test ID: 6.3.3.6.2
-    ...    Test title: GET VNF Performance Subscriptions with attribute-based filter
-    ...    Test objective: The objective is to test the retrieval of VNF performance subscriptions using attribute-based filter, perform a JSON schema validation of the collected indicators data structure, and verify that the retrieved information matches the issued attribute-based filters 
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get VNF Performance Subscriptions with attribute-based filters
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    PmSubscriptions
-    Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filter 
-
-GET VNF Performance Management Subscriptions with invalid attribute-based filter
-    [Documentation]    Test ID: 6.3.3.6.3
-    ...    Test title: GET VNF Performance Management Subscriptions with invalid attribute-based filter
-    ...    Test objective: The objective is to test that the retrieval of VNF performance subscriptions fails when using invalid attribute-based filters, and perform the JSON schema validation of the failed operation HTTP response. 
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get VNF Performance Subscriptions with invalid attribute-based filters
-    Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is   ProblemDetails 
-
-GET VNF Performance Subscriptions with invalid resource endpoint
-    [Documentation]    Test ID: 6.3.3.6.4
-    ...    Test title: GET VNF Performance Subscriptions with invalid resource endpoint
-    ...    Test objective: The objective is to test that the retrieval of all VNF performance subscriptions fails when using invalid resource endpoint.
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    Get VNF Performance Subscriptions with invalid resource endpoint
-    Check HTTP Response Status Code Is    404
-    
-Create new VNF Performance subscription
-    [Documentation]    Test ID: 6.3.3.6.5
-    ...    Test title: Create new VNF Performance subscription
-    ...    Test objective: The objective is to test the creation of a new VNF performance subscription and perform a JSON schema and content validation of the returned subscription data structure
-    ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: The VNF performance subscription is successfully set and it matches the issued subscription    
-    Send Post Request for VNF Performance Subscription
-    Check HTTP Response Status Code Is    201
-    Check HTTP Response Body Json Schema Is    PmSubscription
-    Check HTTP Response Body PmSubscription Attributes Values Match the Issued Subscription
-    Check Postcondition VNF Performance Subscription Is Set 
-
-
-Create duplicated VNF Performance subscription with VNFM not creating duplicated subscriptions
-    [Tags]    no-duplicated-subs
-    [Documentation]    Test ID: 6.3.3.6.6
-    ...    Test title: Create duplicated VNF Performance subscription with VNFM not creating duplicated subscriptions
-    ...    Test objective: The objective is to test the attempt of a creation of a duplicated VNF performance subscription and check that no new subscription is created by the VNFM and a link to the original subscription is returned
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: The VNFM does not support the creation of duplicated subscriptions
-    ...    Post-Conditions: The existing VNF performance subscription returned is available in the VNFM 
-    Send Post Request for Duplicated VNF Performance Subscription
-    Check HTTP Response Status Code Is    303
-    Check HTTP Response Body Is Empty
-    Check HTTP Response Header Contains    Location
-    Check Postcondition Subscription Resource Returned in Location Header Is Available
-
-Create duplicated VNF Performance subscription with VNFM creating duplicated subscriptions
-    [Tags]    duplicated-subs
-    [Documentation]    Test ID: 6.3.3.6.7
-    ...    Test title: Create duplicated VNF Performance subscription with VNFM creating duplicated subscriptions
-    ...    Test objective: The objective is to test the creation of a duplicated VNF performance subscription and perform a JSON schema and content validation of the returned duplicated subscription data structure
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: The VNFM supports the creation of duplicated subscriptions
-    ...    Post-Conditions: The duplicated VNF performance subscription is successfully set and it matches the issued subscription
-    Send Post Request for Duplicated VNF Performance Subscription
-    Check HTTP Response Status Code Is    201
-    Check HTTP Response Body Json Schema Is    PmSubscription
-    Check HTTP Response Body PmSubscription Attributes Values Match the Issued Subscription
-    Check Postcondition VNF Performance Subscription Is Set 
-
-PUT VNF Performance Subscriptions - Method not implemented
-    [Documentation]    Test ID: 6.3.3.6.8
-    ...    Test title: PUT VNF Performance Subscriptions - Method not implemented
-    ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF performance subscriptions
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send Put Request for VNF Performance Subscriptions
-    Check HTTP Response Status Code Is    405 
-    
-PATCH VNF Performance Subscriptions - Method not implemented
-    [Documentation]    Test ID: 6.3.3.6.9
-    ...    Test title: PATCH VNF Performance Subscriptions - Method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF performance subscriptions
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send Patch Request for VNF Performance Subscriptions
-    Check HTTP Response Status Code Is    405
-    
-DELETE VNF Performance Subscriptions - Method not implemented
-    [Documentation]    Test ID: 6.3.3.6.10
-    ...    Test title: DELETE VNF Performance Subscriptions - Method not implemented
-    ...    Test objective: The objective is to test that DELETE method is not allowed to delete VNF performance subscriptions
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: The VNF performance subscriptions are not deleted by the failed operation   
-    Send Delete Request for VNF Performance Subscriptions
-    Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Performance Subscriptions Exists
-    
-GET VNF Performance Subscriptions to get Paged Response
-    [Documentation]    Test ID: 6.3.3.6.11
-    ...    Test title: GET VNF Performance Subscriptions to get Paged Response
-    ...    Test objective: The objective is to test the retrieval of all VNF performance subscriptions to get Paged Response
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    Get all VNF Performance Subscriptions
-    Check HTTP Response Status Code Is    200
-    Check LINK in Header
-    
-GET VNF Performance Management Subscriptions for Bad Request Response too big
-    [Documentation]    Test ID: 6.3.3.6.12
-    ...    Test title: GET VNF Performance Management Subscriptions for Bad Request Response too big
-    ...    Test objective: The objective is to test that the retrieval of VNF performance subscriptions fails when response is too big, and perform the JSON schema validation of the failed operation HTTP response. 
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get VNF Performance Subscriptions with invalid attribute-based filters
-    Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is   ProblemDetails 
diff --git a/SOL002/VNFPerformanceManagement-API/Thresholds.robot b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
index c3804b28d..6dead1e56 100644
--- a/SOL002/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
@@ -46,6 +46,7 @@ GET Performance Thresholds with invalid attribute-based filter
     ...    Post-Conditions: none
     GET Performance Thresholds with invalid attribute-based filter
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 GET Performance Thresholds with invalid resource endpoint
     [Documentation]    Test ID: 6.3.3.4.4
@@ -79,7 +80,7 @@ PUT Performance Thresholds - Method not implemented
     [Documentation]    Test ID: 6.3.3.4.6
     ...    Test title: PUT Performance Thresholds - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF Performance Thresholds
-    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNF.
+    ...    Pre-conditions: none
     ...    Reference: Clause 6.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
@@ -91,7 +92,7 @@ PATCH Performance Thresholds - Method not implemented
     [Documentation]    Test ID: 6.3.3.4.7
     ...    Test title: PATCH Performance Thresholds - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify VNF Performance Thresholds
-    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
+    ...    Pre-conditions: none
     ...    Reference: Clause 6.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
@@ -103,14 +104,13 @@ DELETE Performance Thresholds - Method not implemented
     [Documentation]    Test ID: 6.3.3.4.8
     ...    Test title: DELETE Performance Thresholds - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to update VNF Performance Thresholds
-    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
+    ...    Pre-conditions: none
     ...    Reference: Clause 6.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: The VNF performance thresholds are not deleted by the failed operation
+    ...    Post-Conditions: none
     Send DELETE Request for all Performance Thresholds
     Check HTTP Response Status Code Is    405
-    Check Postcondition Thresholds Exist
 
 GET Performance Thresholds with Paged Response
     [Documentation]    Test ID: 6.3.3.4.9
@@ -123,7 +123,7 @@ GET Performance Thresholds with Paged Response
     ...    Post-Conditions: none
     GET all Performance Thresholds
     Check HTTP Response Status Code Is    200
-    Check LINK in Header 
+    Check HTTP Response Header Contain Link
     
 GET Performance Thresholds for Bad Request Response too big
     [Documentation]    Test ID: 6.3.3.4.10
@@ -206,10 +206,6 @@ Send DELETE Request for all Performance Thresholds
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
-
-Check Postcondition Thresholds Exist
-    Log    Checking that Thresholds still exists
-    GET all Performance Thresholds
     
 Check Postcondition Threshold Exists
     Log    Checking that Threshold exists
@@ -243,7 +239,7 @@ Check HTTP Response Body Json Schema Is
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
     
-Check LINK in Header
+Check HTTP Response Header Contain Link
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
 
diff --git a/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
index 9a6c90f90..394c97280 100644
--- a/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
+++ b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
@@ -13,264 +13,12 @@ Library    JSONSchemaLibrary    schemas/
 Library    Process    
 
 *** Keywords ***
-Get all VNF Performance Subscriptions
-    [Documentation]    The client can use this method to query the list of active subscriptions to Performance management notifications
-    ...    subscribed by the client.
-    ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    Set headers    {"Accept": "application/json"}
-    Set headers    {"Content-Type": "application/json"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    # Integer    response status    200
-    # Log    Received a 200 OK as expected
-    # ${contentType}=    Output    response headers Content-Type
-    # Should Contain    ${contentType}    application/json
-    # ${result}=    Output    response body
-    # Validate Json    PmSubscriptions.schema.json    ${result}
-    # Log    Validated PmSubscription schema
-
-
- Get VNF Performance Subscriptions with attribute-based filters
-    [Documentation]    The client can use this method to query the list of active subscriptions to Performance management notifications
-    ...    subscribed by the client.
-    ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ok}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    # Integer    response status    200
-    # Log    Received a 200 OK as expected
-    # ${contentType}=    Output    response headers Content-Type
-    # Should Contain    ${contentType}    application/json
-    # ${result}=    Output    response body
-    # Validate Json    PmSubscriptions.schema.json    ${result}
-    # Log    Validated PmSubscription schema    
-    
-
-
-Get VNF Performance Subscriptions with invalid attribute-based filters
-    [Documentation]    The client can use this method to query the list of active subscriptions to Performance management notifications
-    ...    subscribed by the client.
-    ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ko}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    # Integer    response status    400
-    # Log    Received a 400 Bad Request as expected
-    # ${contentType}=    Output    response headers Content-Type
-    # Should Contain    ${contentType}    application/json
-    # ${result}=    Output    response body
-    # Validate Json    ProblemDetails.schema.json    ${result}
-    # Log    Validated ProblemDetails schema
-    
-    
-Get VNF Performance Subscriptions with invalid resource endpoint
-    [Documentation]    The client can use this method to query the list of active subscriptions to Performance management notifications
-    ...    subscribed by the client.
-    ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    # Integer    response status    404
-    # Log    Received a 404 Not found as expected
-    # ${contentType}=    Output    response headers Content-Type
-    # Should Contain    ${contentType}    application/json
-    # ${result}=    Output    response body
-    # Validate Json    ProblemDetails.schema.json    ${result}
-    # Log    Validated ProblemDetails schema    
-
-
-
-Send Post Request for VNF Performance Subscription
-    [Documentation]    The POST method creates a new subscription.
-    ...    This method shall follow the provisions specified in the tables 6.4.7.3.1-1 and 6.4.7.3.1-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    ...    Creation of two subscription resources with the same callbackURI and the same filter can result in performance
-    ...    degradation and will provide duplicates of notifications to the NFVO, and might make sense only in very rare use cases.
-    ...    Consequently, the VNFM may either allow creating a subscription resource if another subscription resource with the
-    ...    same filter and callbackUri already exists (in which case it shall return the "201 Created" response code), or may decide
-    ...    to not create a duplicate subscription resource (in which case it shall return a "303 See Other" response code referencing
-    ...    the existing subscription resource with the same filter and callbackUri).
-    Set headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    ${template}=    Get File    jsons/subscriptions.json
-    ${body_request}=        Format String   ${template}     callback_uri=${callback_uri}    subscribe=${subscribe}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body_request}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    Run Keyword If    ${VNFM_CHECKS_NOTIF_ENDPOINT} == 1
-    ...       Check Notification Endpoint
-    # Integer    response status    201
-    # Log    Received a 201 Created as expected
-    # ${contentType}=    Output    response headers Content-Type
-    # Should Contain    ${contentType}    application/json
-    # ${result}=    Output    response body
-    # Validate Json    PmSubscription.schema.json    ${result}
-    # Log    Validated PmSubscription schema
-    # Log    Trying to validate the Location header
-    # ${headers}=    Output    response headers
-    # Should Contain    ${headers}    Location
-
-
-Send Post Request for Duplicated VNF Performance Subscription
-    [Documentation]    The POST method creates a new subscription.
-    ...    This method shall follow the provisions specified in the tables 6.4.7.3.1-1 and 6.4.7.3.1-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    ...    Creation of two subscription resources with the same callbackURI and the same filter can result in performance
-    ...    degradation and will provide duplicates of notifications to the NFVO, and might make sense only in very rare use cases.
-    ...    Consequently, the VNFM may either allow creating a subscription resource if another subscription resource with the
-    ...    same filter and callbackUri already exists (in which case it shall return the "201 Created" response code), or may decide
-    ...    to not create a duplicate subscription resource (in which case it shall return a "303 See Other" response code referencing
-    ...    the existing subscription resource with the same filter and callbackUri).
-    Set headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${template}=    Get File    jsons/subscriptions.json
-    ${body_request}=        Format String   ${template}     callback_uri=${callback_uri}    subscribe=${subscribe}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body_request}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}    
-    # Integer    response status    303
-    # Log    Received a 303 See other as expected
-    # ${contentType}=    Output    response headers Content-Type
-    # Should Contain    ${contentType}    application/json
-    # ${result}=    Output    response body
-    # Should Be Empty    ${result}
-    # Log    Body is empty
-    # Log    Trying to validate the Location header
-    # ${headers}=    Output    response headers
-    # Should Contain    ${headers}    Location
-    
-
-
-Send Put Request for VNF Performance Subscriptions
-    [Documentation]    This method is not supported. When this method is requested on this resource, the VNFM shall return a "405 Method
-    ...    Not Allowed" response as defined in Clause 4.3.5.4.
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    # Integer    response status    405
-    # Log    Received 405 Method not implemented as expected
-
-Send Patch Request for VNF Performance Subscriptions
-    [Documentation]    This method is not supported. When this method is requested on this resource, the VNFM shall return a "405 Method
-    ...    Not Allowed" response as defined in Clause 4.3.5.4.
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    # Integer    response status    405
-    # Log    Received 405 Method not implemented as expected
-
-Send Delete Request for VNF Performance Subscriptions
-    [Documentation]    This method is not supported. When this method is requested on this resource, the VNFM shall return a "405 Method
-    ...    Not Allowed" response as defined in Clause 4.3.5.4.
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    # Integer    response status    405
-    # Log    Received 405 Method not implemented as expected
-
-Get Individual VNF Performance Subscription
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-GET individual VNF Performance Subscription with invalid resource identifier
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-Send Delete request for individual VNF Performance Subscription
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-Send Delete request for individual VNF Performance Subscription with invalid resource identifier
-    Log    Trying to delete a subscription in the VNFM with invalid id
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-Send Post request for individual VNF Performance Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-Send Put request for individual VNF Performance Threshold
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
-    ${origOutput}=    Output    response
-    Set Suite Variable    ${origResponse}    ${origOutput}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    
-Send Patch request for individual VNF Performance Threshold
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
-    ${origOutput}=    Output    response
-    Set Suite Variable    ${origResponse}    ${origOutput}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-Check Postcondition VNF Performance Subscription is Unmodified (Implicit)
-    Log    Check postconidtion subscription not modified
-    GET individual VNF Performance Subscription
-    Log    Check Response matches original VNF Threshold
-    ${subscription}=    evaluate    json.loads('''${response['body']}''')    json
-    Should Be Equal As Strings    ${origResponse['body']['id']}    ${subscription.id}
-    Should Be Equal As Strings    ${origResponse['body']['callbackUri']}    ${subscription.callbackUri}
-
-Check Postcondition VNF Performance Subscription is not Created
-    Log    Trying to get a new subscription
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    Check HTTP Response Status Code Is    404 
-
-Check Postcondition VNF Performance Subscription is Deleted
-    Log    Check Postcondition Subscription is deleted
-    GET individual VNF Performance Subscription
-    Check HTTP Response Status Code Is    404 
-
-Check HTTP Response Body Subscription Identifier matches the requested Subscription
-    Log    Trying to check response ID
-    Should Be Equal As Strings    ${response['body']['id']}    ${subscriptionId} 
-    Log    Subscription identifier as expected
     
 Check HTTP Response Status Code Is
     [Arguments]    ${expected_status}    
     Should Be Equal As Strings   ${response['status']}    ${expected_status}
     Log    Status code validated 
     
-    
-    
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
     Should Contain    ${response['headers']['Content-Type']}    application/json
@@ -278,48 +26,9 @@ Check HTTP Response Body Json Schema Is
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK  
 
-
 Check HTTP Response Body Is Empty
     Should Be Empty    ${response['body']}    
-    Log    No json schema is provided. Validation OK  
-
-
-Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filter
-    Log    Check Response includes VNF Performance Management according to filter
-    Should Be Equal As Strings    ${response['body'][0]['callbackUri']}    ${callbackUri_Sub}
-
-Check HTTP Response Body PmSubscription Attributes Values Match the Issued Subscription
-    Log    Check Response matches subscription
-    ${body}=    Get File    jsons/subscriptions.json
-    ${subscription}=    evaluate    json.loads('''${body}''')    json
-    Should Be Equal As Strings    ${response['body']['callbackUri']}    ${subscription['callbackUri']}
-
-Check Postcondition VNF Performance Subscription Is Set
-    Log    Check Postcondition subscription exist
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    Check HTTP Response Status Code Is    200
-
-Check Postcondition Subscription Resource Returned in Location Header Is Available
-    Log    Going to check postcondition
-    GET    ${response['headers']['Location']}
-    Integer    response status    200
-    Log    Received a 200 OK as expected
-    ${contentType}=    Output    response headers Content-Type
-    Should Contain    ${contentType}    application/json
-    ${result}=    Output    response body
-    Validate Json    PmSubscription.schema.json    ${result}
-    Log    Validated PmSubscription schema
-    ${body}=    Get File    jsons/subscriptions.json
-    ${subscription}=    evaluate    json.loads('''${body}''')    json
-    Should Be Equal    ${result['callbackUri']}    ${subscription['callbackUri']}
-    Log    Validated Issued subscription is same as original
- 
-Check Postcondition VNF Performance Subscriptions Exists
-    Log    Checking that subscriptions exists
-    Get all VNF Performance Subscriptions         
+    Log    No json schema is provided. Validation OK          
 
 Check HTTP Response Header Contains
     [Arguments]    ${CONTENT_TYPE}
@@ -350,6 +59,6 @@ Check Notification Endpoint
     Wait Until Keyword Succeeds    ${total_polling_time}   ${polling_interval}   Verify Mock Expectation    ${notification_request}
     Clear Requests  ${callback_endpoint}
     
-Check LINK in Header
+Check HTTP Response Header Contain Link
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
diff --git a/SOL002/VNFPerformanceManagement-API/environment/individualSubscription.txt b/SOL002/VNFPerformanceManagement-API/environment/individualSubscription.txt
deleted file mode 100644
index 921749ffd..000000000
--- a/SOL002/VNFPerformanceManagement-API/environment/individualSubscription.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-*** Variables ***
-${subscriptionId}    17563e75-0e14-4bd7-94b4-6bbb869c79aa
-${erroneousSubscriptionId}    erroneousSubscriptionId
-${newSubscriptionId}    newSubsciptionId
-${response}    httpresponse
-${origResponse}    httpresponse
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/environment/subscriptions.txt b/SOL002/VNFPerformanceManagement-API/environment/subscriptions.txt
deleted file mode 100644
index c49045743..000000000
--- a/SOL002/VNFPerformanceManagement-API/environment/subscriptions.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-*** Variables ***
-${callbackUri_Sub}    http://172.22.1.7:9091/vnfpm/subscriptions
-${filter_ok}      callbackUri=${callbackUri_Sub}
-${filter_ko}      erroneousFilter=erroneous
-${total_polling_time}   2 min
-${polling_interval}     10 sec
-${response}    httpresponse
-
diff --git a/SOL002/VNFPerformanceManagement-API/environment/variables.txt b/SOL002/VNFPerformanceManagement-API/environment/variables.txt
index 0772cedcc..c6f2f9a80 100644
--- a/SOL002/VNFPerformanceManagement-API/environment/variables.txt
+++ b/SOL002/VNFPerformanceManagement-API/environment/variables.txt
@@ -4,7 +4,7 @@ ${VNFM_PORT}      8080    # Listening port of the VNFM
 ${VNFM_SCHEMA}    https
 
 ${apiRoot}        /
-${apiMajorVersion}     v1
+${apiMajorVersion}     v2
 ${apiName}        vnfpm
 
 
diff --git a/SOL002/VNFPerformanceManagement-API/jsons/subscriptions.json b/SOL002/VNFPerformanceManagement-API/jsons/subscriptions.json
deleted file mode 100644
index 7072ba326..000000000
--- a/SOL002/VNFPerformanceManagement-API/jsons/subscriptions.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{{
-	"callbackUri": "{callback_uri}{subscribe}",
-	"filter": {{
-		"notificationTypes": ["ThresholdCrossedNotification"]
-	}}
-}}
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/schemas/PmSubscription.schema.json b/SOL002/VNFPerformanceManagement-API/schemas/PmSubscription.schema.json
deleted file mode 100644
index c9ad05130..000000000
--- a/SOL002/VNFPerformanceManagement-API/schemas/PmSubscription.schema.json
+++ /dev/null
@@ -1,142 +0,0 @@
-{
-  "description": "This type represents a subscription.\n",
-  "type": "object",
-  "required": [
-    "id",
-    "callbackUri",
-    "_links"
-  ],
-  "properties": {
-    "id": {
-      "description": "An identifier with the intention of being globally unique.\n",
-      "type": "string"
-    },
-    "filter": {
-      "description": "This type represents a filter that can be used to subscribe for notifications related to performance management events.\n",
-      "type": "object",
-      "properties": {
-        "vnfInstanceSubscriptionFilter": {
-          "description": "This type represents subscription filter criteria to match VNF instances.\n",
-          "type": "object",
-          "properties": {
-            "vnfdIds": {
-              "description": "If present, match VNF instances that were created based on a VNFD identified by one of the vnfdId values listed in this attribute. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-              "type": "array",
-              "items": {
-                "description": "An identifier with the intention of being globally unique.\n",
-                "type": "string"
-              }
-            },
-            "vnfProductsFromProviders": {
-              "description": "If present, match VNF instances that belong to VNF products from certain providers. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-              "type": "array",
-              "items": {
-                "type": "object",
-                "required": [
-                  "vnfProvider"
-                ],
-                "properties": {
-                  "vnfProvider": {
-                    "description": "Name of the VNF provider to match.\n",
-                    "type": "string"
-                  },
-                  "vnfProducts": {
-                    "description": "If present, match VNF instances that belong to VNF products with certain product names, from one particular provider.\n",
-                    "type": "array",
-                    "items": {
-                      "type": "object",
-                      "required": [
-                        "vnfProductName"
-                      ],
-                      "properties": {
-                        "vnfProductName": {
-                          "description": "Name of the VNF product to match.\n",
-                          "type": "string"
-                        },
-                        "versions": {
-                          "description": "If present, match VNF instances that belong to VNF products with certain versions and a certain product name, from one particular provider.\n",
-                          "type": "array",
-                          "items": {
-                            "type": "object",
-                            "required": [
-                              "vnfSoftwareVersion"
-                            ],
-                            "properties": {
-                              "vnfSoftwareVersion": {
-                                "description": "A version.\n",
-                                "type": "string"
-                              },
-                              "vnfdVersions": {
-                                "description": "If present, match VNF instances that belong to VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n",
-                                "type": "array",
-                                "items": {
-                                  "description": "A version.\n",
-                                  "type": "string"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "vnfInstanceIds": {
-              "description": "If present, match VNF instances with an instance identifier listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-              "type": "array",
-              "items": {
-                "description": "An identifier with the intention of being globally unique.\n",
-                "type": "string"
-              }
-            },
-            "vnfInstanceNames": {
-              "description": "If present, match VNF instances with a VNF Instance Name listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-              "type": "array",
-              "items": {
-                "type": "string"
-              }
-            }
-          }
-        },
-        "notificationTypes": {
-          "description": "Match particular notification types. Permitted values: * ThresholdCrossedNotification * PerformanceInformationAvailableNotification The permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.\n",
-          "type": "string",
-          "enum": [
-            "ThresholdCrossedNotification",
-            "PerformanceInformationAvailableNotification"
-          ]
-        }
-      }
-    },
-    "callbackUri": {
-      "description": "The URI of the endpoint to send the notification to.\n",
-      "type": "string",
-      "format": "url"
-    },
-    "_links": {
-      "description": "Links to resources related to this resource.\n",
-      "type": "object",
-      "required": [
-        "self"
-      ],
-      "properties": {
-        "self": {
-          "description": "This type represents a link to a resource.\n",
-          "type": "object",
-          "required": [
-            "href"
-          ],
-          "properties": {
-            "href": {
-              "description": "URI of the referenced resource.\n",
-              "type": "string",
-              "format": "url"
-            }
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/schemas/PmSubscriptions.schema.json b/SOL002/VNFPerformanceManagement-API/schemas/PmSubscriptions.schema.json
deleted file mode 100644
index fefb142da..000000000
--- a/SOL002/VNFPerformanceManagement-API/schemas/PmSubscriptions.schema.json
+++ /dev/null
@@ -1 +0,0 @@
-{  "type": "array",  "items": {    "description": "This type represents a subscription.\n",    "type": "object",    "required": [      "id",      "callbackUri",      "_links"    ],    "properties": {      "id": {        "description": "An identifier with the intention of being globally unique.\n",        "type": "string"      },      "filter": {        "description": "This type represents a filter that can be used to subscribe for notifications related to performance management events.\n",        "type": "object",        "properties": {          "vnfInstanceSubscriptionFilter": {            "description": "This type represents subscription filter criteria to match VNF instances.\n",            "type": "object",            "properties": {              "vnfdIds": {                "description": "If present, match VNF instances that were created based on a VNFD identified by one of the vnfdId values listed in this attribute. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",                "type": "array",                "items": {                  "description": "An identifier with the intention of being globally unique.\n",                  "type": "string"                }              },              "vnfProductsFromProviders": {                "description": "If present, match VNF instances that belong to VNF products from certain providers. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",                "type": "array",                "items": {                  "type": "object",                  "required": [                    "vnfProvider"                  ],                  "properties": {                    "vnfProvider": {                      "description": "Name of the VNF provider to match.\n",                      "type": "string"                    },                    "vnfProducts": {                      "description": "If present, match VNF instances that belong to VNF products with certain product names, from one particular provider.\n",                      "type": "array",                      "items": {                        "type": "object",                        "required": [                          "vnfProductName"                        ],                        "properties": {                          "vnfProductName": {                            "description": "Name of the VNF product to match.\n",                            "type": "string"                          },                          "versions": {                            "description": "If present, match VNF instances that belong to VNF products with certain versions and a certain product name, from one particular provider.\n",                            "type": "array",                            "items": {                              "type": "object",                              "required": [                                "vnfSoftwareVersion"                              ],                              "properties": {                                "vnfSoftwareVersion": {                                  "description": "A version.\n",                                  "type": "string"                                },                                "vnfdVersions": {                                  "description": "If present, match VNF instances that belong to VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n",                                  "type": "array",                                  "items": {                                    "description": "A version.\n",                                    "type": "string"                                  }                                }                              }                            }                          }                        }                      }                    }                  }                }              },              "vnfInstanceIds": {                "description": "If present, match VNF instances with an instance identifier listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",                "type": "array",                "items": {                  "description": "An identifier with the intention of being globally unique.\n",                  "type": "string"                }              },              "vnfInstanceNames": {                "description": "If present, match VNF instances with a VNF Instance Name listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",                "type": "array",                "items": {                  "type": "string"                }              }            }          },          "notificationTypes": {            "description": "Match particular notification types. Permitted values: * ThresholdCrossedNotification * PerformanceInformationAvailableNotification The permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.\n",            "type": "string",            "enum": [              "ThresholdCrossedNotification",              "PerformanceInformationAvailableNotification"            ]          }        }      },      "callbackUri": {        "description": "The URI of the endpoint to send the notification to.\n",        "type": "string",        "format": "url"      },      "_links": {        "description": "Links to resources related to this resource.\n",        "type": "object",        "required": [          "self"        ],        "properties": {          "self": {            "description": "This type represents a link to a resource.\n",            "type": "object",            "required": [              "href"            ],            "properties": {              "href": {                "description": "URI of the referenced resource.\n",                "type": "string",                "format": "url"              }            }          }        }      }    }  }}
\ No newline at end of file
-- 
GitLab


From 071a4a62d0b521ae03720a85df04a2a566f0d39a Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 13 Oct 2020 16:15:52 +0500
Subject: [PATCH 078/322] minor bugs fix added

---
 SOL002/VNFFaultManagement-API/Alarms.robot    | 114 +++++++++---------
 .../IndividualAlarm.robot                     |  21 +++-
 .../IndividualSubscription.robot              |  11 +-
 .../Subscriptions.robot                       |  20 +--
 .../environment/variables.txt                 |   3 +-
 5 files changed, 97 insertions(+), 72 deletions(-)

diff --git a/SOL002/VNFFaultManagement-API/Alarms.robot b/SOL002/VNFFaultManagement-API/Alarms.robot
index fd51868aa..b2c226c55 100644
--- a/SOL002/VNFFaultManagement-API/Alarms.robot
+++ b/SOL002/VNFFaultManagement-API/Alarms.robot
@@ -12,10 +12,10 @@ POST Alarms - Method not implemented
     [Documentation]    Test ID: 6.3.4.1.1
     ...    Test title: POST Alarms - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: none
     POST Alarms Task
     Check HTTP Response Status Code Is    405
@@ -24,11 +24,11 @@ GET information about multiple alarms
     [Documentation]    Test ID: 6.3.4.1.2
     ...    Test title: GET information about multiple alarms
     ...    Test objective: The objective is to retrieve information about the alarm list
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none 
     ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions:  
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Alarms Task
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    alarms    
@@ -36,12 +36,12 @@ GET information about multiple alarms
 GET information about multiple alarms with attribute-based filter
     [Documentation]    Test ID: 6.3.4.1.3
     ...    Test title: GET information about multiple alarms with attribute-based filter
-    ...    Test objective: The objective is to retrieve information about the alarm list
-    ...    Pre-conditions: 
+    ...    Test objective: The objective is to retrieve information about the alarm list with attribute-based filter
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Alarms Task with filter
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    alarms
@@ -50,11 +50,11 @@ GET information about multiple alarms with invalid attribute-based filter
     [Documentation]    Test ID: 6.3.4.1.4
     ...    Test title: GET information about multiple alarms with invalid attribute-based filter
     ...    Test objective: The objective is to retrieve information about the alarm list
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Alarms Task with invalid filter
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails   
@@ -63,11 +63,11 @@ GET information about multiple alarms with "all_fields" attribute selector
     [Documentation]    Test ID: 6.3.4.1.5
     ...    Test title: GET information about multiple alarms with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Alarms Task with all_fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    alarms
@@ -76,11 +76,11 @@ GET information about multiple alarms with exclude_default attribute selector
     [Documentation]    Test ID: 6.3.4.1.6
     ...    Test title: GET information about multiple alarms with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Alarms Task with exclude_default attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    alarms
@@ -89,11 +89,11 @@ GET information about multiple alarms with fields attribute selector
     [Documentation]    Test ID: 6.3.4.1.7
     ...    Test title: GET information about multiple alarms with fields attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none 
     ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Alarms Task with fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    alarms
@@ -102,10 +102,10 @@ GET information about multiple alarms with "exclude_fields" attribute selector
     [Documentation]    Test ID: 6.3.4.1.8
     ...    Test title: GET information about multiple alarms with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: none
     GET Alarms Task with exclude_fields attribute selector
     Check HTTP Response Status Code Is    200
@@ -115,10 +115,10 @@ PUT Alarms - Method not implemented
     [Documentation]    Test ID: 6.3.4.1.9
     ...    Test title: PUT Alarms - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: none
     PUT Alarms Task
     Check HTTP Response Status Code Is    405
@@ -127,10 +127,10 @@ PATCH Alarms - Method not implemented
     [Documentation]    Test ID: 6.3.4.1.10
     ...    Test title: PATCH Alarms - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: none
     PATCH Alarms Task
     Check HTTP Response Status Code Is    405
@@ -139,11 +139,11 @@ DELETE Alarms - Method not implemented
     [Documentation]    Test ID: 6.3.4.1.11
     ...    Test title: DELETE Alarms - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: the alarm is not deleted
+    ...    Applicability: none
+    ...    Post-Conditions: none
     DELETE Alarms Task
     Check HTTP Response Status Code Is    405
     
@@ -151,24 +151,24 @@ GET information about multiple alarms to get Paged Response
     [Documentation]    Test ID: 6.3.4.1.12
     ...    Test title: GET information about multiple alarms to get Paged Response
     ...    Test objective: The objective is to retrieve information about the alarms to get paged response
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions:  
+    ...    Applicability: none
+    ...    Post-Conditions:  none
     GET Alarms Task
     Check HTTP Response Status Code Is    200
-    Check LINK in Header 
+    Check HTTP Response Header Contain Link
     
 GET information about multiple alarms for Bad Request Response too big
     [Documentation]    Test ID: 6.3.4.1.13
     ...    Test title: GET information about multiple alarms for Bad Request Response too big
     ...    Test objective: The objective is to test that GET method fail retrieving status information about Alarms when Response is too big, and perform the JSON schema validation of the failed operation HTTP response
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Alarms Task with invalid filter
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails
@@ -177,11 +177,11 @@ GET information about alarms with attribute-based filter "id"
     [Documentation]    Test ID: 6.3.4.1.14
     ...    Test title: GET information about alarms with attribute-based filter "id"
     ...    Test objective: The objective is to retrieve information about the alarm list with alarm filter "id"
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none 
     ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Alarms Task with filter "id"
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    alarm
@@ -191,11 +191,11 @@ GET information about multiple alarms with attribute-based filter "vnfcInstanceI
     [Documentation]    Test ID: 6.3.4.1.15
     ...    Test title: GET information about multiple alarms with attribute-based filter "vnfcInstanceIds"
     ...    Test objective: The objective is to retrieve information about the alarm list with attribute filter "vnfcInstanceIds"
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none 
     ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Alarms Task with filter "vnfcInstanceIds"
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    alarms 
@@ -205,11 +205,11 @@ GET information about multiple alarms with attribute-based filter "rootCauseFaul
     [Documentation]    Test ID: 6.3.4.1.16
     ...    Test title: GET information about multiple alarms with attribute-based filter "rootCauseFaultyResource.faultyResourceType"
     ...    Test objective: The objective is to retrieve information about the alarm list with attribute filter "rootCauseFaultyResource.faultyResourceType"
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Alarms Task with filter "rootCauseFaultyResource_faultyResourceType"
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    alarms 
@@ -219,11 +219,11 @@ GET information about multiple alarms with attribute-based filter "eventType"
     [Documentation]    Test ID: 6.3.4.1.17
     ...    Test title: GET information about multiple alarms with attribute-based filter "eventType"
     ...    Test objective: The objective is to retrieve information about the alarm list with attribute filter "eventType"
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Alarms Task with filter "eventType"
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    alarms 
@@ -233,11 +233,11 @@ GET information about multiple alarms with attribute-based filter "perceivedSeve
     [Documentation]    Test ID: 6.3.4.1.18
     ...    Test title: GET information about multiple alarms with attribute-based filter "perceivedSeverity"
     ...    Test objective: The objective is to retrieve information about the alarm list with attribute filter "perceivedSeverity"
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Alarms Task with filter "perceivedSeverity"
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    alarms 
@@ -247,11 +247,11 @@ GET information about multiple alarms with attribute-based filter "probableCause
     [Documentation]    Test ID: 6.3.4.1.19
     ...    Test title: GET information about multiple alarms with attribute-based filter "probableCause"
     ...    Test objective: The objective is to retrieve information about the alarm list with attribute filter "probableCause"
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Alarms Task with filter "probableCause"
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    alarms 
@@ -357,7 +357,7 @@ Check HTTP Response Body Json Schema Is
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
     
-Check LINK in Header
+Check HTTP Response Header Contain Link
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
     
@@ -426,7 +426,7 @@ GET Alarms Task with filter "perceivedSeverity"
 	
 Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "perceivedSeverity"
     :FOR   ${item}   IN  @{response['body']}
-    Should Be Equal As Strings    ${item['perceivedSeverity']}   ${perceivedSeverity}
+    Should Be Equal As Strings    ${item['perceivedSeverity']}   ${PerceivedSeverity} 
     END
 	
 GET Alarms Task with filter "probableCause"
diff --git a/SOL002/VNFFaultManagement-API/IndividualAlarm.robot b/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
index 0aa6b9e2f..97c96dc56 100644
--- a/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
+++ b/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
@@ -1,5 +1,4 @@
 *** Settings ***
-# Suite setup     Expect spec    SOL003-VNFLifecycleManagement-API.yaml
 Resource    environment/variables.txt  
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
 Library    OperatingSystem
@@ -15,7 +14,7 @@ POST Alarm - Method not implemented
     [Documentation]    Test ID: 6.3.4.2.1
     ...    Test title: POST Alarm - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
@@ -40,7 +39,7 @@ PUT Individual Alarm - Method not implemented
      [Documentation]    Test ID: 6.3.4.2.3
     ...    Test title: PUT Individual Alarm - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
@@ -73,6 +72,7 @@ PATCH Individual Alarm - Precondition failed
     PATCH Alarm Task with wrong precondition
     Check HTTP Response Status Code Is    412
     Check HTTP Response Body Json Schema Is     ProblemDetails
+    Check Postcondition VNF individual alarm Unmodified (Implicit)
     
 PATCH Individual Alarm - Conflict
     [Documentation]    Test ID: 6.3.4.2.6
@@ -86,16 +86,17 @@ PATCH Individual Alarm - Conflict
     PATCH Alarm Task
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is     ProblemDetails
+    Check Postcondition VNF individual alarm Unmodified (Implicit)
     
 DELETE Individual Alarm - Method not implemented
     [Documentation]    Test ID: 6.3.4.2.7
     ...    Test title: DELETE Individual Alarm - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: alarm not deleted
+    ...    Post-Conditions: none
     DELETE Alarm Task
     Check HTTP Response Status Code Is    405
     
@@ -110,6 +111,7 @@ GET information about an individual alarm - Not Found
     ...    Post-Conditions: none   
     GET Alarm Task
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is     ProblemDetails
 
 *** Keywords ***
 POST Alarm Task
@@ -143,6 +145,9 @@ PATCH Alarm Task with wrong precondition
     Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/alarmModifications.json
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
+    ${origOutput}=    Output    response
+    Set Suite Variable    ${origResponse}    ${origOutput}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
@@ -190,3 +195,9 @@ Check HTTP Response Body Json Schema Is
     ${schema} =    Catenate    SEPARATOR=    ${input}	.schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
+    
+Check Postcondition VNF individual alarm Unmodified (Implicit)
+    Log    Check Postcondition subscription is not modified
+    GET Alarm Task
+    Should Be Equal As Strings    ${origResponse['body']['callbackUri']}    ${response['body']['callbackUri']}
+
diff --git a/SOL002/VNFFaultManagement-API/IndividualSubscription.robot b/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
index 245f27508..6189b4e04 100644
--- a/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
+++ b/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
@@ -60,14 +60,15 @@ PATCH an individual subscription - Method not implemented
 DELETE an individual subscription
     [Documentation]    Test ID: 6.3.4.5.5
     ...    Test title: DELETE an individual subscription
-    ...    Test objective: The objective is to test that the deletion of a subscription
-    ...    Pre-conditions: an existing subscription
+    ...    Test objective: The objective is to test that the deletion of a individual subscription resource.
+    ...    Pre-conditions: one or more subscription already exsist
     ...    Reference: Clause 7.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: the subscription is deleted
     Delete individual subscription
     Check HTTP Response Status Code Is    204
+    Check Postcondition resource is deleted
     
 GET Information about an individual subscription - Not Found
     [Documentation]    Test ID: 6.3.4.5.6
@@ -80,6 +81,7 @@ GET Information about an individual subscription - Not Found
     ...    Post-Conditions: none
     Get individual subscription
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
     
 *** Keywords ***
 Check resource existence
@@ -149,3 +151,8 @@ Check HTTP Response Body Json Schema Is
     ${schema} =    Catenate    SEPARATOR=    ${input}	.schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
+
+Check Postcondition resource is deleted
+    Get individual subscription
+    Check HTTP Response Status Code Is    404
+    
\ No newline at end of file
diff --git a/SOL002/VNFFaultManagement-API/Subscriptions.robot b/SOL002/VNFFaultManagement-API/Subscriptions.robot
index 2a1461e1f..3c6434819 100644
--- a/SOL002/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL002/VNFFaultManagement-API/Subscriptions.robot
@@ -19,7 +19,8 @@ Create a new subscription
     Post Create subscription
     Check HTTP Response Status Code Is    201
     Check HTTP Response Body Json Schema Is    FmSubscription
-    Check resource existence
+    Check HTTP Response Header Contain Link
+    Check Postcondition resource exists
 
 Create a new Subscription - DUPLICATION
      [Documentation]    Test ID: 6.3.4.4.2
@@ -33,6 +34,8 @@ Create a new Subscription - DUPLICATION
     Post Create subscription - DUPLICATION
     Check HTTP Response Status Code Is    201
     Check HTTP Response Body Json Schema Is    FmSubscription
+    Check HTTP Response Header Contain Link
+    Check Postcondition Duplicate Subscription exsist
     
 Create a new Subscription - NO-DUPLICATION
     [Documentation]    Test ID: 6.3.4.4.3
@@ -45,6 +48,7 @@ Create a new Subscription - NO-DUPLICATION
     ...    Post-Conditions: duplicated subscription is not created
     Post Create subscription - DUPLICATION
     Check HTTP Response Status Code Is    303
+    Check HTTP Response Header Contain Link
 
 GET Subscriptions
     [Documentation]    Test ID: 6.3.4.4.4
@@ -54,7 +58,7 @@ GET Subscriptions
     ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
-    ...    Post-Conditions: subscription is not deleted
+    ...    Post-Conditions: none
     Get subscriptions
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   FmSubscriptions 
@@ -169,7 +173,7 @@ DELETE subscriptions - Method not implemented
     ...    Reference: Clause 7.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
-    ...    Post-Conditions: subscription not deleted
+    ...    Post-Conditions: none
     DELETE subscriptions
     Check HTTP Response Status Code Is    405
     
@@ -181,10 +185,10 @@ GET Subscriptions to get Paged Response
     ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
-    ...    Post-Conditions: subscription is not deleted
+    ...    Post-Conditions: none
     Get subscriptions
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contain Link
     
 GET subscriptions - Bad Request Response too Big
     [Documentation]    Test ID: 6.3.4.4.15
@@ -414,7 +418,7 @@ Check HTTP Response Body Json Schema Is
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK  
     
-Check LINK in Header
+Check HTTP Response Header Contain Link
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
     
@@ -494,9 +498,11 @@ Check PostCondition HTTP Response Body Subscriptions Matches the requested attri
     Should Be Equal As Strings    ${item['filter']['probableCauses']}   ${probableCause}
     END
     
-Check resource existence
+Check Postcondition resource exists
     Set Headers    {"Accept":"${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
     Integer    response status    200
 
+Check Postcondition Duplicate Subscription exsist
+    Should Not Be Equal As Strings    ${response['body']['callbackUri']}    ${subscriptionId} 
\ No newline at end of file
diff --git a/SOL002/VNFFaultManagement-API/environment/variables.txt b/SOL002/VNFFaultManagement-API/environment/variables.txt
index dbc40ec86..88d5888ff 100644
--- a/SOL002/VNFFaultManagement-API/environment/variables.txt
+++ b/SOL002/VNFFaultManagement-API/environment/variables.txt
@@ -14,6 +14,8 @@ ${apiName}        vnffm
 ${apiMajorVersion}     v1
 ${CONTENT_TYPE}    application/json
 
+${origResponse}=    httpresponse
+
 ${VNFM_ALLOWS_DUPLICATE_SUBS}    0
 
 ${alarmId}    6fc3539c-e602-4afa-8e13-962fb5a7d81d
@@ -52,7 +54,6 @@ ${response}=    httpresponse
 ${vnfcInstanceIds}    []        
 ${faultyResourceType}    COMPUTE
 ${eventType}            COMMUNICATIONS_ALARM
-${perceivedSeverity}    CRITICAL
 ${probableCause}
 
 ${notification_type}	AlarmNotification
\ No newline at end of file
-- 
GitLab


From 36e8628616e21c0e3e11609631c3f811916ebc36 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 13 Oct 2020 16:31:39 +0500
Subject: [PATCH 079/322] minor bugs fix added

---
 .../IndividualSubscription.robot              | 26 +++----------
 .../IndividualVNFindicator.robot              | 37 ++++++-------------
 SOL002/VNFIndicator-API/Subscriptions.robot   | 16 ++++----
 SOL002/VNFIndicator-API/VNFIndicators.robot   | 22 +++++------
 .../VnfIndicatorsInVnfInstanceId.robot        | 22 ++++-------
 5 files changed, 43 insertions(+), 80 deletions(-)

diff --git a/SOL002/VNFIndicator-API/IndividualSubscription.robot b/SOL002/VNFIndicator-API/IndividualSubscription.robot
index dc83acc73..4e75f80c7 100644
--- a/SOL002/VNFIndicator-API/IndividualSubscription.robot
+++ b/SOL002/VNFIndicator-API/IndividualSubscription.robot
@@ -62,40 +62,37 @@ PUT Individual VNF Indicator Subscription - Method not implemented
     [Documentation]    Test ID: 6.3.2.5.5
     ...    Test title: PUT individual VNF indicator subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an individual VNF performance indicator subscription
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
-    ...    Post-Conditions: The individual VNF indicator subscription is not modified by the operation
+    ...    Post-Conditions: none
     Send Put Request for Individual VNF Indicator Subscription
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF individual subscription Unmodified (Implicit)
 
 PATCH Individual VNF Indicator Subscription - Method not implemented
     [Documentation]    Test ID: 6.3.2.5.6
     ...    Test title: PUT individual VNF indicator subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update an individual VNF performance indicator subscription
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
-    ...    Post-Conditions: The individual VNF indicator subscription is not modified by the operation
+    ...    Post-Conditions: none
     Send Patch Request for Individual VNF Indicator Subscription
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF individual subscription Unmodified (Implicit) 
 
 POST Individual VNF Indicator Subscription - Method not implemented
     [Documentation]    Test ID: 6.3.2.5.7
     ...    Test title: PUT individual VNF indicator subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an individual VNF performance indicator subscription
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
-    ...    Post-Conditions: The individual VNF indicator subscription is not created by the operation
+    ...    Post-Conditions: none
     Send Post Request for Individual VNF Indicator Subscription
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF individual subscription is not created  
 
 *** Keywords ***
 Get Individual VNF Indicator Subscription
@@ -181,14 +178,3 @@ Check Postcondition Individual VNF Indicator Subscription is Deleted
     Log    Check Postcondition subscription is deleted
     GET Individual VNF Indicator Subscription
     Check HTTP Response Status Code Is    404
-
-Check Postcondition VNF individual subscription Unmodified (Implicit)
-    Log    Check Postcondition subscription is not modified
-    GET Individual VNF Indicator Subscription
-    Log    Check Response matches original subscription
-    Should Be Equal As Strings    ${origResponse['body']['callbackUri']}    ${response['body']['callbackUri']}
-    
-Check Postcondition VNF individual subscription is not created
-    Log    Check Postcondition subscription is not created
-    GET Individual VNF Indicator Subscription with invalid resource identifier
-    Check HTTP Response Status Code Is    404
diff --git a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
index 5e5cdf32d..19b7fb469 100644
--- a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
+++ b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
@@ -37,7 +37,7 @@ POST Individual VNF Indicator - Method not implemented
     [Documentation]    Test ID: 6.3.2.3.3
     ...    Test title: POST individual performance indicator for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new performance indicator for a VNF instance
-    ...    Pre-conditions: A VNF instance is instantiated.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
@@ -49,7 +49,7 @@ PUT Individual VNF Indicator - Method not implemented
     [Documentation]    Test ID: 6.3.2.3.4
     ...    Test title: PUT individual performance indicator for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an existing performance indicator for a VNF instance
-    ...    Pre-conditions: A VNF instance is instantiated. At least one measure of performance indicator is available for the given VNF instance.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
@@ -61,7 +61,7 @@ PATCH Individual VNF Indicator - Method not implemented
     [Documentation]    Test ID: 6.3.2.3.5
     ...    Test title: PATCH individual performance indicator for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update an existing performance indicator for a VNF instance
-    ...    Pre-conditions: A VNF instance is instantiated. At least one measure of performance indicator is available for the given VNF instance.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
@@ -73,14 +73,13 @@ DELETE Individual VNF Indicator - Method not implemented
     [Documentation]    Test ID: 6.3.2.3.6
     ...    Test title: DELETE individual performance indicator indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing performance indicator for a VNF instance
-    ...    Pre-conditions: A VNF instance is instantiated. At least one measure of performance indicator is available for the given VNF instance.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
-    ...    Post-Conditions: The individual performance indicator for the VNF instance is not deleted by the unsuccessful operation
+    ...    Post-Conditions: none
     Send DELETE Request for individual indicator in VNF instance
     Check HTTP Response Status Code Is    405
-    Check Postcondition Indicator for VNF instance Exist
     
 Get Individual Performance Indicator
     [Documentation]    Test ID: 6.3.2.3.7
@@ -113,7 +112,7 @@ POST Individual Performance Indicator - Method not implemented
     [Documentation]    Test ID: 6.3.2.3.9
     ...    Test title: POST Individual Performance Indicator - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new performance indicator.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
@@ -125,7 +124,7 @@ PUT Individual Performance Indicator - Method not implemented
     [Documentation]    Test ID: 6.3.2.3.10
     ...    Test title: PUT Individual Performance Indicator - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an existing performance indicator.
-    ...    Pre-conditions: At least one measure of performance indicator is available.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
@@ -137,7 +136,7 @@ PATCH Individual Performance Indicator - Method not implemented
     [Documentation]    Test ID: 6.3.2.3.11
     ...    Test title: PATCH Individual Performance Indicator - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update an existing performance indicator.
-    ...    Pre-conditions: At least one measure of performance indicator is available.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
@@ -149,14 +148,13 @@ DELETE Individual Performance Indicator - Method not implemented
     [Documentation]    Test ID: 6.3.2.3.12
     ...    Test title: DELETE Individual Performance Indicator - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing performance indicator.
-    ...    Pre-conditions: At least one measure of performance indicator is available.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send DELETE Request for individual indicator
     Check HTTP Response Status Code Is    405
-    Check PostCondition Individual Indicator exist
     
 *** Keywords ***
 Get Individual Indicator for a VNF instance
@@ -234,12 +232,6 @@ Check HTTP Response Body Includes Requested VNF Instance ID
     Log    Check Response includes propoer VNF instance and Indicator identifiers
     Should Be Equal As Strings   ${response['body']['vnfInstanceId']}    ${vnfInstanceId}
 
-Check Postcondition Indicator for VNF instance Exist
-    Log    Check Response includes VNF Indicator
-    Get Individual Indicator for a VNF instance
-    Should Be Equal As Strings   ${response['body']['vnfInstanceId']}    ${vnfInstanceId}
-    Should Be Equal As Strings   ${response['body']['id']}    ${indicatorId}
-
 Get Individual Indicator
     Log    This resource represents a VNF indicator related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
@@ -286,11 +278,4 @@ Send DELETE Request for individual indicator
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${indicatorId}
     ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output} 
-    
-Check PostCondition Individual Indicator exist
-    Log    This resource represents a VNF indicator related to a VNF instance.
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
-    Integer    response status    200	
\ No newline at end of file
+    Set Suite Variable    ${response}    ${output} 
\ No newline at end of file
diff --git a/SOL002/VNFIndicator-API/Subscriptions.robot b/SOL002/VNFIndicator-API/Subscriptions.robot
index a2624bada..0e208cd33 100644
--- a/SOL002/VNFIndicator-API/Subscriptions.robot
+++ b/SOL002/VNFIndicator-API/Subscriptions.robot
@@ -63,6 +63,7 @@ GET VNF Indicators Subscriptions with invalid resource endpoint
     ...    Post-Conditions: none
     Get VNF Indicators Subscriptions with invalid resource endpoint
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 Create new VNF indicator subscription
     [Documentation]    Test ID: 6.3.2.4.5
@@ -83,7 +84,7 @@ PUT VNF Indicator Subscriptions - Method not implemented
     [Documentation]    Test ID: 6.3.2.4.6
     ...    Test title: PUT VNF Indicator Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF indicator subscriptions
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators.
@@ -95,7 +96,7 @@ PATCH VNF Indicator Subscriptions - Method not implemented
     [Documentation]    Test ID: 6.3.2.4.7
     ...    Test title: PATCH VNF Indicator Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF indicator subscriptions
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators.
@@ -107,7 +108,7 @@ DELETE VNF Indicator Subscriptions - Method not implemented
     [Documentation]    Test ID: 6.3.2.4.8
     ...    Test title: DELETE VNF Indicator Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete VNF indicator subscriptions
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators.
@@ -126,7 +127,7 @@ GET VNF Indicators Subscriptions to get Paged Response
     ...    Post-Conditions: none
     Get VNF Indicators Subscriptions
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contain Link
  
 GET VNF Indicators Subscriptions - Bad Request Response too Big
     [Documentation]    Test ID: 6.3.2.4.10
@@ -162,10 +163,11 @@ Create new VNF indicator Subscription - DUPLICATION
     ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: SUT should support duplication of subscription creation
-    ...    Post-Conditions: in response header Location shall not be null
+    ...    Post-Conditions: In response header Location shall not be null
     Post Create subscription - DUPLICATION
     Check HTTP Response Status Code Is    201
     Check HTTP Response Body Json Schema Is    VnfIndicatorSubscription
+    Check Operation Occurrence Id
 
 Create new VNF indicator Subscription - NO-DUPLICATION
     [Documentation]    Test ID: 6.3.2.4.13
@@ -175,7 +177,7 @@ Create new VNF indicator Subscription - NO-DUPLICATION
     ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: SUT should not support duplication of subscription creation
-    ...    Post-Conditions: in response header Location shall not be null
+    ...    Post-Conditions: In response header Location shall not be null
     Post Create subscription - NO-DUPLICATION
     Check HTTP Response Status Code Is    303
     Check Operation Occurrence Id
@@ -303,7 +305,7 @@ Check Notification Endpoint
     Wait Until Keyword Succeeds    ${total_polling_time}   ${polling_interval}   Verify Mock Expectation    ${notification_request}
     Clear Requests  ${callback_endpoint}
     
-Check LINK in Header
+Check HTTP Response Header Contain Link
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
     
diff --git a/SOL002/VNFIndicator-API/VNFIndicators.robot b/SOL002/VNFIndicator-API/VNFIndicators.robot
index 11b8d7b01..f3f8f20f8 100644
--- a/SOL002/VNFIndicator-API/VNFIndicators.robot
+++ b/SOL002/VNFIndicator-API/VNFIndicators.robot
@@ -59,6 +59,7 @@ Get all VNF Indicators with malformed authorization token
     ...    Post-Conditions: none
     Get all VNF indicators with malformed authorization token
     Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 Get all VNF Indicators without authorization token
     [Documentation]    Test ID: 6.3.2.1.5
@@ -71,6 +72,7 @@ Get all VNF Indicators without authorization token
     ...    Post-Conditions: none
     Get all VNF indicators without authorization token
     Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 GET all VNF Indicators with expired or revoked authorization token
     [Documentation]    Test ID: 6.3.2.1.6
@@ -83,6 +85,7 @@ GET all VNF Indicators with expired or revoked authorization token
     ...    Post-Conditions: none
     Get all VNF indicators with expired or revoked authorization token
     Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 Get all VNF Indicators with invalid resource endpoint
     [Documentation]    Test ID: 6.3.2.1.7
@@ -95,12 +98,13 @@ Get all VNF Indicators with invalid resource endpoint
     ...    Post-Conditions: none
     Get all VNF indicators with invalid resource endpoint
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 POST all VNF Indicators - Method not implemented
     [Documentation]    Test ID: 6.3.2.1.8
     ...    Test title: POST all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new VNF indicators
-    ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
@@ -112,7 +116,7 @@ PUT all VNF Indicators - Method not implemented
     [Documentation]    Test ID: 6.3.2.1.9
     ...    Test title: PUT all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF indicators
-    ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
@@ -124,7 +128,7 @@ PATCH all VNF Indicators - Method not implemented
      [Documentation]    Test ID: 6.3.2.1.10
     ...    Test title: PATCH all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF indicators
-    ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
@@ -136,14 +140,13 @@ DELETE all VNF Indicators - Method not implemented
     [Documentation]    Test ID: 6.3.2.1.11
     ...    Test title: DELETE all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete VNF indicators
-    ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
     Send DELETE Request for all VNF indicators
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Indicators Exist
     
 Get VNF Indicators to get Paged Response
     [Documentation]    Test ID: 6.3.2.1.12
@@ -156,7 +159,7 @@ Get VNF Indicators to get Paged Response
     ...    Post-Conditions: none
     Get all VNF indicators
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contain Link
     
 Get VNF Indicators - Bad Request Response too Big
     [Documentation]    Test ID: 6.3.2.1.13
@@ -288,11 +291,6 @@ Check HTTP Response Body Json Schema Is
     ${jsonSchema}=    Catenate    SEPARATOR=    ${schema}    .schema.json
     Validate Json    ${jsonSchema}    ${response['body']}
     Log    Json Schema Validation OK
-
-Check Postcondition VNF Indicators Exist
-    Log    Check Postcondition indicators exist
-    Get all VNF indicators
-    Check HTTP Response Status Code Is    200
     
 Check HTTP Response Body vnfIndicators Matches the requested attribute-based filter
     Log    Check Response includes VNF Indicators according to filter
@@ -301,6 +299,6 @@ Check HTTP Response Body vnfIndicators Matches the requested attribute-based fil
     @{var_id} =    Split String    @{attr}[1]       ,${SEPERATOR}
     Should Be True     "${response['body'][0]['name']}"=="@{var_name}[1]" and "${response['body'][0]['vnfInstanceId']}"=="@{var_id}[1]"
 
-Check LINK in Header
+Check HTTP Response Header Contain Link
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
diff --git a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
index 06cc15ba8..14cb88972 100644
--- a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
+++ b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
@@ -66,7 +66,7 @@ POST Indicators for VNF instance - Method not implemented
     [Documentation]    Test ID: 6.3.2.2.5
     ...    Test title: POST performance indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new performance indicators for a VNF instance
-    ...    Pre-conditions: A VNF instance is instantiated.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
@@ -78,7 +78,7 @@ PUT Indicators for VNF instance - Method not implemented
     [Documentation]    Test ID: 6.3.2.2.6
     ...    Test title: PUT performance indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify existing performance indicators for a VNF instance
-    ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
@@ -90,7 +90,7 @@ PATCH Indicators for VNF instance - Method not implemented
     [Documentation]    Test ID: 6.3.2.2.7
     ...    Test title: PATCH performance indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update existing performance indicators for a VNF instance
-    ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
@@ -102,14 +102,13 @@ DELETE Indicators for VNF instance - Method not implemented
     [Documentation]    Test ID: 6.3.2.2.8
     ...    Test title: DELETE performance indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete performance indicators for a VNF instance
-    ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
-    ...    Post-Conditions: The indicators for the VNF instance are not deleted by the unsuccessful operation
+    ...    Post-Conditions: none
     Send DELETE Request for indicators in VNF instance
     Check HTTP Response Status Code Is    405
-    Check Postcondition Indicators for VNF instance Exist
     
 Get Indicators for VNF Instance to get Paged Response
     [Documentation]    Test ID: 6.3.2.2.9
@@ -122,7 +121,7 @@ Get Indicators for VNF Instance to get Paged Response
     ...    Post-Conditions: none
     Get all indicators for a VNF instance
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contain Link
     
 Get Indicators for VNF Instance - Bad Request Response too Big
     [Documentation]    Test ID: 6.3.2.2.10
@@ -229,14 +228,7 @@ Check HTTP Response Body Matches Attribute-Based Filter
     Log    Check Response includes VNF Indicators according to filter
     @{words} =  Split String    ${POS_FIELDS}       ,${SEPERATOR} 
     Should Be Equal As Strings    ${response['body'][0]['name']}    @{words}[1]
-
-Check Postcondition Indicators for VNF instance Exist
-    Log    Check Postcondition Indicators for VNF instance Exist
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
-    Should Be Equal    ${response['status']}    200
     
-Check LINK in Header
+Check HTTP Response Header Contain Link
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
\ No newline at end of file
-- 
GitLab


From 2f894f338aa5447629abc5041eb4751f2617180e Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 13 Oct 2020 17:20:48 +0500
Subject: [PATCH 080/322] minor bugs fix added

---
 SOL002/VNFConfiguration-API/Configuration.robot | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/SOL002/VNFConfiguration-API/Configuration.robot b/SOL002/VNFConfiguration-API/Configuration.robot
index f520a7578..a8ccf57c9 100644
--- a/SOL002/VNFConfiguration-API/Configuration.robot
+++ b/SOL002/VNFConfiguration-API/Configuration.robot
@@ -70,7 +70,7 @@ POST VNF Configuration - Method not implemented
     [Documentation]    Test ID: 6.3.1.1.5
     ...    Test title: POST VNF Configuration - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF configuration
-    ...    Pre-conditions: A VNF instance is instantiated. The VNF instance is alrseady configured
+    ...    Pre-conditions: none
     ...    Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
@@ -82,7 +82,7 @@ PUT VNF Configuration - Method not implemented
     [Documentation]    Test ID: 6.3.1.1.6
     ...    Test title: PUT VNF Configuration - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an existing VNF configuration
-    ...    Pre-conditions:  A VNF instance is instantiated. The VNF instance is already configured
+    ...    Pre-conditions:  none
     ...    Reference: Clause 9.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
@@ -94,14 +94,13 @@ DELETE VNF Configuration - Method not implemented
     [Documentation]    Test ID: 6.3.1.1.7
     ...    Test title: Delete VNF Configuration - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing VNF configuration
-    ...    Pre-conditions:  A VNF instance is instantiated. The VNF instance is already configured
+    ...    Pre-conditions:  none
     ...    Reference: Clause 9.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
-    ...    Post-Conditions: The VNF configuration is not deleted by the unsuccessful operation
+    ...    Post-Conditions: none
     Send DELETE Request for VNF Configuration
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Configuration Exists
     
 *** Keywords ***    
 Get VNF configuration
@@ -145,10 +144,6 @@ Check HTTP Response Body Json Schema Is
 Check Postcondition VNF Configuration Unmodified (Implicit)
     Log    Check Implicit Postcondition
     Check Postcondition VNF Is Configured
-
-Check Postcondition VNF Configuration Exists
-    Log    Check Postcondition VNF exists
-    Check Postcondition VNF Is Configured
     
 Check Postcondition VNF Is Configured
     Log    Check Postcondition for VNF Configuration
-- 
GitLab


From a61a6b846d7556d95b1aa5587535a2f1ad855ba1 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 14 Oct 2020 11:07:33 +0500
Subject: [PATCH 081/322] added majorApiVersion

---
 SOL002/VNFIndicator-API/ApiVersion.robot      | 10 +++----
 .../IndividualSubscription.robot              | 18 ++++++-------
 .../IndividualVNFindicator.robot              | 26 +++++++++----------
 SOL002/VNFIndicator-API/Subscriptions.robot   | 18 ++++++-------
 SOL002/VNFIndicator-API/VNFIndicators.robot   | 22 ++++++++--------
 .../VnfIndicatorsInVnfInstanceId.robot        | 18 ++++++-------
 .../environment/variables.txt                 |  2 +-
 7 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/SOL002/VNFIndicator-API/ApiVersion.robot b/SOL002/VNFIndicator-API/ApiVersion.robot
index fce69405c..934cc24ef 100644
--- a/SOL002/VNFIndicator-API/ApiVersion.robot
+++ b/SOL002/VNFIndicator-API/ApiVersion.robot
@@ -169,35 +169,35 @@ DELETE API Version
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/v1/api_version
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/v1/api_version
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/v1/api_version
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/v1/api_version
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/v1/api_version
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 
diff --git a/SOL002/VNFIndicator-API/IndividualSubscription.robot b/SOL002/VNFIndicator-API/IndividualSubscription.robot
index 16de0847e..01eb68eff 100644
--- a/SOL002/VNFIndicator-API/IndividualSubscription.robot
+++ b/SOL002/VNFIndicator-API/IndividualSubscription.robot
@@ -102,7 +102,7 @@ Get Individual VNF Indicator Subscription
     Log    Trying to get a given subscription identified by subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -110,7 +110,7 @@ GET Individual VNF Indicator Subscription with invalid resource identifier
     Log    Trying to perform a request on a subscriptionID which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -118,7 +118,7 @@ Send Delete Request for Individual VNF Indicator Subscription
     Log    Trying to perform a DELETE on a subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -126,14 +126,14 @@ Send Delete Request for Individual VNF Indicator Subscription with invalid resou
     Log    Trying to perform a DELETE on a subscriptionId which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Send Post Request for Individual VNF Indicator Subscription
     Log    Trying to create a new subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
 
@@ -141,20 +141,20 @@ Send Put Request for Individual VNF Indicator Subscription
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
 
 Send Patch Request for Individual VNF Indicator Subscription
     Log    Trying to create a new subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
diff --git a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
index f4cecd713..87ff57f43 100644
--- a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
+++ b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
@@ -163,7 +163,7 @@ Get Individual Indicator for a VNF instance
     Log    This resource represents a VNF indicator related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -171,7 +171,7 @@ Get Individual Indicator for a VNF instance with invalid indicator identifier
     Log    Trying to perform a negative get, using wrong identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${erroneousIndicatorId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${erroneousIndicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -179,7 +179,7 @@ Send POST Request for individual indicator in VNF instance
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${notAllowedIndicatorId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${notAllowedIndicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -187,7 +187,7 @@ Send PUT Request for individual indicator in VNF instance
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -195,7 +195,7 @@ Send PATCH Request for individual indicator in VNF instance
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
      
@@ -203,7 +203,7 @@ Send DELETE Request for individual indicator in VNF instance
     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": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -244,7 +244,7 @@ Get Individual Indicator
     Log    This resource represents a VNF indicator related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${indicatorId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -252,7 +252,7 @@ Get Individual Indicator with invalid indicator identifier
     Log    Trying to perform a negative get, using wrong identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${erroneousIndicatorId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${erroneousIndicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -260,7 +260,7 @@ Send POST Request for individual indicator
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${notAllowedIndicatorId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${notAllowedIndicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -268,7 +268,7 @@ Send PUT Request for individual indicator
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/indicators/${indicatorId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -276,7 +276,7 @@ Send PATCH Request for individual indicator
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/indicators/${indicatorId}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -284,7 +284,7 @@ Send DELETE Request for individual indicator
     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": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/indicators/${indicatorId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -292,5 +292,5 @@ Check PostCondition Individual Indicator exist
     Log    This resource represents a VNF indicator related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
     Integer    response status    200	
\ No newline at end of file
diff --git a/SOL002/VNFIndicator-API/Subscriptions.robot b/SOL002/VNFIndicator-API/Subscriptions.robot
index fd458fbb6..1ed601330 100644
--- a/SOL002/VNFIndicator-API/Subscriptions.robot
+++ b/SOL002/VNFIndicator-API/Subscriptions.robot
@@ -146,7 +146,7 @@ Get VNF Indicators Subscriptions
     Log    Trying to get the list of subscriptions
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -154,7 +154,7 @@ Get VNF Indicators Subscriptions with filter
     Log    Trying to get the list of subscriptions using filters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${POS_FILTER}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${POS_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -162,7 +162,7 @@ Get VNF Indicators Subscriptions with invalid filter
     Log    Trying to get the list of subscriptions using filters with wrong attribute name
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${NEG_FILTER}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${NEG_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
     
@@ -170,7 +170,7 @@ Get VNF Indicators Subscriptions with invalid resource endpoint
         Log    Trying to perform a request on a Uri which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscription
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
 
@@ -180,7 +180,7 @@ Send Post Request for VNF Indicator Subscription
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${body}=    Get File    jsons/subscriptions.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}  
     Run Keyword If    ${VNFM_CHECKS_NOTIF_ENDPOINT} == 1
@@ -190,7 +190,7 @@ Send Put Request for VNF Indicator Subscriptions
     Log    Trying to create a new subscription
     ${body}=    Get File    jsons/subscriptions.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -198,7 +198,7 @@ Send Patch Request for VNF Indicator Subscriptions
     Log    Trying to create a new subscription
     ${body}=    Get File    jsons/subscriptions.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -206,7 +206,7 @@ Send Delete Request for VNF Indicator Subscriptions
     Log    Trying to create a new subscription
     ${body}=    Get File    jsons/subscriptions.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -240,7 +240,7 @@ Check Postcondition VNF Indicator Subscription Is Set
     Log    Trying to get the subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${response['body']['id']}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
diff --git a/SOL002/VNFIndicator-API/VNFIndicators.robot b/SOL002/VNFIndicator-API/VNFIndicators.robot
index bc6dbd9c9..0b05ea627 100644
--- a/SOL002/VNFIndicator-API/VNFIndicators.robot
+++ b/SOL002/VNFIndicator-API/VNFIndicators.robot
@@ -177,7 +177,7 @@ Get all VNF indicators
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -186,7 +186,7 @@ Get VNF indicators with filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators?${POS_FIELDS}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators?${POS_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -195,7 +195,7 @@ Get VNF indicators with invalid filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators?${NEG_FIELDS}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators?${NEG_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -205,7 +205,7 @@ Get all VNF indicators with malformed authorization token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Authorization": "${BAD_AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -215,7 +215,7 @@ Get all VNF indicators with expired or revoked authorization token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Authorization": "${NEG_AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -224,7 +224,7 @@ Get all VNF indicators without authorization token
     Log    The GET method queries multiple VNF indicators omitting token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -233,7 +233,7 @@ Get all VNF indicators with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/indicator
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicator
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -241,7 +241,7 @@ Send POST Request for all VNF indicators
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/indicators
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -249,7 +249,7 @@ Send PUT Request for all VNF indicators
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/indicators
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -257,7 +257,7 @@ Send PATCH Request for all VNF indicators
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/indicators
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -265,7 +265,7 @@ Send DELETE Request for all VNF indicators
     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":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/indicators
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
diff --git a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
index 11f83e45b..df5458c16 100644
--- a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
+++ b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
@@ -142,7 +142,7 @@ Get all indicators for a VNF instance
     Log    This resource represents VNF indicators related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -150,7 +150,7 @@ Get all indicators for a VNF instance with filter
     Log    This resource represents VNF indicators related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}?${POS_FIELDS}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}?${POS_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
        
@@ -158,7 +158,7 @@ Get all indicators for a VNF instance with invalid filter
     Log    This resource represents VNF indicators related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}?${NEG_FIELDS}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}?${NEG_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -166,7 +166,7 @@ Get all indicators for a VNF instance with invalid resource identifier
     Log    Trying to perform a negative get, using wrong identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${erroneousVnfInstanceId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${erroneousVnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -174,7 +174,7 @@ Send POST Request for indicators in VNF instance
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -182,7 +182,7 @@ Send PUT Request for indicators in VNF instance
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -190,7 +190,7 @@ Send PATCH Request for indicators in VNF instance
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
      
@@ -198,7 +198,7 @@ Send DELETE Request for indicators in VNF instance
     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": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -234,7 +234,7 @@ Check Postcondition Indicators for VNF instance Exist
     Log    Check Postcondition Indicators for VNF instance Exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
     Should Be Equal    ${response['status']}    200
     
 Check LINK in Header
diff --git a/SOL002/VNFIndicator-API/environment/variables.txt b/SOL002/VNFIndicator-API/environment/variables.txt
index 58dff1e61..22f32a1fb 100644
--- a/SOL002/VNFIndicator-API/environment/variables.txt
+++ b/SOL002/VNFIndicator-API/environment/variables.txt
@@ -12,7 +12,7 @@ ${EM-VNF_SCHEMA}    https
 ${ACCEPT_JSON}    application/json
 ${AUTH_USAGE}     1
 ${apiRoot}        /
-${apiVersion}     v1
+${apiMajorVersion}     v1
 ${apiName}        vnfind
 
 
-- 
GitLab


From ba41f1dcdce67a0af9ebec8a71f6393c555df757 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 14 Oct 2020 11:10:14 +0500
Subject: [PATCH 082/322] Revert "added majorApiVersion"

This reverts commit a61a6b846d7556d95b1aa5587535a2f1ad855ba1.
---
 SOL002/VNFIndicator-API/ApiVersion.robot      | 10 +++----
 .../IndividualSubscription.robot              | 18 ++++++-------
 .../IndividualVNFindicator.robot              | 26 +++++++++----------
 SOL002/VNFIndicator-API/Subscriptions.robot   | 18 ++++++-------
 SOL002/VNFIndicator-API/VNFIndicators.robot   | 22 ++++++++--------
 .../VnfIndicatorsInVnfInstanceId.robot        | 18 ++++++-------
 .../environment/variables.txt                 |  2 +-
 7 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/SOL002/VNFIndicator-API/ApiVersion.robot b/SOL002/VNFIndicator-API/ApiVersion.robot
index 934cc24ef..fce69405c 100644
--- a/SOL002/VNFIndicator-API/ApiVersion.robot
+++ b/SOL002/VNFIndicator-API/ApiVersion.robot
@@ -169,35 +169,35 @@ DELETE API Version
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
+    Post    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
+    Get    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
+    Put    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
+    Patch    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
+    Delete    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 
diff --git a/SOL002/VNFIndicator-API/IndividualSubscription.robot b/SOL002/VNFIndicator-API/IndividualSubscription.robot
index 01eb68eff..16de0847e 100644
--- a/SOL002/VNFIndicator-API/IndividualSubscription.robot
+++ b/SOL002/VNFIndicator-API/IndividualSubscription.robot
@@ -102,7 +102,7 @@ Get Individual VNF Indicator Subscription
     Log    Trying to get a given subscription identified by subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -110,7 +110,7 @@ GET Individual VNF Indicator Subscription with invalid resource identifier
     Log    Trying to perform a request on a subscriptionID which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -118,7 +118,7 @@ Send Delete Request for Individual VNF Indicator Subscription
     Log    Trying to perform a DELETE on a subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -126,14 +126,14 @@ Send Delete Request for Individual VNF Indicator Subscription with invalid resou
     Log    Trying to perform a DELETE on a subscriptionId which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
+    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Send Post Request for Individual VNF Indicator Subscription
     Log    Trying to create a new subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
+    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
 
@@ -141,20 +141,20 @@ Send Put Request for Individual VNF Indicator Subscription
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    PUT    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
 
 Send Patch Request for Individual VNF Indicator Subscription
     Log    Trying to create a new subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    PATCH    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
diff --git a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
index 87ff57f43..f4cecd713 100644
--- a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
+++ b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
@@ -163,7 +163,7 @@ Get Individual Indicator for a VNF instance
     Log    This resource represents a VNF indicator related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -171,7 +171,7 @@ Get Individual Indicator for a VNF instance with invalid indicator identifier
     Log    Trying to perform a negative get, using wrong identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${erroneousIndicatorId}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${erroneousIndicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -179,7 +179,7 @@ Send POST Request for individual indicator in VNF instance
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${notAllowedIndicatorId}
+    POST    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${notAllowedIndicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -187,7 +187,7 @@ Send PUT Request for individual indicator in VNF instance
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
+    PUT    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -195,7 +195,7 @@ Send PATCH Request for individual indicator in VNF instance
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
+    PATCH    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
      
@@ -203,7 +203,7 @@ Send DELETE Request for individual indicator in VNF instance
     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": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
+    DELETE    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -244,7 +244,7 @@ Get Individual Indicator
     Log    This resource represents a VNF indicator related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${indicatorId}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -252,7 +252,7 @@ Get Individual Indicator with invalid indicator identifier
     Log    Trying to perform a negative get, using wrong identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${erroneousIndicatorId}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${erroneousIndicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -260,7 +260,7 @@ Send POST Request for individual indicator
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${notAllowedIndicatorId}
+    POST    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${notAllowedIndicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -268,7 +268,7 @@ Send PUT Request for individual indicator
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${indicatorId}
+    PUT    ${apiRoot}/${apiName}/${apiVersion}/indicators/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -276,7 +276,7 @@ Send PATCH Request for individual indicator
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${indicatorId}
+    PATCH    ${apiRoot}/${apiName}/${apiVersion}/indicators/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -284,7 +284,7 @@ Send DELETE Request for individual indicator
     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": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${indicatorId}
+    DELETE    ${apiRoot}/${apiName}/${apiVersion}/indicators/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -292,5 +292,5 @@ Check PostCondition Individual Indicator exist
     Log    This resource represents a VNF indicator related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}
     Integer    response status    200	
\ No newline at end of file
diff --git a/SOL002/VNFIndicator-API/Subscriptions.robot b/SOL002/VNFIndicator-API/Subscriptions.robot
index 1ed601330..fd458fbb6 100644
--- a/SOL002/VNFIndicator-API/Subscriptions.robot
+++ b/SOL002/VNFIndicator-API/Subscriptions.robot
@@ -146,7 +146,7 @@ Get VNF Indicators Subscriptions
     Log    Trying to get the list of subscriptions
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -154,7 +154,7 @@ Get VNF Indicators Subscriptions with filter
     Log    Trying to get the list of subscriptions using filters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${POS_FILTER}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${POS_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -162,7 +162,7 @@ Get VNF Indicators Subscriptions with invalid filter
     Log    Trying to get the list of subscriptions using filters with wrong attribute name
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${NEG_FILTER}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${NEG_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
     
@@ -170,7 +170,7 @@ Get VNF Indicators Subscriptions with invalid resource endpoint
         Log    Trying to perform a request on a Uri which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscription
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
 
@@ -180,7 +180,7 @@ Send Post Request for VNF Indicator Subscription
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${body}=    Get File    jsons/subscriptions.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
+    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}  
     Run Keyword If    ${VNFM_CHECKS_NOTIF_ENDPOINT} == 1
@@ -190,7 +190,7 @@ Send Put Request for VNF Indicator Subscriptions
     Log    Trying to create a new subscription
     ${body}=    Get File    jsons/subscriptions.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+    PUT    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -198,7 +198,7 @@ Send Patch Request for VNF Indicator Subscriptions
     Log    Trying to create a new subscription
     ${body}=    Get File    jsons/subscriptions.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+    PATCH    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -206,7 +206,7 @@ Send Delete Request for VNF Indicator Subscriptions
     Log    Trying to create a new subscription
     ${body}=    Get File    jsons/subscriptions.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -240,7 +240,7 @@ Check Postcondition VNF Indicator Subscription Is Set
     Log    Trying to get the subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
diff --git a/SOL002/VNFIndicator-API/VNFIndicators.robot b/SOL002/VNFIndicator-API/VNFIndicators.robot
index 0b05ea627..bc6dbd9c9 100644
--- a/SOL002/VNFIndicator-API/VNFIndicators.robot
+++ b/SOL002/VNFIndicator-API/VNFIndicators.robot
@@ -177,7 +177,7 @@ Get all VNF indicators
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
+    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -186,7 +186,7 @@ Get VNF indicators with filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators?${POS_FIELDS}
+    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators?${POS_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -195,7 +195,7 @@ Get VNF indicators with invalid filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators?${NEG_FIELDS}
+    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators?${NEG_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -205,7 +205,7 @@ Get all VNF indicators with malformed authorization token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Authorization": "${BAD_AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
+    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -215,7 +215,7 @@ Get all VNF indicators with expired or revoked authorization token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Authorization": "${NEG_AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
+    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -224,7 +224,7 @@ Get all VNF indicators without authorization token
     Log    The GET method queries multiple VNF indicators omitting token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
+    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -233,7 +233,7 @@ Get all VNF indicators with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicator
+    Get    ${apiRoot}/${apiName}/${apiVersion}/indicator
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -241,7 +241,7 @@ Send POST Request for all VNF indicators
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
+    Post    ${apiRoot}/${apiName}/${apiVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -249,7 +249,7 @@ Send PUT Request for all VNF indicators
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
+    Post    ${apiRoot}/${apiName}/${apiVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -257,7 +257,7 @@ Send PATCH Request for all VNF indicators
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
+    Post    ${apiRoot}/${apiName}/${apiVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -265,7 +265,7 @@ Send DELETE Request for all VNF indicators
     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":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
+    Post    ${apiRoot}/${apiName}/${apiVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
diff --git a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
index df5458c16..11f83e45b 100644
--- a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
+++ b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
@@ -142,7 +142,7 @@ Get all indicators for a VNF instance
     Log    This resource represents VNF indicators related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -150,7 +150,7 @@ Get all indicators for a VNF instance with filter
     Log    This resource represents VNF indicators related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}?${POS_FIELDS}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}?${POS_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
        
@@ -158,7 +158,7 @@ Get all indicators for a VNF instance with invalid filter
     Log    This resource represents VNF indicators related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}?${NEG_FIELDS}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}?${NEG_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -166,7 +166,7 @@ Get all indicators for a VNF instance with invalid resource identifier
     Log    Trying to perform a negative get, using wrong identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${erroneousVnfInstanceId}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${erroneousVnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -174,7 +174,7 @@ Send POST Request for indicators in VNF instance
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
+    POST    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -182,7 +182,7 @@ Send PUT Request for indicators in VNF instance
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
+    PUT    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -190,7 +190,7 @@ Send PATCH Request for indicators in VNF instance
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
+    PATCH    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
      
@@ -198,7 +198,7 @@ Send DELETE Request for indicators in VNF instance
     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": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
+    DELETE    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -234,7 +234,7 @@ Check Postcondition Indicators for VNF instance Exist
     Log    Check Postcondition Indicators for VNF instance Exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
     Should Be Equal    ${response['status']}    200
     
 Check LINK in Header
diff --git a/SOL002/VNFIndicator-API/environment/variables.txt b/SOL002/VNFIndicator-API/environment/variables.txt
index 22f32a1fb..58dff1e61 100644
--- a/SOL002/VNFIndicator-API/environment/variables.txt
+++ b/SOL002/VNFIndicator-API/environment/variables.txt
@@ -12,7 +12,7 @@ ${EM-VNF_SCHEMA}    https
 ${ACCEPT_JSON}    application/json
 ${AUTH_USAGE}     1
 ${apiRoot}        /
-${apiMajorVersion}     v1
+${apiVersion}     v1
 ${apiName}        vnfind
 
 
-- 
GitLab


From 8d895f6901b876563170f71a87cc297cc606e563 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 14 Oct 2020 11:12:37 +0500
Subject: [PATCH 083/322] added majorApiVersion and remove issues

---
 SOL003/VNFIndicator-API/ApiVersion.robot      | 10 +--
 .../VNFIndicatorsKeywords.robot               | 90 +++++++++----------
 .../environment/variables.txt                 |  2 +-
 3 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/SOL003/VNFIndicator-API/ApiVersion.robot b/SOL003/VNFIndicator-API/ApiVersion.robot
index 856e31ed0..7dfc38510 100644
--- a/SOL003/VNFIndicator-API/ApiVersion.robot
+++ b/SOL003/VNFIndicator-API/ApiVersion.robot
@@ -169,35 +169,35 @@ DELETE API Version
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/v1/api_version
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/v1/api_version
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/v1/api_version
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/v1/api_version
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/v1/api_version
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
diff --git a/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot b/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
index bc3c1d00d..d39f925d5 100644
--- a/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
+++ b/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
@@ -20,7 +20,7 @@ Get All VNF Indicators Subscriptions
     Log    Trying to get the list of subscriptions
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     # Integer    response status    200
@@ -36,7 +36,7 @@ Get VNF Indicators Subscriptions with filter
     Log    Trying to get the list of subscriptions using filters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ok}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ok}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     # Integer    response status    200
@@ -52,7 +52,7 @@ Get VNF Indicators Subscriptions with invalid filter
     Log    Trying to get the list of subscriptions using filters with wrong attribute name
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ko}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ko}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     # Integer    response status    400
@@ -69,7 +69,7 @@ Get VNF Indicators Subscriptions with invalid resource endpoint
     Log    Trying to perform a request on a Uri which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscription
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     # Integer    response status    404
@@ -86,7 +86,7 @@ Get VNF Indicators Subscriptions with invalid authentication token
     Log    Trying to perform a negative get, using wrong authorization bearer
     Pass Execution If    ${AUTH_USAGE} == 0    Skipping test as VNFM is not supporting authentication
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     # Integer    response status    401
@@ -106,7 +106,7 @@ Send Post Request for VNF Indicator Subscription
     ${template}=    Get File    jsons/subscriptions.json
     ${body}=        Format String   ${template}     callback=${callback}    {callback_subscribe}=${callback_subscribe}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Run Keyword If    ${VNFM_CHECKS_NOTIF_ENDPOINT} == 1
@@ -129,7 +129,7 @@ Send Post Request for Duplicated VNF indicator Subscription
      ${template}=    Get File    jsons/subscriptions.json
     ${body}=        Format String   ${template}     callback=${callback}    {callback_subscribe}=${callback_subscribe}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     # Integer    response status    201
@@ -146,7 +146,7 @@ Send Put Request for VNF Indicator Subscriptions
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -155,7 +155,7 @@ Send Patch Request for VNF Indicator Subscriptions
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -164,7 +164,7 @@ Send Delete Request for VNF Indicator Subscriptions
     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": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -201,7 +201,7 @@ Check Postcondition VNF Indicator Subscription Is Set
     Log    Trying to get the subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    Run Keyword If    Should Not Be Equal As Strings    ${location}    Location   GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${response['body']['id']}
+    Run Keyword If    Should Not Be Equal As Strings    ${location}    Location   GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
     Run Keyword If    Should Be Equal As Strings    ${location}    Location   GET    ${response['headers']['Location']}  
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -232,7 +232,7 @@ Get all VNF indicators
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Set Suite Variable    ${vnfIndicators}    ${response['body']}
@@ -242,7 +242,7 @@ Get VNF indicators with filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators?${POS_FIELDS}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators?${POS_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -251,7 +251,7 @@ Get VNF indicators with invalid filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators?${NEG_FIELDS}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators?${NEG_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -261,7 +261,7 @@ Get all VNF indicators with malformed authorization token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Authorization": "${BAD_AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -271,7 +271,7 @@ Get all VNF indicators with expired or revoked authorization token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Authorization": "${NEG_AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -280,7 +280,7 @@ Get all VNF indicators without authorization token
     Log    The GET method queries multiple VNF indicators omitting token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -289,7 +289,7 @@ Get all VNF indicators with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -297,7 +297,7 @@ Send POST Request for all VNF indicators
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/indicators
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -305,7 +305,7 @@ Send PUT Request for all VNF indicators
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/indicators
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -313,7 +313,7 @@ Send PATCH Request for all VNF indicators
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/indicators
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -321,7 +321,7 @@ Send DELETE Request for all VNF indicators
     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":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/indicators
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -341,7 +341,7 @@ Get all indicators for a VNF instance
     Log    This resource represents VNF indicators related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -349,7 +349,7 @@ Get all indicators for a VNF instance with filter
     Log    This resource represents VNF indicators related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}?${POS_FIELDS}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}?${POS_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
        
@@ -357,7 +357,7 @@ Get all indicators for a VNF instance with invalid filter
     Log    This resource represents VNF indicators related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}?${NEG_FIELDS}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}?${NEG_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -365,7 +365,7 @@ Get all indicators for a VNF instance with invalid resource identifier
     Log    Trying to perform a negative get, using wrong identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${erroneousVnfInstanceId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${erroneousVnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -373,7 +373,7 @@ Send POST Request for indicators in VNF instance
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -381,7 +381,7 @@ Send PUT Request for indicators in VNF instance
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -389,7 +389,7 @@ Send PATCH Request for indicators in VNF instance
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
      
@@ -397,7 +397,7 @@ Send DELETE Request for indicators in VNF instance
     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": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -409,7 +409,7 @@ Get Individual Indicator for a VNF instance
     Log    This resource represents a VNF indicator related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -417,7 +417,7 @@ Get Individual Indicator for a VNF instance with invalid indicator identifier
     Log    Trying to perform a negative get, using wrong identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${erroneousIndicatorId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${erroneousIndicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -425,7 +425,7 @@ Send POST Request for individual indicator in VNF instance
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${notAllowedIndicatorId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${notAllowedIndicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -433,7 +433,7 @@ Send PUT Request for individual indicator in VNF instance
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -441,7 +441,7 @@ Send PATCH Request for individual indicator in VNF instance
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
      
@@ -449,7 +449,7 @@ Send DELETE Request for individual indicator in VNF instance
     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": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -471,7 +471,7 @@ GET Individual VNF Indicator Subscription
     Log    Trying to get a given subscription identified by subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -479,7 +479,7 @@ GET Individual VNF Indicator Subscription with invalid resource identifier
     Log    Trying to perform a request on a subscriptionID which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -487,7 +487,7 @@ Send Delete Request for Individual VNF Indicator Subscription
     Log    Trying to perform a DELETE on a subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -495,14 +495,14 @@ Send Delete Request for Individual VNF Indicator Subscription with invalid resou
     Log    Trying to perform a DELETE on a subscriptionId which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Send Post Request for Individual VNF Indicator Subscription
     Log    Trying to create a new subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
 
@@ -510,20 +510,20 @@ Send Put Request for Individual VNF Indicator Subscription
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
 
 Send Patch Request for Individual VNF Indicator Subscription
     Log    Trying to create a new subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
diff --git a/SOL003/VNFIndicator-API/environment/variables.txt b/SOL003/VNFIndicator-API/environment/variables.txt
index cc906c8a3..6cc6ab92c 100644
--- a/SOL003/VNFIndicator-API/environment/variables.txt
+++ b/SOL003/VNFIndicator-API/environment/variables.txt
@@ -11,7 +11,7 @@ ${AUTH_USAGE}     1
 ${CONTENT_TYPE_JSON}    application/json
 
 ${apiRoot}        /
-${apiVersion}     v1
+${apiMajorVersion}     v1
 ${apiName}        vnfind
 
 ${VNFM_CHECKS_NOTIF_ENDPOINT}    1        ## If true, during subscription, the FUT performs a get to the notification endpoint
-- 
GitLab


From 55c5c94ef1919339149deadff47a229cc6e9df0d Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 14 Oct 2020 11:35:37 +0500
Subject: [PATCH 084/322] added majorApiVersion

---
 .../ApiVersion.robot                          | 10 ++++-----
 .../Grants.robot                              | 22 +++++++++----------
 .../IndividualGrant.robot                     | 12 +++++-----
 .../environment/variables.txt                 |  2 +-
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/SOL003/VNFLifecycleOperationGranting-API/ApiVersion.robot b/SOL003/VNFLifecycleOperationGranting-API/ApiVersion.robot
index 6821a6e18..273a3d326 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/ApiVersion.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/ApiVersion.robot
@@ -169,35 +169,35 @@ DELETE API Version
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/v1/api_version
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/v1/api_version
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/v1/api_version
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/v1/api_version
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/v1/api_version
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
diff --git a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
index b03e19a80..4f9ce5172 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
@@ -109,38 +109,38 @@ DELETE Grants - Method not implemented
 Wait for individual grant successful notification
     Wait Until Keyword Succeeds    ${retry}   ${polling}    Get an individual grant - Successful
 Send Request Grant Request in Synchronous mode
-    Log    Request a new Grant for a VNF LCM operation by POST to ${apiRoot}/${apiName}/${apiVersion}/grants
+    Log    Request a new Grant for a VNF LCM operation by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/grants
     Pass Execution If    ${SYNC_MODE} == 0    The Granting process is asynchronous mode. Skipping the test
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/grantRequest.json
     ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${vnfdId}    flavourId=${flavourId}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/grants    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/grants    ${body}
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
     
 Send Request Grant Request in Asynchronous mode
-    Log    Request a new Grant for a VNF LCM operation by POST to ${apiRoot}/${apiName}/${apiVersion}/grants
+    Log    Request a new Grant for a VNF LCM operation by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/grants
     Pass Execution If    ${SYNC_MODE} == 1    The Granting process is synchronous mode. Skipping the test
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/grantRequest.json
     ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${vnfdId}    flavourId=${flavourId}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/grants    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/grants    ${body}
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
     
 Send Request for a new Grant Forbiden Operation   
-    Log    Request a new Grant for a VNF LCM operation by POST to ${apiRoot}/${apiName}/${apiVersion}/grants
+    Log    Request a new Grant for a VNF LCM operation by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/grants
     Log    The grant request should be rejected
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/grantRejectedRequest.json
     ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${vnfdId}    flavourId=${flavourId}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/grants    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/grants    ${body}
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
    
@@ -150,7 +150,7 @@ Send Request Grant Request
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/grantRequest.json
     ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${vnfdId}    flavourId=${flavourId}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/grants    ${body}    allow_redirects=false
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/grants    ${body}    allow_redirects=false
     ${resp}    Output    response
     ${result}=    evaluate    json.loads(json.dumps(${resp}))    json
     Log  ${result}
@@ -187,7 +187,7 @@ Get Grants
     Log    Trying to perform a GET. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/grants
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/grants
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
     
@@ -195,7 +195,7 @@ Put Grants
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/grants
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/grants
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
     
@@ -203,7 +203,7 @@ Patch Grants
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/grants
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/grants
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
     
@@ -212,7 +212,7 @@ Delete Grants
     Log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/grants
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/grants
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
     
diff --git a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
index da4150f8b..52b961997 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
@@ -103,14 +103,14 @@ Get individual grant
     log    Trying to read an individual grant
     Set Headers    {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/grants/${grantId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/grants/${grantId}
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
     
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
     Integer    response status    200
     
 Post individual Grant
@@ -118,7 +118,7 @@ Post individual Grant
     Pass Execution If    ${SYNC_MODE} == 1   Skipping. Synchronous mode is supported    
     Set Headers    {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/grants/${grantId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/grants/${grantId}
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
     
@@ -126,7 +126,7 @@ Put individual Grant
     Log    Trying to perform a GET. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/grants/${grantId}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/grants/${grantId}
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
     
@@ -134,7 +134,7 @@ Patch individual Grant
     Log    Trying to perform a GET. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/grants/${grantId}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/grants/${grantId}
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
     
@@ -142,7 +142,7 @@ Delete individual Grant
     Log    Trying to perform a GET. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/grants/${grantId}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/grants/${grantId}
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
     
diff --git a/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt b/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
index 39e005a4d..8ba38cb43 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
+++ b/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
@@ -10,7 +10,7 @@ ${grantId}    6fc3539c-e602-4afa-8e13-962fb5a7d81d
 
 ${apiRoot}        /
 ${apiName}        grant
-${apiVersion}     v1
+${apiMajorVersion}     v1
 
 ${SYNC_MODE}    1
 
-- 
GitLab


From 00163ee7bf88388ce47a9420e3f4ede021542f64 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 14 Oct 2020 11:40:29 +0500
Subject: [PATCH 085/322] added majorApiVersion and minor bugs fixed

---
 .../VNFPackageManagement-API/ApiVersion.robot |  10 +-
 .../VNFPackageManagementKeywords.robot        | 326 +++++++++---------
 .../VNFPackages.robot                         |   4 +-
 .../environment/variables.txt                 |   2 +-
 4 files changed, 171 insertions(+), 171 deletions(-)

diff --git a/SOL003/VNFPackageManagement-API/ApiVersion.robot b/SOL003/VNFPackageManagement-API/ApiVersion.robot
index 79cf0157a..66e4aeffc 100644
--- a/SOL003/VNFPackageManagement-API/ApiVersion.robot
+++ b/SOL003/VNFPackageManagement-API/ApiVersion.robot
@@ -169,35 +169,35 @@ DELETE API Version
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/v1/api_version
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/v1/api_version
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/v1/api_version
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/v1/api_version
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/v1/api_version
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 96beb3dd2..1cbc4b7a7 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -23,7 +23,7 @@ Get all VNF Packages
     Log    Trying to get all VNF Packages present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
 
@@ -49,7 +49,7 @@ GET VNF Packages with attribute-based filter
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages?${POS_FILTER}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?${POS_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -64,7 +64,7 @@ GET VNF Packages with invalid attribute-based filter
     Log    Trying to perform a negative get, filtering by the inexistent filter 'nfvId'
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages?${NEG_FILTER}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?${NEG_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -72,7 +72,7 @@ GET VNF Packages with all_fields attribute selector
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages?all_fields
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?all_fields
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
    
@@ -93,7 +93,7 @@ GET VNF Packages with exclude_default attribute selector
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using exclude_default filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages?exclude_default   
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?exclude_default   
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -112,7 +112,7 @@ GET VNF Packages with fields attribute selector
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages?fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -131,7 +131,7 @@ GET VNF Packages with fields and exclude_default attribute selector
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages?fields=${fields}&exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?fields=${fields}&exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -150,7 +150,7 @@ GET VNF Packages with exclude_fields attribute selector
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages?exclude_fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -168,7 +168,7 @@ GET all VNF Packages with invalid resource endpoint
     Log    Trying to perform a GET on a erroneous URI
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_package
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_package
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -176,7 +176,7 @@ Send POST Request for all VNF Packages
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -184,7 +184,7 @@ Send PUT Request for all VNF Packages
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -192,7 +192,7 @@ Send PATCH Request for all VNF Packages
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -200,7 +200,7 @@ Send DELETE Request for all VNF Packages
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -208,7 +208,7 @@ GET Individual VNF Package
     Log    Trying to get a VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -221,7 +221,7 @@ GET Individual VNF Package with invalid resource identifier
     Log    Trying to perform a negative get, using wrong authorization bearer
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${erroneousVnfPackageId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -229,7 +229,7 @@ Send POST Request for individual VNF Package
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -237,7 +237,7 @@ Send PUT Request for individual VNF Package
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
@@ -245,7 +245,7 @@ Send PATCH Request for individual VNF Package
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -253,7 +253,7 @@ Send DELETE Request for individual VNF Package
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -261,7 +261,7 @@ GET Individual VNF Package Content
     Log    Trying to get a VNF Package Content
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/package_content
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -275,7 +275,7 @@ GET Individual VNF Package Content with Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/package_content
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -297,7 +297,7 @@ GET Individual VNF Package Content with invalid Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/package_content
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -305,7 +305,7 @@ GET Individual VNF Package Content with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${erroneousVnfPkgId}/package_content
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -313,7 +313,7 @@ GET Content for VNF Package in onboarding state different from ONBOARDED
     Log    Trying to get a VNF Package content present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${onboardingStateVnfPkgId}/package_content
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -321,7 +321,7 @@ Send POST Request for individual VNF Package Content
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/package_content
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -329,7 +329,7 @@ Send PUT Request for individual VNF Package Content
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/package_content
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
@@ -337,7 +337,7 @@ Send PATCH Request for individual VNF Package Content
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/package_content
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -345,7 +345,7 @@ Send DELETE Request for individual VNF Package Content
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/package_content
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -353,7 +353,7 @@ Get all VNF Package Subscriptions
     Log    Trying to get the list of subscriptions
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -361,7 +361,7 @@ Get VNF Package Subscriptions with attribute-based filters
     Log    Trying to get the list of subscriptions using filters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ok}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ok}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}    
 
@@ -369,7 +369,7 @@ Get VNF Package Subscriptions with invalid attribute-based filters
     Log    Trying to get the list of subscriptions using filters with wrong attribute name
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ko}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ko}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -377,7 +377,7 @@ Get VNF Package Subscriptions with invalid resource endpoint
     Log    Trying to perform a request on a Uri which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscription
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -388,7 +388,7 @@ Send Post Request for VNF Package Subscription
     ${template}=    Get File    jsons/subscriptions.json
     ${body}=        Format String   ${template}    callbackUri=${callbackUri} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1
@@ -401,7 +401,7 @@ Send Post Request for Duplicated VNF Package Subscription
     ${template}=    Get File    jsons/subscriptions.json
     ${body}=        Format String   ${template}    callbackUri=${callbackUri} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -409,7 +409,7 @@ Send Put Request for VNF Package Subscriptions
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -417,7 +417,7 @@ Send Patch Request for VNF Package Subscriptions
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -425,7 +425,7 @@ Send Delete Request for VNF Package Subscriptions
     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": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}    
 
@@ -433,7 +433,7 @@ Get single file VNFD in Individual VNF Package in Plain Format
     Log    Trying to get a VNFD from a given VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgPlainVNFD}/vnfd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgPlainVNFD}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -441,7 +441,7 @@ Get VNFD in Individual VNF Package in Zip Format
     Log    Trying to get a VNFD from a given VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -450,7 +450,7 @@ Get single file VNFD in Individual VNF Package in Plain or Zip Format
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgPlainVNFD}/vnfd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgPlainVNFD}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -459,7 +459,7 @@ Get multi file VNFD in Individual VNF Package in Plain or Zip Format
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -471,7 +471,7 @@ Get multi file VNFD in Individual VNF Package in Plain Format
     Log    Trying to get a negative case performing a get on a VNFD from a given VNF Package present in the NFVO Catalogue. Accept will be text/plain but VNFD is composed my multiple files.
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -480,7 +480,7 @@ Get VNFD in Individual VNF Package with invalid resource identifier
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${erroneousVnfPkgId}/vnfd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -489,7 +489,7 @@ Get VNFD in Individual VNF Package Content with conflict due to onboarding state
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${onboardingStateVnfPkgId}/vnfd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -497,7 +497,7 @@ Send POST Request for VNFD in individual VNF Package
     Log    Trying to perform a POST. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/vnfd
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -505,7 +505,7 @@ Send PUT Request for VNFD in individual VNF Package
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/vnfd
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -513,7 +513,7 @@ Send PATCH Request for VNFD in individual VNF Package
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/vnfd
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -521,21 +521,21 @@ Send DELETE Request for VNFD in individual VNF Package
     Log    Trying to perform a DELETE. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
 GET Individual VNF Package Artifact
     Log    Trying to get a VNF Package Artifact
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 GET Individual VNF Package Artifact in octet stream format  
     Log    Trying to get a VNF Package Artifact
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageOctetStreamId}/artifacts/${artifactPath}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageOctetStreamId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -544,7 +544,7 @@ GET Individual VNF Package Artifact with Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -554,21 +554,21 @@ GET Individual VNF Package Artifact with invalid Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
 GET Individual VNF Package Artifact with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${erroneousVnfPkgId}/artifacts/${artifactPath}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 GET Artifact for VNF Package in onboarding state different from ONBOARDED
     Log    Trying to get a VNF Package artifact present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${onboardingStateVnfPkgId}/artifacts/${artifactPath}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -576,7 +576,7 @@ Send POST Request for individual VNF Package Artifact
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -584,7 +584,7 @@ Send PUT Request for individual VNF Package Artifact
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
@@ -592,7 +592,7 @@ Send PATCH Request for individual VNF Package Artifact
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -600,7 +600,7 @@ Send DELETE Request for individual VNF Package Artifact
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -642,7 +642,7 @@ Check Postcondition VNF Package Subscription Is Set
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Run Keyword If    ${location} == Location
-    ...    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${response['body']['id']}
+    ...    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
     Run Keyword If    ${location} == Location
     ...    GET    ${response['headers']['Location']}  
     ${output}=    Output    response
@@ -669,7 +669,7 @@ Get Individual VNF Package Subscription
     Log    Trying to get a single subscription identified by subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -677,7 +677,7 @@ GET individual VNF Package Subscription with invalid resource identifier
     Log    Trying to perform a request on a subscriptionID which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -685,7 +685,7 @@ Send Delete request for individual VNF Package Subscription
     Log    Trying to perform a DELETE on a subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -693,31 +693,31 @@ Send Delete request for individual VNF Package Subscription with invalid resourc
     Log    Trying to perform a DELETE on a subscriptionId which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual VNF Package Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${newSubscriptionId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for individual VNF Package Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Send Patch request for individual VNF Package Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -752,7 +752,7 @@ Get all OnBoarded VNF Packages
     Log    Trying to get all OnBoarded VNF Packages present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -760,7 +760,7 @@ GET OnBoarded VNF Packages with attribute-based filter
     Log    Trying to get all OnBoarded VNF Packages present in the NFVO Catalogue, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages?${POS_FILTER}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages?${POS_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -768,7 +768,7 @@ GET OnBoarded VNF Packages with invalid attribute-based filter
     Log    Trying to perform a negative get, filtering by the inexistent filter 'nfvId'
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages?${NEG_FILTER}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages?${NEG_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -776,7 +776,7 @@ GET OnBoarded VNF Packages with all_fields attribute selector
     Log    Trying to get all OnBoarded VNF Packages present in the NFVO Catalogue, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages?all_fields
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages?all_fields
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -784,7 +784,7 @@ GET OnBoarded VNF Packages with exclude_default attribute selector
     Log    Trying to get all OnBoarded VNF Packages present in the NFVO Catalogue, using exclude_default filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages?exclude_default   
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages?exclude_default   
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -793,7 +793,7 @@ GET OnBoarded VNF Packages with fields attribute selector
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages?fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -802,7 +802,7 @@ GET OnBoarded VNF Packages with exclude_fields attribute selector
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages?exclude_fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -810,7 +810,7 @@ GET OnBoarded all VNF Packages with invalid resource endpoint
     Log    Trying to perform a GET on a erroneous URI
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_package
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_package
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -818,7 +818,7 @@ Send OnBoarded POST Request for all VNF Packages
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -826,7 +826,7 @@ Send OnBoarded PUT Request for all VNF Packages
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -834,7 +834,7 @@ Send OnBoarded PATCH Request for all VNF Packages
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -842,7 +842,7 @@ Send OnBoarded DELETE Request for all VNF Packages
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -850,7 +850,7 @@ GET Individual OnBoarded VNF Package
     Log    Trying to get a OnBoarded VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -858,7 +858,7 @@ GET Individual OnBoarded VNF Package with invalid resource identifier
     Log    Trying to perform a negative get, using wrong authorization bearer
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${erroneousVnfdId} 
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${erroneousVnfdId} 
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -866,7 +866,7 @@ Send POST Request for individual OnBoarded VNF Package
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -874,7 +874,7 @@ Send PUT Request for individual OnBoarded VNF Package
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
@@ -882,7 +882,7 @@ Send PATCH Request for individual OnBoarded VNF Package
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -890,7 +890,7 @@ Send DELETE Request for individual OnBoarded VNF Package
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -898,7 +898,7 @@ Get single file VNFD in Individual OnBoarded VNF Package in Plain Format
     Log    Trying to get a VNFD from a given OnBoarded VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/vnfd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -906,7 +906,7 @@ Get VNFD in Individual OnBoarded VNF Package in Zip Format
     Log    Trying to get a VNFD from a given OnBoarded VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/vnfd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -915,7 +915,7 @@ Get single file VNFD in Individual OnBoarded VNF Package in Plain or Zip Format
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/vnfd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -924,7 +924,7 @@ Get multi file VNFD in Individual OnBoarded VNF Package in Plain or Zip Format
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/vnfd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -932,7 +932,7 @@ Get multi file VNFD in Individual OnBoarded VNF Package in Plain Format
     Log    Trying to get a negative case performing a get on a VNFD from a given VNF Package present in the NFVO Catalogue. Accept will be text/plain but VNFD is composed my multiple files.
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndIdZipVnfd}/vnfd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndIdZipVnfd}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -941,7 +941,7 @@ Get VNFD in Individual OnBoarded VNF Package with invalid resource identifier
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${erroneousVnfdId}/vnfd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${erroneousVnfdId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -950,7 +950,7 @@ Get VNFD in Individual OnBoarded VNF Package Content with conflict due to onboar
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${onboardingStateVnfdId}/vnfd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${onboardingStateVnfdId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -958,7 +958,7 @@ Send POST Request for VNFD in individual OnBoarded VNF Package
     Log    Trying to perform a POST. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/vnfd
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -966,7 +966,7 @@ Send PUT Request for VNFD in individual OnBoarded VNF Package
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/vnfd
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -974,7 +974,7 @@ Send PATCH Request for VNFD in individual OnBoarded VNF Package
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/vnfd
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -982,7 +982,7 @@ Send DELETE Request for VNFD in individual OnBoarded VNF Package
     Log    Trying to perform a DELETE. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndIdZipVnfd}/vnfd
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndIdZipVnfd}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -990,7 +990,7 @@ GET Individual OnBoarded VNF Package Content
     Log    Trying to get a VNF Package Content
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/package_content
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1000,7 +1000,7 @@ GET Individual OnBoarded VNF Package Content with Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/package_content
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1010,7 +1010,7 @@ GET Individual OnBoarded VNF Package Content with invalid Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/package_content
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1018,7 +1018,7 @@ GET Individual OnBoarded VNF Package Content with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${erroneousVnfdId}/package_content
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${erroneousVnfdId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1026,21 +1026,21 @@ GET Content for OnBoarded VNF Package in onboarding state different from ONBOARD
     Log    Trying to get a VNF Package content present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${onboardingStateVnfdId}/package_content
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${onboardingStateVnfdId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 GET Individual OnBoarded VNF Package Artifact
     Log    Trying to get a VNF Package Artifact
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 GET Individual OnBoarded VNF Package Artifact in octet stream format  
     Log    Trying to get a VNF Package Artifact
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfdOctetStreamId}/artifacts/${artifactPath}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfdOctetStreamId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1049,7 +1049,7 @@ GET Individual OnBoarded VNF Package Artifact with Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1059,21 +1059,21 @@ GET Individual OnBoarded VNF Package Artifact with invalid Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
 GET Individual OnBoarded VNF Package Artifact with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${erroneousVnfdId}/artifacts/${artifactPath}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${erroneousVnfdId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 GET Artifact for OnBoarded VNF Package in onboarding state different from ONBOARDED
     Log    Trying to get a VNF Package artifact present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${onboardingStateVnfdId}/artifacts/${artifactPath}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${onboardingStateVnfdId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1081,7 +1081,7 @@ Send POST Request for individual OnBoarded VNF Package Artifact
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1089,7 +1089,7 @@ Send PUT Request for individual OnBoarded VNF Package Artifact
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
@@ -1097,7 +1097,7 @@ Send PATCH Request for individual OnBoarded VNF Package Artifact
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1105,7 +1105,7 @@ Send DELETE Request for individual OnBoarded VNF Package Artifact
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1114,7 +1114,7 @@ Get multi file VNFD in Individual OnBoarded VNF Package with security informatio
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/vnfd/include_signatures
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/vnfd/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1123,7 +1123,7 @@ Get multi file VNFD in Individual VNF Package with security information
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd/include_signatures
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1131,7 +1131,7 @@ GET Individual VNF Package Artifact with security information
     Log    Trying to get a VNF Package Artifact
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vndId}/artifacts/${artifactPath}/include_signatures
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vndId}/artifacts/${artifactPath}/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1139,21 +1139,21 @@ GET Individual OnBoarded VNF Package Artifact with security information
     Log    Trying to get a VNF Package Artifact
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}/include_signatures
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 GET Individual VNF Package Artifact with encrypted artifact
     Log    Trying to get a VNF Package Artifact
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vndEncryptedArtifactID}/artifacts/${artifactPath}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vndEncryptedArtifactID}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 GET Individual OnBoarded VNF Package Artifact with encrypted artifact
     Log    Trying to get a VNF Package Artifact
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndEncryptedArtifactID}/artifacts/${artifactPath}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndEncryptedArtifactID}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1161,7 +1161,7 @@ GET Individual VNF Package Artifact with incompatable header
     Log    Trying to get a VNF Package Artifact
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vndId}/artifacts/${artifactPath}/include_signatures
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vndId}/artifacts/${artifactPath}/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1169,7 +1169,7 @@ GET Individual OnBoarded VNF Package Artifact with incompatable header
     Log    Trying to get a VNF Package Artifact
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}/include_signatures
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1177,7 +1177,7 @@ Get Manifest in Individual VNF Package
     Log    Trying to get content of manifest file from a given VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/manifest
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1186,7 +1186,7 @@ Get Manifest in Individual VNF Package with security information
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/manifest/include_signatures
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/manifest/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1195,7 +1195,7 @@ Get Manifest in Individual VNF Package with conflict due to onboarding state
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${onboardingStateVnfPkgId}/manifest
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1203,7 +1203,7 @@ Send POST Request for Manifest in individual VNF Package
     Log    Trying to perform a POST. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/manifest
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1211,7 +1211,7 @@ Send PUT Request for Manifest in individual VNF Package
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/manifest
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -1219,7 +1219,7 @@ Send PATCH Request for Manifest in individual VNF Package
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/manifest
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1227,7 +1227,7 @@ Send DELETE Request for Manifest in individual VNF Package
     Log    Trying to perform a DELETE. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/manifest
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -1235,7 +1235,7 @@ Get Manifest in Individual OnBoarded VNF Package
     Log    Trying to get content of manifest file from a given OnBoarded VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/manifest
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1244,7 +1244,7 @@ Get Manifest in Individual OnBoarded VNF Package with security information
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndIdZipVnfd}/manifest/include_signatures
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndIdZipVnfd}/manifest/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1253,7 +1253,7 @@ Get Manifest in Individual OnBoarded VNF Package with conflict due to onboarding
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${onboardingStateVnfdId}/manifest
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${onboardingStateVnfdId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1261,7 +1261,7 @@ Send POST Request for Manifest in individual OnBoarded VNF Package
     Log    Trying to perform a POST. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/manifest
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1269,7 +1269,7 @@ Send PUT Request for Manifest in individual OnBoarded VNF Package
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/manifest
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -1277,7 +1277,7 @@ Send PATCH Request for Manifest in individual OnBoarded VNF Package
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/manifest
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1285,7 +1285,7 @@ Send DELETE Request for Manifest in individual OnBoarded VNF Package
     Log    Trying to perform a DELETE. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vndId}/manifest
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -1293,7 +1293,7 @@ Get Artifact in VNF Package
     Log    Trying to get Artifact in VNF Package
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1301,7 +1301,7 @@ Get Artifact in VNF Package with exclude_all_mano_artifacts parameter
     Log    Trying to get Artifact in VNF Package with exclude_all_mano_artifacts
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_mano_artifacts
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_mano_artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1309,7 +1309,7 @@ Get Artifact in VNF Package with exclude_all_non_mano_artifacts parameter
     Log    Trying to get Artifact in VNF Package with security certificates
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1318,7 +1318,7 @@ Get Artifact in VNF Package with select_non_mano_artifact_sets parameter
     Pass Execution If    ${NFVO_non-MANO_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/select_non_mano_artifact_sets=${non_mano_artifact_sets}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/select_non_mano_artifact_sets=${non_mano_artifact_sets}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1326,7 +1326,7 @@ Get Artifact in VNF Package with include_signatures parameter
     Log    Trying to get Artifact in VNF Package with security certificates
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/include_signatures
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1335,7 +1335,7 @@ Get Artifact in VNF Package with Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1343,7 +1343,7 @@ Get Artifact in VNF Package with exclude_all_non_mano_artifacts and select_non_m
     Log    Trying to get Artifact in VNF Package 
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&select_non_mano_artifact_sets=${non_mano_artifact_sets}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&select_non_mano_artifact_sets=${non_mano_artifact_sets}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1351,14 +1351,14 @@ Get Artifact in VNF Package with exclude_all_non_mano_artifacts and exclude_all_
     Log    Trying to get Artifact in VNF Package 
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&exclude_all_non_mano_artifacts
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&exclude_all_non_mano_artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 GET Artifact of VNF Package in onboarding state different from ONBOARDED
     Log    Trying to get a VNF Package artifact present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${onboardingStateVnfPkgId}/artifacts
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1368,7 +1368,7 @@ GET VNF Package Artifact with invalid Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1376,7 +1376,7 @@ Send POST Request for VNF Package Artifact
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1384,7 +1384,7 @@ Send PUT Request for VNF Package Artifact
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
@@ -1392,7 +1392,7 @@ Send PATCH Request for VNF Package Artifact
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1400,7 +1400,7 @@ Send DELETE Request for VNF Package Artifact
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
@@ -1408,7 +1408,7 @@ Get Artifact in OnBoarded VNF Package
     Log    Trying to get Artifact in OnBoarded VNF Package
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1416,7 +1416,7 @@ Get Artifact in OnBoarded VNF Package with exclude_all_mano_artifacts parameter
     Log    Trying to get Artifact in OnBoarded VNF Package with exclude_all_mano_artifacts
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts/exclude_all_mano_artifacts
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts/exclude_all_mano_artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1424,7 +1424,7 @@ Get Artifact in OnBoarded VNF Package with exclude_all_non_mano_artifacts parame
     Log    Trying to get Artifact in OnBoarded VNF Package with security certificates
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1433,7 +1433,7 @@ Get Artifact in OnBoarded VNF Package with select_non_mano_artifact_sets paramet
     Pass Execution If    ${NFVO_non-MANO_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts/select_non_mano_artifact_sets=${non_mano_artifact_sets}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts/select_non_mano_artifact_sets=${non_mano_artifact_sets}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1441,7 +1441,7 @@ Get Artifact in OnBoarded VNF Package with include_signatures parameter
     Log    Trying to get Artifact in OnBoarded VNF Package with security certificates
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts/include_signatures
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1450,7 +1450,7 @@ Get Artifact in OnBoarded VNF Package with Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1458,7 +1458,7 @@ Get Artifact in OnBoarded VNF Package with exclude_all_non_mano_artifacts and se
     Log    Trying to get Artifact in OnBoarded VNF Package 
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&select_non_mano_artifact_sets=${non_mano_artifact_sets}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&select_non_mano_artifact_sets=${non_mano_artifact_sets}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1466,14 +1466,14 @@ Get Artifact in OnBoarded VNF Package with exclude_all_non_mano_artifacts and ex
     Log    Trying to get Artifact in OnBoarded VNF Package 
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&exclude_all_non_mano_artifacts
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&exclude_all_non_mano_artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 GET Artifact of OnBoarded VNF Package in onboarding state different from ONBOARDED
     Log    Trying to get a OnBoarded VNF Package artifact present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${onboardingStateVnfPkgId}/artifacts
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${onboardingStateVnfPkgId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1483,7 +1483,7 @@ GET OnBoarded VNF Package Artifact with invalid Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1491,7 +1491,7 @@ Send POST Request for OnBoarded VNF Package Artifact
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1499,7 +1499,7 @@ Send PUT Request for OnBoarded VNF Package Artifact
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
@@ -1507,7 +1507,7 @@ Send PATCH Request for OnBoarded VNF Package Artifact
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1515,7 +1515,7 @@ Send DELETE Request for OnBoarded VNF Package Artifact
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1524,6 +1524,6 @@ GET OnBoarded VNF Packages with fields and exclude_default attribute selector
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/onboarded_vnf_packages?fields=${fields}&exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages?fields=${fields}&exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/VNFPackages.robot b/SOL003/VNFPackageManagement-API/VNFPackages.robot
index f910cbd3b..982c0eef9 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackages.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackages.robot
@@ -177,7 +177,7 @@ GET all VNF Packages as a Paged Response
     ...    Post-Conditions: none
     GET all VNF Packages
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contain Link
     
 GET VNF Packages - Bad Request Response too Big
     [Documentation]    Test ID: 7.3.3.1.14
@@ -362,7 +362,7 @@ GET all OnBoarded VNF Packages as a Paged Response
     ...    Post-Conditions: none
     Get all OnBoarded VNF Packages
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contain Link
     
 GET OnBoarded VNF Packages - Bad Request Response too Big
     [Documentation]    Test ID: 7.3.3.1.28
diff --git a/SOL003/VNFPackageManagement-API/environment/variables.txt b/SOL003/VNFPackageManagement-API/environment/variables.txt
index 3ee43c2d6..2639b8457 100644
--- a/SOL003/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL003/VNFPackageManagement-API/environment/variables.txt
@@ -15,7 +15,7 @@ ${onboardingStateVnfPkgId}    f9f130e4-05eb-4082-a676-4c97d13a883d
 ${onboardingStateVnfdId}    f9f130e4-05eb-4082-a676-4c97d13a883d  
 
 ${apiRoot}        /
-${apiVersion}     v1
+${apiMajorVersion}     v1
 ${apiName}        vnfpkgm
 
 ${NFVO_CHECKS_NOTIF_ENDPOINT}    1        ## If true, during subscription, the FUT performs a get to the notification endpoint
-- 
GitLab


From 0e0d6857a63a95b3a39d66428a99afebc2d1f052 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 14 Oct 2020 11:42:17 +0500
Subject: [PATCH 086/322] added majorApiVersion

---
 .../ApiVersion.robot                          | 10 +++---
 .../VRQANOperationKeywords.robot              | 32 +++++++++----------
 .../environment/variables.txt                 |  2 +-
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/ApiVersion.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/ApiVersion.robot
index 223f8d37c..c02163dd6 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/ApiVersion.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/ApiVersion.robot
@@ -167,35 +167,35 @@ DELETE API Version
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/v1/api_version
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/v1/api_version
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/v1/api_version
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/v1/api_version
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/v1/api_version
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot
index 641ffcefc..f33ff0732 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot
@@ -18,7 +18,7 @@ Create Sessions
 Check Individual Subscription existence
     Set Headers    {"Accept":"${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
     Integer    response status    200
 
 Check HTTP Response Status Code Is
@@ -53,7 +53,7 @@ Send Post request for Virtualised Resources Quota Available Notification Individ
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -61,7 +61,7 @@ Put Virtualised Resources Quota Available Notification individual Subscription
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -69,7 +69,7 @@ Patch Virtualised Resources Quota Available Notification individual subscription
     log    Trying to perform a Patch. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -77,7 +77,7 @@ Get Virtualised Resources Quota Available Notification individual subscription
     log    Trying to get information about an individual subscription
     Set Headers    {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
       
@@ -85,18 +85,18 @@ Delete Virtualised Resources Quota Available Notification individual subscriptio
     log    Try to delete an individual subscription
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}   
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}   
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
     
 Send Post request for new Virtualised Resources Quota Available Notification subscription 
-    Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/vrQuotaAvailSubscriptionRequest.json
     ${body}=        Format String   ${template}    callback_uri=${callback_uri}    callback_subscribe=${callback_subscribe}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}    
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -108,7 +108,7 @@ Send Post request for new Virtualised Resources Quota Available Notification sub
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/vrQuotaAvailSubscriptionRequest.json
     ${body}=        Format String   ${template}    callback_uri=${callback_uri}    callback_subscribe=${callback_subscribe}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -120,7 +120,7 @@ Send Post request for new Virtualised Resources Quota Available Notification sub
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/vrQuotaAvailSubscriptionRequest.json
     ${body}=        Format String   ${template}    callback_uri=${callback_uri}    callback_subscribe=${callback_subscribe}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -129,7 +129,7 @@ GET Virtualised Resources Quota Available Notification Subscriptions
     Set Headers  {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
      
@@ -138,7 +138,7 @@ GET Virtualised Resources Quota Available Notification Subscriptions with Filter
     Set Headers  {"Accept":"${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter}
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -146,7 +146,7 @@ Get Virtualised Resources Quota Available Notification subscriptions with Bad Re
      Log    Get the list of active subscriptions using an invalid filter
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter_invalid}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter_invalid}
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -155,7 +155,7 @@ Send Put request for Virtualised Resources Quota Available Notification subscrip
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse} 
     
@@ -164,7 +164,7 @@ Send Patch request for Virtualised Resources Quota Available Notification subscr
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}  
     
@@ -173,7 +173,7 @@ Send Delete request for Virtualised Resources Quota Available Notification subsc
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}     
     
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt
index ea3559c2f..7e9f441fc 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt
@@ -22,7 +22,7 @@ ${sleep_interval}    20s
 
 ${apiRoot}        /
 ${apiName}        vrqan
-${apiVersion}     v1
+${apiMajorVersion}     v1
 
 ${VrQuotaAvailNotification}    {}
 ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
-- 
GitLab


From a0d13f56e911c7f58da04028b2504391b575cfd1 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 14 Oct 2020 11:47:07 +0500
Subject: [PATCH 087/322] reference updated

---
 SOL005/NSDManagement-API/ApiVersion.robot     | 20 +++++------
 .../IndividualNSDescriptor.robot              | 22 ++++++------
 .../IndividualPnfDescriptor.robot             | 14 ++++----
 .../IndividualSubscription.robot              | 14 ++++----
 SOL005/NSDManagement-API/NSDContent.robot     | 36 +++++++++----------
 .../NSDManagementNotification.robot           | 14 ++++----
 SOL005/NSDManagement-API/NSDescriptors.robot  | 32 ++++++++---------
 SOL005/NSDManagement-API/PNFDContent.robot    | 16 ++++-----
 SOL005/NSDManagement-API/PNFDescriptors.robot | 26 +++++++-------
 SOL005/NSDManagement-API/Subscriptions.robot  | 24 ++++++-------
 10 files changed, 109 insertions(+), 109 deletions(-)

diff --git a/SOL005/NSDManagement-API/ApiVersion.robot b/SOL005/NSDManagement-API/ApiVersion.robot
index 4f632f26a..ed10f38f5 100644
--- a/SOL005/NSDManagement-API/ApiVersion.robot
+++ b/SOL005/NSDManagement-API/ApiVersion.robot
@@ -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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL005/NSDManagement-API/IndividualNSDescriptor.robot b/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
index 2ff40359e..32dce71f4 100644
--- a/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
+++ b/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
@@ -15,7 +15,7 @@ GET Individual Network Service Descriptor Information
     ...    Test title: GET Individual Network Service Descriptor Information
     ...    Test objective: The objective is to test the retrieval of an individual Network Service Descriptor information and perform a JSON schema validation of the collected data structure
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -30,7 +30,7 @@ GET Individual Network Service Descriptor Information with invalid resource iden
     ...    Test title: GET Individual Network Service Descriptor Information with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual Network Service Descriptor Information fails when using an invalid resource identifier
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -42,7 +42,7 @@ Disable Individual Network Service Descriptor
     ...    Test title: Disable Individual Network Service Descriptor  
     ...    Test objective: The objective is to test the disabling of an individual Network Service Descriptor and perform a JSON schema and content validation of the collected data structure
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in enabled operational state.
-    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The Network Service Descriptor is in operational state DISABLED and usage state is not modified
@@ -58,7 +58,7 @@ Enable Individual Network Service Descriptor
     ...    Test title: Enable Individual Network Service Descriptor
     ...    Test objective: The objective is to test the enabling of an individual Network Service Descriptor and perform a JSON schema and content validation of the collected data structure
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in DISABLED operational state (Test ID 5.3.1.2.3).
-    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The Network Service Descriptor is in operational state ENABLED and usage state is not modified
@@ -73,7 +73,7 @@ Enable Individual Network Service Descriptor with conflict due to operational st
     ...    Test title: Enable Individual Network Service Descriptor with conflict due to operational state ENABLED
     ...    Test objective: The objective is to test that enabling an individual Network Service Descriptor that is already in ENABLED operational state failsand perform a JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in ENABLED operational state (Test ID 5.3.1.2.4).
-    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -86,7 +86,7 @@ Enable Individual Network Service Descriptor with conflict due to onboarding sta
     ...    Test title: Enable Individual Network Service Descriptor with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of an Network Service Descriptor fails due to a conflict when the Network Service Descriptor is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in ENABLED operational state. The onboarding state of the Network Service Descriptor for which the enabling is requested is different from ONBOARDED.
-    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -99,7 +99,7 @@ Enable Individual Network Service Descriptor with conflict due to onboarding sta
     ...    Test title:  Enable Individual Network Service Descriptor with HTTP Etag precondition failure
     ...    Test objective: The objective is to test that the retrieval of an Network Service Descriptor fails due to a precondition failure when using an uncorrect Http Etag identified.
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in ENABLED operational state (Test ID 5.3.1.2.4).
-    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -111,7 +111,7 @@ DELETE Individual Network Service Descriptor
     ...    Test title:  DELETE Individual Network Service Descriptor
     ...    Test objective: The objective is to test the deletion of an individual Network Service Descriptor.
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in DISABLED operational state and NOT_IN_USE usage state.
-    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The Network Service Descriptor is not available anymore in the NFVO 
@@ -124,7 +124,7 @@ DELETE Individual Network Service Descriptor in operational state ENABLED
     ...    Test title:  DELETE Individual Network Service Descriptor in operational state ENABLED
     ...    Test objective: The objective is to test that the deletion of an individual Network Service Descriptor in operational state ENABLED fails. The test also performs a JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in ENABLED operational state (Test ID 5.3.1.2.4).
-    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The Network Service Descriptor is not deleted by the failed operation. 
@@ -138,7 +138,7 @@ POST Individual Network Service Descriptor - Method not implemented
     ...    Test title: POST Individual Network Service Descriptor - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new Network Service Descriptor
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -150,7 +150,7 @@ PUT Individual Network Service Descriptor - Method not implemented
     ...    Test title: PUT Individual Network Service Descriptor - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a new Network Service Descriptor
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSDManagement-API/IndividualPnfDescriptor.robot b/SOL005/NSDManagement-API/IndividualPnfDescriptor.robot
index bb1e5d970..eb15a97c2 100644
--- a/SOL005/NSDManagement-API/IndividualPnfDescriptor.robot
+++ b/SOL005/NSDManagement-API/IndividualPnfDescriptor.robot
@@ -14,7 +14,7 @@ GET Individual PNF Descriptor Information
     ...    Test title: GET Individual PNF Descriptor Information
     ...    Test objective: The objective is to test the retrieval of an individual PNF Descriptor information and perform a JSON schema validation of the collected data structure
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -29,7 +29,7 @@ GET Individual PNF Descriptor Information with invalid resource identifier
     ...    Test title: GET Individual PNF Descriptor Information with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual PNF Descriptor Information fails when using an invalid resource identifier
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ Update Individual PNF Descriptor
     ...    Test title: Update Individual PNF Descriptor
     ...    Test objective: The objective is to test the update of an individual PNF Descriptor and perform a JSON schema and content validation of the collected data structure
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The PNF Descriptor is modified according to the update request
@@ -56,7 +56,7 @@ Update Individual PNF Descriptor with HTTP Etag precondition failure
     ...    Test title:  Update Individual PNF Descriptor with HTTP Etag precondition failure
     ...    Test objective: The objective is to test that the update of a PNF Descriptor fails due to a precondition failure when using an uncorrect Http Etag identified.
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -68,7 +68,7 @@ POST Individual PNF Descriptor - Method not implemented
     ...    Test title: POST Individual PNF Descriptor - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new PNF Descriptor
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -80,7 +80,7 @@ PUT Individual PNF Descriptor - Method not implemented
     ...    Test title: PUT Individual PNF Descriptor - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a new PNF Descriptor
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -92,7 +92,7 @@ DELETE Individual PNF Descriptor
     ...    Test title:  DELETE Individual PNF Descriptor
     ...    Test objective: The objective is to test the deletion of an individual PNF Descriptor.
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The PNF Descriptor is not available anymore in the NFVO 
diff --git a/SOL005/NSDManagement-API/IndividualSubscription.robot b/SOL005/NSDManagement-API/IndividualSubscription.robot
index cd9047ea1..655572bc8 100644
--- a/SOL005/NSDManagement-API/IndividualSubscription.robot
+++ b/SOL005/NSDManagement-API/IndividualSubscription.robot
@@ -13,7 +13,7 @@ GET Individual NSD Management Subscription
     ...    Test title: GET Individual NSD Management Subscription
     ...    Test objective: The objective is to test the retrieval of individual NSD Management subscription and perform a JSON schema and content validation of the returned subscription data structure
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ GET Individual NSD Management Subscription with invalid resource identifier
     ...    Test title: GET Individual NSD Management Subscription with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual NSD Management subscription fails when using an invalid resource identifier
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +39,7 @@ DELETE Individual NSD Management Subscription with invalid resource identifier
     ...    Test title: DELETE Individual NSD Management Subscription with invalid resource identifier
     ...    Test objective: The objective is to test that the deletion of an individual NSD Management subscription fails when using an invalid resource identifier
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.9.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.9.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -51,7 +51,7 @@ POST Individual NSD Management Subscription - Method not implemented
     ...    Test title: POST Individual NSD Management Subscription - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new NSD Management Subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NSD Management Subscription is not created on the NFVO
@@ -64,7 +64,7 @@ PUT Individual NSD Management Subscription - Method not implemented
     ...    Test title: PUT Individual NSD Management Subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing NSD Management subscription
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.9.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.9.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NSD Management subscription is not modified by the operation
@@ -77,7 +77,7 @@ PATCH Individual NSD Management Subscription - Method not implemented
     ...    Test title: PATCH Individual NSD Management Subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing NSD Management subscription
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.9.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.9.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NSD Management subscription is not modified by the operation
@@ -90,7 +90,7 @@ DELETE Individual NSD Management Subscription
     ...    Test title: DELETE Individual NSD Management Subscription
     ...    Test objective: The objective is to test the deletion of an individual NSD Management subscription
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.9.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.9.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NSD Management Subscription is not available anymore in the NFVO    
diff --git a/SOL005/NSDManagement-API/NSDContent.robot b/SOL005/NSDManagement-API/NSDContent.robot
index 5079ca2cd..aaf583164 100644
--- a/SOL005/NSDManagement-API/NSDContent.robot
+++ b/SOL005/NSDManagement-API/NSDContent.robot
@@ -14,7 +14,7 @@ Get single file NSD Content in Plain Format
     ...    Test title: Get single file NSD Content in Plain Format
     ...    Test objective: The objective is to test the retrieval of the NSD Content in plain format and perform a validation that returned content is in plain format
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NSD is implemented as a single file
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ Get NSD Content in Zip Format
     ...    Test title: Get NSD Content in Zip Format
     ...    Test objective: The objective is to test the retrieval of the NSD Content in zip format and perform a validation that returned content is in zip format
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -40,7 +40,7 @@ Get single file NSD Content in Plain or Zip Format
     ...    Test title: Get single file NSD Content in Plain or Zip Format
     ...    Test objective: The objective is to test the retrieval of the single file NSD Content when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that returned content is in Plain or Zip format
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NSD Content is implemented as a single file
     ...    Post-Conditions: none
@@ -53,7 +53,7 @@ Get multi file NSD Content in Plain or Zip Format
     ...    Test title: Get multi file NSD Content in Plain or Zip Format
     ...    Test objective: The objective is to test the retrieval of the multi file NSD Content when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that returned content is in Zip format
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NSD is implemented as a multi file
     ...    Post-Conditions: none
@@ -66,7 +66,7 @@ Get multi file NSD Content in Plain Format
     ...    Test title: Get multi file NSD Content in Plain Format
     ...    Test objective: The objective is to test that the retrieval of the multi file NSD Content fails when requesting it in Plain format, and perform a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NSD Content is implemented as a multi file
     ...    Post-Conditions: none
@@ -79,7 +79,7 @@ Get NSD Content with invalid resource identifier
     ...    Test title: Get NSD Content with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of the NSD Content fails when using an invalid resource identifier
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -91,7 +91,7 @@ Get NSD Content with conflict due to onboarding state
     ...    Test title: Get NSD Content with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of the NSD Content fails due to a conflict when the NSD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the NSD for which the NSD Content is requested is different from ONBOARDED.
-    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -104,7 +104,7 @@ GET NSD Content with Range Request and NFVO supporting Range Requests
     ...    Test title: GET NSD Content with Range Request and NFVO supporting Range Requests
     ...    Test objective: The objective is to test the retrieval of NSD Content when using a range request to return single range of bytes from the file, with the NFVO supporting it. The test also perform a validation that returned content matches the issued range
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports range requests to return single range of bytes from the NSD file
     ...    Post-Conditions: none
@@ -119,7 +119,7 @@ GET NSD Content with Range Request and NFVO not supporting Range Requests
     ...    Test title: GET NSD Content with Range Request and NFVO not supporting Range Requests
     ...    Test objective: The objective is to test that the retrieval of NSD Content, when using a range request to return single range of bytes from the file and the NFVO not supporting it, returns the full NSD file.
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO does not support range requests to return single range of bytes from the NSD file
     ...    Post-Conditions: none    
@@ -132,7 +132,7 @@ GET NSD Content with invalid Range Request
     ...    Test title: GET NSD Content with invalid Range Request
     ...    Test objective: The objective is to test that the retrieval of NSD Content fails when using a range request that does not match any available byte range in the file.
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports range requests to return single range of bytes from the NSD file
     ...    Post-Conditions: none      
@@ -144,7 +144,7 @@ Upload NSD Content as Zip file in asynchronous mode
     ...    Test title: Upload NSD Content as Zip file in asynchronous mode
     ...    Test objective: The objective is to test the upload of an NSD Content in Zip format when the NFVO supports the asynchronous upload mode.
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the upload of NSD contents in asynchronous mode
     ...    Post-Conditions: NSD Uploaded
@@ -158,7 +158,7 @@ Upload NSD Content as plain text file in asynchronous mode
     ...    Test title: Upload NSD Content as plain text file in asynchronous mode
     ...    Test objective: The objective is to test the upload of an NSD Content in plain text format when the NFVO supports the asynchronous upload mode.
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the upload of NSD contents in asynchronous mode
     ...    Post-Conditions: none
@@ -171,7 +171,7 @@ Upload NSD Content as Zip file in synchronous mode
     ...    Test title: Upload NSD Content as Zip file in synchronous mode
     ...    Test objective: The objective is to test the upload of an NSD Content in Zip format when the NFVO supports the synchronous upload mode.
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the upload of NSD contents in synchronous mode
     ...    Post-Conditions: The NSD content is successfully uploaded and available in the NFVO
@@ -184,7 +184,7 @@ Upload NSD Content as plain text file in synchronous mode
     ...    Test title: Upload NSD Content as plain text file in synchronous mode
     ...    Test objective: The objective is to test the upload of an NSD Content in plain text format when the NFVO supports the synchronous upload mode.
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the upload of NSD contents in synchronous mode
     ...    Post-Conditions: The NSD content is successfully uploaded and available in the NFVO
@@ -198,7 +198,7 @@ Upload NSD Content with conflict due to onboarding state
     ...    Test title: Upload NSD Content with conflict due to onboarding state
     ...    Test objective: The objective is to test that the upload of the NSD Content fails due to a conflict when the NSD is not in onboarding state CREATED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the NSD for which the NSD Content is requested is different from ONBOARDED.
-    ...    Reference: Clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -211,7 +211,7 @@ POST NSD Content - Method not implemented
     ...    Test title: POST NSD Content - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new Network Service Descriptor content
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -223,7 +223,7 @@ PATCH NSD Content - Method not implemented
     ...    Test title: PATCH NSD Content - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor content
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -235,7 +235,7 @@ DELETE NSD Content - Method not implemented
     ...    Test title: DELETE NSD Content - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete Network Service Descriptor content
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NSD content is not deleted by the failed operation
diff --git a/SOL005/NSDManagement-API/NSDManagementNotification.robot b/SOL005/NSDManagement-API/NSDManagementNotification.robot
index de6418c75..60dee5ab9 100644
--- a/SOL005/NSDManagement-API/NSDManagementNotification.robot
+++ b/SOL005/NSDManagement-API/NSDManagementNotification.robot
@@ -16,7 +16,7 @@ NSD Onboarding Notification
     ...    Test title: NSD Onboarding Notification
     ...    Test objective: The objective is to test the dispatch of NSD Onboarding notification when the NSD onboarding operation is successfully completed, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A NSD management subscription for onboarding notifications is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -29,7 +29,7 @@ NSD Onboarding Failure Notification
     ...    Test title: NSD Onboarding Failure Notification
     ...    Test objective: The objective is to test the dispatch of NSD Onboarding failure notification when the NSD onboarding operation fails, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A NSD management subscription for onboarding failure notifications is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -42,7 +42,7 @@ NSD Operational State Change Notification
     ...    Test title: NSD Operational State Change Notification
     ...    Test objective: The objective is to test the dispatch of NSD Operational State Change notification when the NSD operational status change in the NFVO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A NSD management subscription for operational state change notifications is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -55,7 +55,7 @@ NSD Deletion Notification
     ...    Test title: NSD Deletion Notification
     ...    Test objective: The objective is to test the dispatch of NSD Deletion notification when the NSD is deleted from the NFVO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A NSD management subscription for deletion notifications is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -68,7 +68,7 @@ PNFD Onboarding Notification
     ...    Test title: PNFD Onboarding Notification
     ...    Test objective: The objective is to test the dispatch of PNFD Onboarding notification when the PNFD onboarding operation is successfully completed, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A PNFD management subscription for onboarding notifications is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -81,7 +81,7 @@ PNFD Onboarding Failure Notification
     ...    Test title: PNFD Onboarding Failure Notification
     ...    Test objective: The objective is to test the dispatch of PNFD Onboarding failure notification when the PNFD onboarding operation fails, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A PNFD management subscription for onboarding failure notifications is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -94,7 +94,7 @@ PNFD Deletion Notification
     ...    Test title: PNFD Deletion Notification
     ...    Test objective: The objective is to test the dispatch of PNFD Deletion notification when the PNFD is deleted from the NFVO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A PNFD management subscription for deletion notifications is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSDManagement-API/NSDescriptors.robot b/SOL005/NSDManagement-API/NSDescriptors.robot
index 0f2be1603..4f0789aae 100644
--- a/SOL005/NSDManagement-API/NSDescriptors.robot
+++ b/SOL005/NSDManagement-API/NSDescriptors.robot
@@ -14,7 +14,7 @@ GET all Network Service Descriptors Information
     ...    Test title: GET all Network Service Descriptors Information
     ...    Test objective: The objective is to test the retrieval of all the Network Service Descriptors information and perform a JSON schema and content validation of the collected data structure
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ GET Network Service Descriptors Information with attribute-based filter
     ...    Test title: GET Network Service Descriptors Information with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of Network Service Descriptors information using attribute-based filter, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued attribute-based filter
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ GET Network Service Descriptors Information with invalid attribute-based filter
     ...    Test title: GET Network Service Descriptors Information with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of Network Service Descriptors information fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -54,7 +54,7 @@ Get all Network Service Descriptors Information with malformed authorization tok
     ...    Test title: Get all Network Service Descriptors Information with malformed authorization token
     ...    Test objective: The objective is to test that the retrieval of Network Service Descriptors Information fails when using malformed authorization token
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -66,7 +66,7 @@ Get all Network Service Descriptors Information without authorization token
     ...    Test title: Get all Network Service Descriptors Information without authorization token
     ...    Test objective: The objective is to test that the retrieval of Network Service Descriptors Information fails when omitting the authorization token
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -78,7 +78,7 @@ GET all Network Service Descriptors Information with expired or revoked authoriz
     ...    Test title: GET all Network Service Descriptors Information with expired or revoked authorization token
     ...    Test objective: The objective is to test that the retrieval of Network Service Descriptors Information fails when using expired or revoked authorization token
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -90,7 +90,7 @@ GET all Network Service Descriptors Information with "all_fields" attribute sele
     ...    Test title: GET all Network Service Descriptors Information with "all_fields" attribute selector
     ...    Test objective: The objective is to test the retrieval of all Network Service Descriptors Information with "all_fields" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "all_fileds" selector
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -104,7 +104,7 @@ GET all Network Service Descriptors Information with "exclude_default" attribute
     ...    Test title: GET all Network Service Descriptors Information with "exclude_default" attribute selector
     ...    Test objective: The objective is to test the retrieval of all Network Service Descriptors Information with "exclude_default" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "exclude_default" selector
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -118,7 +118,7 @@ GET all Network Service Descriptors Information with "fields" attribute selector
     ...    Test title: GET all Network Service Descriptors Information with "fields" attribute selector
     ...    Test objective: The objective is to test the retrieval of all Network Service Descriptors Information with "fields" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "fields" selector
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the use of "fields" attribute selector
     ...    Post-Conditions: none
@@ -132,7 +132,7 @@ GET all Network Service Descriptors Information with "exclude_fields" attribute
     ...    Test title: GET all Network Service Descriptors Information with "exclude_fields" attribute selector
     ...    Test objective: The objective is to test the retrieval of all Network Service Descriptors Information with "exclude_fields" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "exclude_fields" selector
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the use of "exclude_fields" attribute selector
     ...    Post-Conditions: none
@@ -146,7 +146,7 @@ Create new Network Service Descriptor Resource
     ...    Test title:  Create new Network Service Descriptor Resource
     ...    Test objective: The objective is to test the creation of a new Create new Network Service Descriptor resource and perform the JSON schema validation of the returned structure
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The Network Service Descriptor resource is successfully created on the NFVO
@@ -161,7 +161,7 @@ PUT all Network Service Descriptors - Method not implemented
     ...    Test title: PUT all Network Service Descriptors Information - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify Network Service Descriptors Information
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: Clause 5.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -173,7 +173,7 @@ PATCH all Network Service Descriptors - Method not implemented
     ...    Test title: PATCH all Network Service Descriptors Information - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptors Information
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: Clause 5.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -185,7 +185,7 @@ DELETE all Network Service Descriptors - Method not implemented
     ...    Test title: DELETE all Network Service Descriptors Information - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete Network Service Descriptors Information
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: Clause 5.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The Network Service Descriptors are not deleted by the failed operation
@@ -198,7 +198,7 @@ GET all Network Service Descriptors Information as Paged Response
     ...    Test title: GET all Network Service Descriptors Information as Paged Response
     ...    Test objective: The objective is to test the retrieval of all the Network Service Descriptors information as a Paged Response.
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -211,7 +211,7 @@ Get all Network Service Descriptors Information - Bad Request Response too Big
     ...    Test title: Get all Network Service Descriptors Information - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of Network Service Descriptors Information fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
diff --git a/SOL005/NSDManagement-API/PNFDContent.robot b/SOL005/NSDManagement-API/PNFDContent.robot
index 15231b5fc..740ef2a26 100644
--- a/SOL005/NSDManagement-API/PNFDContent.robot
+++ b/SOL005/NSDManagement-API/PNFDContent.robot
@@ -14,7 +14,7 @@ Get PNFD Content
     ...    Test title: Get PNFD Content
     ...    Test objective: The objective is to test the retrieval of the PNFD Content in plain format and perform a validation that returned content is in plain format
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ Get PNFD Content with invalid resource identifier
     ...    Test title: Get PNFD Content with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of the PNFD Content fails when using an invalid resource identifier
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +39,7 @@ Get PNFD Content with conflict due to onboarding state
     ...    Test title: Get PNFD Content with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of the PNFD Content fails due to a conflict when the PNFD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the PNFD for which the PNFD Content is requested is different from ONBOARDED.
-    ...    Reference: Clause 5.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -53,7 +53,7 @@ Upload PNFD Content as plain text file
     ...    Test title: Upload PNFD Content as plain text file
     ...    Test objective: The objective is to test the upload of a PNFD Content in plain text format.
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The uploaded PNFD content is available in the NFVO
@@ -67,7 +67,7 @@ Upload PNFD Content with conflict due to onboarding state
     ...    Test title: Upload PNFD Content with conflict due to onboarding state
     ...    Test objective: The objective is to test that the upload of the PNFD Content fails due to a conflict when the PNFD is not in onboarding state CREATED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the PNFD for which the PNFD Content is requested is different from CREATED.
-    ...    Reference: Clause 5.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -80,7 +80,7 @@ POST PNFD Content - Method not implemented
     ...    Test title: POST PNFD Content - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new PNF Descriptor content
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -92,7 +92,7 @@ PATCH PNFD Content - Method not implemented
     ...    Test title: PATCH PNFD Content - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update PNF Descriptor content
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -104,7 +104,7 @@ DELETE PNFD Content - Method not implemented
     ...    Test title: DELETE PNFD Content - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete PNF Descriptor content
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.7.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The PNFD content is not deleted by the failed operation
diff --git a/SOL005/NSDManagement-API/PNFDescriptors.robot b/SOL005/NSDManagement-API/PNFDescriptors.robot
index afb60a8e5..194c173fc 100644
--- a/SOL005/NSDManagement-API/PNFDescriptors.robot
+++ b/SOL005/NSDManagement-API/PNFDescriptors.robot
@@ -14,7 +14,7 @@ GET all PNF Descriptors Information
     ...    Test title: GET all PNF Descriptors Information
     ...    Test objective: The objective is to test the retrieval of all the PNF Descriptors information and perform a JSON schema and content validation of the collected data structure
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ GET PNF Descriptors Information with attribute-based filter
     ...    Test title: GET PNF Descriptors Information with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of PNF Descriptors information using attribute-based filter, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued attribute-based filter
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ GET PNF Descriptors Information with invalid attribute-based filter
     ...    Test title: GET PNF Descriptors Information with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of PNF Descriptors information fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -54,7 +54,7 @@ GET all PNF Descriptors Information with "all_fields" attribute selector
     ...    Test title: GET all PNF Descriptors Information with "all_fields" attribute selector
     ...    Test objective: The objective is to test the retrieval of all PNF Descriptors Information with "all_fields" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "all_fileds" selector
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -68,7 +68,7 @@ GET all PNF Descriptors Information with "exclude_default" attribute selector
     ...    Test title: GET all PNF Descriptors Information with "exclude_default" attribute selector
     ...    Test objective: The objective is to test the retrieval of all PNF Descriptors Information with "exclude_default" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "exclude_default" selector
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -82,7 +82,7 @@ GET all PNF Descriptors Information with "fields" attribute selector
     ...    Test title: GET all PNF Descriptors Information with "fields" attribute selector
     ...    Test objective: The objective is to test the retrieval of all PNF Descriptors Information with "fields" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "fields" selector
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the use of "fields" attribute selector
     ...    Post-Conditions: none
@@ -96,7 +96,7 @@ GET all PNF Descriptors Information with "exclude_fields" attribute selector
     ...    Test title: GET all PNF Descriptors Information with "exclude_fields" attribute selector
     ...    Test objective: The objective is to test the retrieval of all PNF Descriptors Information with "exclude_fields" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "exclude_fields" selector
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the use of "exclude_fields" attribute selector
     ...    Post-Conditions: none
@@ -110,7 +110,7 @@ Create new PNF Descriptor Resource
     ...    Test title:  Create new PNF Descriptor Resource
     ...    Test objective: The objective is to test the creation of a new Create new PNF Descriptor resource and perform the JSON schema validation of the returned structure
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The PNF Descriptor resource is successfully created on the NFVO
@@ -125,7 +125,7 @@ PUT all PNF Descriptors - Method not implemented
     ...    Test title: PUT all PNF Descriptors Information - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify PNF Descriptors Information
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -137,7 +137,7 @@ PATCH all PNF Descriptors - Method not implemented
     ...    Test title: PATCH all PNF Descriptors Information - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update NF Descriptors Information
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -149,7 +149,7 @@ DELETE all PNF Descriptors - Method not implemented
     ...    Test title: DELETE all PNF Descriptors Information - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete PNF Descriptors Information
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The PNF Descriptors are not deleted by the failed operation
@@ -162,7 +162,7 @@ GET all PNF Descriptors Information as Paged Response
     ...    Test title: GET all PNF Descriptors Information as Paged Response
     ...    Test objective: The objective is to test the retrieval of all the PNF Descriptors information as a Paged Response.
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -175,7 +175,7 @@ GET PNF Descriptors Information - Bad Request Response too Big
     ...    Test title: GET PNF Descriptors Information - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of PNF Descriptors information fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSDManagement-API/Subscriptions.robot b/SOL005/NSDManagement-API/Subscriptions.robot
index 968710bd8..d70615f82 100644
--- a/SOL005/NSDManagement-API/Subscriptions.robot
+++ b/SOL005/NSDManagement-API/Subscriptions.robot
@@ -16,7 +16,7 @@ Get All NSD Management Subscriptions
     ...    Test title: Get All NSD Management Subscriptions
     ...    Test objective: The objective is to test the retrieval of all NSD Management subscriptions and perform a JSON schema validation of the returned subscriptions data structure
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -30,7 +30,7 @@ Get NSD Management Subscriptions with attribute-based filter
     ...    Test title: Get NSD Management Subscriptions with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of NSD Management subscriptions using attribute-based filter, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -45,7 +45,7 @@ Get NSD Management Subscriptions with invalid attribute-based filter
     ...    Test title: Get NSD Management Subscriptions with attribute-based filters
     ...    Test objective: The objective is to test that the retrieval of NSD Management subscriptions fails when using invalid attribute-based filters, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -58,7 +58,7 @@ GET NSD Management Subscription with invalid resource endpoint
     ...    Test title: GET NSD Management Subscription with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of all NSD Management subscriptions fails when using invalid resource endpoint.
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -70,7 +70,7 @@ Create new NSD Management subscription
     ...    Test title: Create new NSD Management subscription
     ...    Test objective: The objective is to test the creation of a new NSD Management subscription and perform a JSON schema and content validation of the returned subscription data structure
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NSD Management subscription is successfully set and it matches the issued subscription
@@ -87,7 +87,7 @@ Create duplicated NSD Management subscription with NFVO not creating duplicated
     ...    Test title: Create duplicated NSD Management subscription with NFVO not creating duplicated subscriptions
     ...    Test objective: The objective is to test the attempt of a creation of a duplicated NSD Management subscription and check that no new subscription is created by the NFVO and a link to the original subscription is returned
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO does not support the creation of duplicated subscriptions
     ...    Post-Conditions: The existing NSD Management subscription returned is available in the NFVO
@@ -104,7 +104,7 @@ Create duplicated NSD Management subscription with NFVO creating duplicated subs
     ...    Test title: Create duplicated NSD Management subscription with NFVO creating duplicated subscriptions
     ...    Test objective: The objective is to test the creation of a duplicated NSD Management subscription and perform a JSON schema and content validation of the returned duplicated subscription data structure
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the creation of duplicated subscriptions
     ...    Post-Conditions: The duplicated NSD Management subscription is successfully set and it matches the issued subscription    
@@ -120,7 +120,7 @@ PUT NSD Management Subscriptions - Method not implemented
     ...    Test title: PUT NSD Management Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify NSD Management subscriptions
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.8.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.8.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -133,7 +133,7 @@ PATCH NSD Management Subscriptions - Method not implemented
     ...    Test title: PATCH NSD Management Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update NSD Management subscriptions
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.8.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.8.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -146,7 +146,7 @@ DELETE NSD Management Subscriptions - Method not implemented
     ...    Test title: DELETE NSD Management Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete NSD Management subscriptions
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.8.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.8.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NSD Management subscriptions are not deleted by the failed operation 
@@ -159,7 +159,7 @@ Get All NSD Management Subscriptions as Paged Response
     ...    Test title: Get All NSD Management Subscriptions as Paged Response
     ...    Test objective: The objective is to test the retrieval of all NSD Management subscriptions as a Paged Response.
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -172,7 +172,7 @@ Get NSD Management Subscriptions - Bad Request Response too Big
     ...    Test title: Get NSD Management Subscriptions - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of NSD Management subscriptions fails because reponse is too big, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
-- 
GitLab


From d27f1383f91e37213db6dc2390e5dcf4794ae1b0 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 14 Oct 2020 11:50:56 +0500
Subject: [PATCH 088/322] reference updated

---
 .../ApiVersion.robot                          | 20 ++++++------
 .../CancelOperationTask.robot                 | 14 ++++----
 .../ContinueOperationTask.robot               | 14 ++++----
 .../CreateNSInstanceWorkflow.robot            |  2 +-
 .../DeleteNSInstanceWorkflow.robot            |  2 +-
 .../FailOperationTask.robot                   | 14 ++++----
 .../HealNSTask.robot                          | 12 +++----
 .../HealNSTaskWorkflow.robot                  |  2 +-
 .../IndividualNSInstance.robot                | 12 +++----
 .../IndividualNSLCMOccurences.robot           | 10 +++---
 .../IndividualSubscription.robot              | 10 +++---
 .../InstanciateNSTaskWorkflow.robot           |  2 +-
 .../InstantiateNSTask.robot                   | 12 +++----
 .../NSInstances.robot                         | 32 +++++++++----------
 .../NSLCMOccurences.robot                     | 26 +++++++--------
 .../NotificationEndpoint.robot                |  8 ++---
 .../RetryOperationTask.robot                  | 14 ++++----
 .../RollbackOperationTask.robot               | 14 ++++----
 .../ScaleNSTask.robot                         | 12 +++----
 .../ScaleNSTaskWorkflow.robot                 |  2 +-
 .../Subscriptions.robot                       | 30 ++++++++---------
 .../TerminateNSTask.robot                     | 12 +++----
 .../TerminateNSTaskWorkflow.robot             |  2 +-
 .../UpdateNSTask.robot                        | 12 +++----
 .../UpdateNSTaskWorkflow.robot                |  2 +-
 25 files changed, 146 insertions(+), 146 deletions(-)

diff --git a/SOL005/NSLifecycleManagement-API/ApiVersion.robot b/SOL005/NSLifecycleManagement-API/ApiVersion.robot
index 77e6bc6bf..9a1f0c8bc 100644
--- a/SOL005/NSLifecycleManagement-API/ApiVersion.robot
+++ b/SOL005/NSLifecycleManagement-API/ApiVersion.robot
@@ -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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot b/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
index 26407a2d2..a930030d4 100644
--- a/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
@@ -13,7 +13,7 @@ POST Cancel operation task
     ...    Test title: POST Cancel operation task
     ...    Test objective: The objective is to test that POST method cancel the NS LCM operation
     ...    Pre-conditions: NS instance status equal to STARTING, PROCESSING or ROLLING_BACK
-    ...    Reference: Clause 6.4.15.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.15.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: NS instance status equal to FAILED_TEMP     
@@ -26,7 +26,7 @@ POST Cancel operation task Not Found
     ...    Test title: POST Cancel operation task Not Found
     ...    Test objective: The objective is to test that POST method fail completing the Cancel NS LCM operation if the resource is not found
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.15.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.15.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none       
@@ -39,7 +39,7 @@ POST Cancel operation task Conflict
     ...    Test title: POST Cancel operation task Conflict
     ...    Test objective: The objective is to test that POST method fail if a status conflict exist on the NS LCM operation. (i.e. NS instance status not equal to STARTING, PROCESSING or ROLLING_BACK)
     ...    Pre-conditions: NS instance status not equal to STARTING, PROCESSING or ROLLING_BACK
-    ...    Reference: Clause 6.4.15.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.15.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -52,7 +52,7 @@ GET Cancel operation task - Method not implemented
     ...    Test title: GET Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.15.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.15.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ PUT Cancel operation task - Method not implemented
     ...    Test title: PUT Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.15.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.15.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -76,7 +76,7 @@ PATCH Cancel operation task - Method not implemented
     ...    Test title: PATCH Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.15.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.15.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -88,7 +88,7 @@ DELETE Cancel operation task - Method not implemented
     ...    Test title: DELETE Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.15.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.15.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot b/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot
index 54b22eae5..ff24ffbe0 100644
--- a/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot
@@ -13,7 +13,7 @@ POST Continue operation task
     ...    Test title: POST Continue operation task
     ...    Test objective: The objective is to test that POST method trigger a continue on the LCM operation
     ...    Pre-conditions: NS instance status equal to FAILED_TEMP
-    ...    Reference: Clause 6.4.13.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.13.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: NS instance status not equal to FAILED_TEMP 
@@ -26,7 +26,7 @@ POST Continue operation task Not Found
     ...    Test title: POST Continue operation task Not Found
     ...    Test objective: The objective is to test that POST method cannot perform a continue operation task because the resource is not found
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.13.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.13.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -39,7 +39,7 @@ POST Continue operation task Conflict
     ...    Test title: POST Continue operation task Conflict
     ...    Test objective: The objective is to test that POST method fail in case of operation status conflict (i.e. NS instance status not equal to FAILED_TEMP )
     ...    Pre-conditions: NS instance status not equal to FAILED_TEMP 
-    ...    Reference: Clause 6.4.13.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.13.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none      
@@ -52,7 +52,7 @@ GET Continue operation task - Method not implemented
     ...    Test title: GET Continue operation task - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.13.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.13.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -64,7 +64,7 @@ PUT Continue operation task - Method not implemented
     ...    Test title: PUT Continue operation task - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.13.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.13.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -76,7 +76,7 @@ PATCH Continue operation task - Method not implemented
     ...    Test title: PATCH Continue operation task - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.14.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.14.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -88,7 +88,7 @@ DELETE Continue operation task - Method not implemented
     ...    Test title: DELETE Continue operation task - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.14.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.14.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
index 9092991e1..1218822f8 100644
--- a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
@@ -14,7 +14,7 @@ NS Instance Creation
     ...    Test title: NS Instance Creation
     ...    Test objective: The objective is to test the workflow for Creating a NS instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS lifecycle management operation occurrence is in NOT_ISTANTIATED state
diff --git a/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot b/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
index 480600cca..92616f735 100644
--- a/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
@@ -12,7 +12,7 @@ NS Instance Deletion
     ...    Test title: NS Instance Deletion
     ...    Test objective: The objective is to test the workflow for Deleting a NS instance
     ...    Pre-conditions: the resource is in NOT_INSTANTIATED state
-    ...    Reference: Clause 6.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: NS Instance resource is deleted
diff --git a/SOL005/NSLifecycleManagement-API/FailOperationTask.robot b/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
index 5ad6c92e5..e4c017684 100644
--- a/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
@@ -13,7 +13,7 @@ POST Fail operation task
     ...    Test title: POST Fail operation task
     ...    Test objective: The objective is to test that POST method trigger a state change to "finally failed" on the NS LCM operation
     ...    Pre-conditions: NS instance status equal to FAILED_TEMP
-    ...    Reference: Clause 6.4.14.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.14.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -27,7 +27,7 @@ POST Fail operation task Not Found
     ...    Test title: POST Fail operation task Not Found
     ...    Test objective: The objective is to test that POST method fail if the NS LCM resource is not found
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.14.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.14.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -40,7 +40,7 @@ POST Fail operation task Conflict
     ...    Test title: POST Fail operation task Conflict
     ...    Test objective: The objective is to test that POST method fail in case of status conflict on the NS LCM operation (i.e NS instance status not equal to FAILED_TEMP)
     ...    Pre-conditions: NS instance status not equal to FAILED_TEMP
-    ...    Reference: Clause 6.4.14.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.14.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -53,7 +53,7 @@ GET Fail operation task - Method not implemented
     ...    Test title: GET Fail operation task - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.14.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.14.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -65,7 +65,7 @@ PUT Fail operation task - Method not implemented
     ...    Test title: PUT Fail operation task - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.14.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.14.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -77,7 +77,7 @@ PATCH Fail operation task - Method not implemented
     ...    Test title: PATCH Fail operation task - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.14.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.14.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -89,7 +89,7 @@ DELETE Fail operation task - Method not implemented
     ...    Test title: DELETE Fail operation task - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.14.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.14.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
diff --git a/SOL005/NSLifecycleManagement-API/HealNSTask.robot b/SOL005/NSLifecycleManagement-API/HealNSTask.robot
index dc237b439..7d95b0e16 100644
--- a/SOL005/NSLifecycleManagement-API/HealNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/HealNSTask.robot
@@ -13,7 +13,7 @@ POST Heal a NSInstance
     ...    Test title: POST Heal a NSInstance
     ...    Test objective: The objective is to test that POST method trigger a Heal NS instance
     ...    Pre-conditions: NS Instance is in INSTANTIATED state.
-    ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: NS instance is still in INSTANTIATED state.
@@ -26,7 +26,7 @@ POST Heal a NSInstance - Conflict (Not Instantited)
     ...    Test title: POST Heal a NSInstance - Conflict (Not Instantited)
     ...    Test objective: The objective is to test that POST method fail if NS instance is in NOT_INSTANTIATE state 
     ...    Pre-conditions: NS Instance is in NOT_INSTANTIATED state
-    ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: NS Instance is still in NOT_INSTANTIATED state
@@ -39,7 +39,7 @@ GET Heal NSInstance- Method not implemented
     ...    Test title: GET Heal NSInstance- Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -51,7 +51,7 @@ PUT Heal NSInstance - Method not implemented
     ...    Test title: PUT Heal NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -63,7 +63,7 @@ PATCH Heal NSInstance - Method not implemented
     ...    Test title: PATCH Heal NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -75,7 +75,7 @@ DELETE Heal NSInstance - Method not implemented
     ...    Test title: DELETE Heal NSInstance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.7.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.7.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot
index 0663a9f2b..7ee91bf85 100644
--- a/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot
@@ -14,7 +14,7 @@ Heal Flow of NS lifecycle management operations
     ...    Test title: Heal Flow of NS lifecycle management operations
     ...    Test objective: The objective is to test the workflow for Healing a NS instance
     ...    Pre-conditions: the resource is in INSTANTIATED state
-    ...    Reference: Clause 6.4.7 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.7 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: NS Instance still in INSTANTIATED state
diff --git a/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot b/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
index bcc46e91b..cd4345a1a 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
@@ -13,7 +13,7 @@ POST Individual NSInstance - Method not implemented
     ...    Test title: POST Individual NSInstance - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: Check Postcondition NS Instance is not created
@@ -26,7 +26,7 @@ GET Information about an individual NS Instance
     ...    Test title: GET Information about an individual NS Instance
     ...    Test objective: The objective is to test that GET method returns an individual NS instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +39,7 @@ PUT Individual NSInstance - Method not implemented
     ...    Test title: PUT Individual NSInstance - Method not implemented
     ...    Test objective: TThe objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: Check Postcondition NS Instance is not modified
@@ -52,7 +52,7 @@ PATCH Individual NSInstance - Method not implemented
     ...    Test title: PATCH Individual NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: Check Postcondition NS Instance is not modified
@@ -65,7 +65,7 @@ DELETE Individual NSInstance
     ...    Test title: DELETE Individual NSInstance
     ...    Test objective: The objective is to test that DELETE method delete a not INSTANTIATED NS instance
     ...    Pre-conditions: NS instance is not INSTANTIATED .
-    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: Check Postcondition NS Instance is deleted
@@ -78,7 +78,7 @@ DELETE Individual NSInstance Conflict
     ...    Test title: DELETE Individual NSInstance Conflict
     ...    Test objective: The objective is to test that DELETE method cannot delete an INSTANTIATED NS instance
     ...    Pre-conditions: one instance of a NS in INSTANTIATED state
-    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: Check Postcondition NS Instance is not deleted
diff --git a/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot b/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
index 17046cc9a..fd9eeea93 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
@@ -12,7 +12,7 @@ Post Individual NS LCM occurrences - Method not implemented
     ...    Test title: Post Individual NS LCM occurrences - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS instance is not created in the NFVO
@@ -24,7 +24,7 @@ Get status information about Individual NS LCM occurrences
     ...    Test title: Get status information about Individual NS LCM occurrences
     ...    Test objective: The objective is to test that GET method returns the LCM occurrence of the NS
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.10.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.10.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -37,7 +37,7 @@ PUT status information about Individual NS LCM occurrences - Method not implemen
     ...    Test title: PUT status information about Individual NS LCM occurrences - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.10.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.10.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS instance is not modified from the NFVO
@@ -49,7 +49,7 @@ PATCH status information about Individual NS LCM occurrences - Method not implem
     ...    Test title: PATCH status information about Individual NS LCM occurrences - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.10.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.10.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS instance is not modified from the NFVO
@@ -61,7 +61,7 @@ DELETE status information about Individual NS LCM occurrences - Method not imple
     ...    Test title: DELETE status information about Individual NS LCM occurrences - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.10.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.10.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS instance is not deleted from the NFVO
diff --git a/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot b/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot
index 9d5a165b3..64105600e 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot
@@ -14,7 +14,7 @@ POST Individual Subscription - Method not implemented
     ...    Test title: POST Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.17.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.17.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS lifecycle management subscription is not created on the NFVO
@@ -26,7 +26,7 @@ GET Information about an individual subscription
     ...    Test title: GET Information about an individual subscription
     ...    Test objective: The objective is to test the retrieval of NS lifecycle management subscription and perform a JSON schema validation of the returned subscription data structure
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.17.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.17.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +39,7 @@ PUT an individual subscription - Method not implemented
     ...    Test title: PUT an individual subscription - Method not implemented
     ...    Test objective: TThe objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.17.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.17.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS lifecycle management subscription is not modified by the operation
@@ -51,7 +51,7 @@ PATCH an individual subscription - Method not implemented
     ...    Test title: PATCH an individual subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.17.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.17.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS lifecycle management subscription is not modified by the operation
@@ -63,7 +63,7 @@ DELETE an individual subscription
     ...    Test title: DELETE an individual subscription
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: At least one lifecycle management subscription is available in the NFVO
-    ...    Reference: Clause 6.4.17.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.17.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS lifecycle management subscription is not available anymore on NFVO
diff --git a/SOL005/NSLifecycleManagement-API/InstanciateNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/InstanciateNSTaskWorkflow.robot
index f3357abb4..a6a087ca6 100644
--- a/SOL005/NSLifecycleManagement-API/InstanciateNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/InstanciateNSTaskWorkflow.robot
@@ -14,7 +14,7 @@ Instantiate Flow of NS lifecycle management operations
     ...    Test title: Instantiate Flow of NS lifecycle management operations
     ...    Test objective: The objective is to test the workflow for Instantiate a NS instance
     ...    Pre-conditions: the resource is in NOT_INSTANTIATED state
-    ...    Reference: Clause 6.4.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: the resource is in INSTANTIATED state
diff --git a/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot b/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot
index ae0178684..7b55d6235 100644
--- a/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot
@@ -13,7 +13,7 @@ POST Instantiate a nsInstance
     ...    Test title: POST Instantiate a nsInstance
     ...    Test objective: The objective is to test that POST method instantiate a new NS instance
     ...    Pre-conditions: An NS instance created and it is in NOT_INSTANTIATED state
-    ...    Reference: Clause 6.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS instance is instantiated on the NFVO
@@ -27,7 +27,7 @@ POST Instantiate a nsInstance Conflict
     ...    Test title: POST Instantiate a nsInstance Conflict
     ...    Test objective: The objective is to test that the operation cannot be performed due to a conflict with the state of resource (i.e. the resource is in INSTANTIATED state)
     ...    Pre-conditions: resource is in INSTANTIATED state
-    ...    Reference: Clause 6.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS instance is not instantiated on the NFVO
@@ -41,7 +41,7 @@ GET Instantiate NSInstance - Method not implemented
     ...    Test title: GET Instantiate NSInstance - Method not implemented
     ...    Test objective: The objective is to test that the operation cannot be performed due because method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none.
@@ -53,7 +53,7 @@ PUT Instantiate NSInstance - Method not implemented
     ...    Test title: PUT Instantiate NSInstance - Method not implemented
     ...    Test objective: The objective is to test that the operation cannot be performed due because method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none.
@@ -65,7 +65,7 @@ PATCH Instantiate NSInstance - Method not implemented
     ...    Test title: PATCH Instantiate NSInstance - Method not implemented
     ...    Test objective: The objective is to test that the operation cannot be performed due because method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none.
@@ -77,7 +77,7 @@ DELETE Instantiate NSInstance - Method not implemented
     ...    Test title: DELETE Instantiate NSInstance - Method not implemented
     ...    Test objective: The objective is to test that the operation cannot be performed due because method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none.
diff --git a/SOL005/NSLifecycleManagement-API/NSInstances.robot b/SOL005/NSLifecycleManagement-API/NSInstances.robot
index 3d579f4cc..106da04e8 100644
--- a/SOL005/NSLifecycleManagement-API/NSInstances.robot
+++ b/SOL005/NSLifecycleManagement-API/NSInstances.robot
@@ -12,7 +12,7 @@ POST Create a new NsInstance
     ...    Test title: POST Create a new NsInstance
     ...    Test objective: The objective is to test the creation of a new Ns Instances and perform a JSON schema validation of the collected instance data structure
     ...    Pre-conditions: None.
-    ...    Reference: Clause 6.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none.
     ...    Post-Conditions: A Ns instance is instantiated.
@@ -26,7 +26,7 @@ GET information about multiple NS instances
     ...    Test title: GET information about multiple NS instances
     ...    Test objective: The objective is to test the retrieval of all the available NS Instances and perform a JSON schema and content validation of the collected instance data structure
     ...    Pre-conditions: An existing Ns instance.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none.
     ...    Post-Conditions: none.
@@ -38,8 +38,8 @@ GET information about multiple NS instances Bad Request Invalid attribute-based
     [Documentation]    Test ID: 5.3.2.1.3
     ...    Test title: GET information about multiple NS instances Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to test the retrieval of all the available NS Instances using attribute-based filter and perform a JSON schema and content validation of the collected instance data structure
-    ...    Pre-conditions: A Ns instance is instantiated, a bad filter parameter (filter parameters are listed in Table 6.4.2.3.2-1  - ETSI GS NFV-SOL 005 [3] v2.6.1).
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Pre-conditions: A Ns instance is instantiated, a bad filter parameter (filter parameters are listed in Table 6.4.2.3.2-1  - ETSI GS NFV-SOL 005 [3] v2.7.1).
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none.
     ...    Post-Conditions: none.
@@ -51,8 +51,8 @@ GET information about multiple NS instances Bad Request Invalid attribute select
     [Documentation]    Test ID: 5.3.2.1.4
     ...    Test title: GET information about multiple NS instances Bad Request Invalid attribute selector
     ...    Test objective: The objective is to test the retrieval of all the available NS Instances using attribute-based filter and perform a JSON schema and content validation of the collected instance data structure
-    ...    Pre-conditions: A Ns instance is instantiated,  a bad attribute selector (attribute selectors are listed in Table 6.4.2.3.2-1  - ETSI GS NFV-SOL 005 [3] v2.6.1).
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Pre-conditions: A Ns instance is instantiated,  a bad attribute selector (attribute selectors are listed in Table 6.4.2.3.2-1  - ETSI GS NFV-SOL 005 [3] v2.7.1).
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none.
     ...    Post-Conditions: none.
@@ -64,7 +64,7 @@ GET NSInstances with "all_fields" attribute selector
     ...    Test title: GET NSInstances with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active NSInstances with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -77,7 +77,7 @@ GET NSInstances with "exclude_default" attribute selector
     ...    Test title: GET NSInstances with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve the list of active NSInstances with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -90,7 +90,7 @@ GET NSInstances with "fields" attribute selector
     ...    Test title: GET NSInstances with "fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active NSInstances with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -103,7 +103,7 @@ GET NSInstances with "exclude_fields" attribute selector
     ...    Test title: GET NSInstances with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active NSInstances with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -116,7 +116,7 @@ PUT NSInstances - Method not implemented
     ...    Test title: PUT Individual NS instance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS instance is not modified by the operation
@@ -128,7 +128,7 @@ PATCH NSInstances - Method not implemented
     ...    Test title: PATCH NSInstances - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS instance is not modified by the operation
@@ -140,7 +140,7 @@ DELETE NSInstances - Method not implemented
     ...    Test title: DELETE NSInstances - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS instance is not deleted by the operation
@@ -152,7 +152,7 @@ GET information about multiple NS instances as Paged Response
     ...    Test title: GET information about multiple NS instances as Paged Response
     ...    Test objective: The objective is to test the retrieval of all the available NS Instances as a Paged Response.
     ...    Pre-conditions: An existing Ns instance.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none.
     ...    Post-Conditions: none.
@@ -164,8 +164,8 @@ GET information about multiple NS instances - Bad Request Response too Big
     [Documentation]    Test ID: 5.3.2.1.13
     ...    Test title: GET information about multiple NS instances - Bad Request Response too Big
     ...    Test objective: The objective is to test the retrieval of all the available NS Instances fails because reponse is too big, and perform a JSON schema and content validation of the collected instance data structure
-    ...    Pre-conditions: A Ns instance is instantiated,  a bad attribute selector (attribute selectors are listed in Table 6.4.2.3.2-1  - ETSI GS NFV-SOL 005 [3] v2.6.1).
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Pre-conditions: A Ns instance is instantiated,  a bad attribute selector (attribute selectors are listed in Table 6.4.2.3.2-1  - ETSI GS NFV-SOL 005 [3] v2.7.1).
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none.
     ...    Post-Conditions: none.
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot b/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot
index 7256db753..3a6aa7eae 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot
@@ -12,7 +12,7 @@ POST NS LCM occurrences - Method not implemented
     ...    Test title: POST NS LCM occurrences - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -24,7 +24,7 @@ GET status information about multiple NS LCM occurrences
     ...    Test title: GET status information about multiple NS LCM occurrences
     ...    Test objective: The objective is to test that GET method returns a list of LCM occurrences of the NS
     ...    Pre-conditions: At least one LCM occurrences available in the NFVO
-    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -37,7 +37,7 @@ GET status information about multiple NS LCM occurrences Bad Request Invalid att
     ...    Test title: GET status information about multiple NS LCM occurrences Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to test that GET method fail because of wrong query parameter
     ...    Pre-conditions: At least one LCM occurrences available in the NFVO, Invalid filter parameter
-    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ GET status information about multiple NS LCM occurrences Bad Request Invalid att
     ...    Test title: GET status information about multiple NS LCM occurrences Bad Request Invalid attribute selector
     ...    Test objective: The objective is to test that GET method fail because of wrong attributes selector
     ...    Pre-conditions: At least one LCM occurrences available in the NFVO, Invalid attribute selector
-    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -63,7 +63,7 @@ GET status information about multiple NS LCM occurrences with "all_fields"
     ...    Test title: GET status information about multiple NS LCM occurrences with "all_fields"
     ...    Test objective: The objective is to test that GET method returns a list of LCM occurrences of the NS
     ...    Pre-conditions: At least one LCM occurrences available in the NFVO
-    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -76,7 +76,7 @@ GET status information about multiple NS LCM occurrences with "exclude_default"
     ...    Test title: GET status information about multiple NS LCM occurrences with "exclude_default"
     ...    Test objective: The objective is to test that GET method returns a list of LCM occurrences of the NS
     ...    Pre-conditions: At least one LCM occurrences available in the NFVO
-    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -89,7 +89,7 @@ GET status information about multiple NS LCM occurrences with "fields"
     ...    Test title: GET status information about multiple NS LCM occurrences with "fields"
     ...    Test objective: The objective is to test that GET method returns a list of LCM occurrences of the NS
     ...    Pre-conditions: At least one LCM occurrences available in the NFVO
-    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -102,7 +102,7 @@ GET status information about multiple NS LCM occurrences with "exclude_fields"
     ...    Test title: GET status information about multiple NS LCM occurrences with "exclude_fields"
     ...    Test objective: The objective is to test that GET method returns a list of LCM occurrences of the NS
     ...    Pre-conditions: At least one LCM occurrences available in the NFVO
-    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -115,7 +115,7 @@ PUT status information about multiple NS LCM occurrences - Method not implemente
     ...    Test title: PUT status information about multiple NS LCM occurrences - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.9.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.9.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -127,7 +127,7 @@ PATCH status information about multiple NS LCM occurrences - Method not implemen
     ...    Test title: PATCH status information about multiple NS LCM occurrences - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.9.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.9.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -139,7 +139,7 @@ DELETE status information about multiple NS LCM occurrences - Method not impleme
     ...    Test title: DELETE status information about multiple NS LCM occurrences - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.9.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.9.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -151,7 +151,7 @@ GET status information about multiple NS LCM occurrences as Paged Response
     ...    Test title: GET status information about multiple NS LCM occurrences as Paged Reponse
     ...    Test objective: The objective is to test that GET method returns a list of LCM occurrences of the NS as paged response.
     ...    Pre-conditions: At least one LCM occurrences available in the NFVO
-    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -164,7 +164,7 @@ GET status information about multiple NS LCM occurrences - Bad Request Response
     ...    Test title: GET status information about multiple NS LCM occurrences - Bad Request Response too Big
     ...    Test objective: The objective is to test that GET method fail because response is too big, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: At least one LCM occurrences available in the NFVO, Invalid filter parameter
-    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot b/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot
index 628bbdf57..9290ef85e 100644
--- a/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot
+++ b/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot
@@ -13,7 +13,7 @@ NS LCM Operation Occurrence Start Notification
     ...    Test title: NS LCM Operation Occurrence Start Notification
     ...    Test objective: The objective is to test the dispatch of NS LCM Operation Occurrence Start Notification when a new NS LCM operation is started in the NFVO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A subscription for NS LCM Operation Occurrence notifications is available in the NFVO.
-    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -27,7 +27,7 @@ NS LCM Operation Occurrence Result Notification
     ...    Test title: NS LCM Operation Occurrence Result Notification
     ...    Test objective: The objective is to test the dispatch of NS LCM Operation Occurrence Result Notification when a NS LCM operation is completed in the NFVO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: An NS LCM operation is in progress, and a subscription for NS LCM Operation Occurrence notifications is available in the NFVO.
-    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -41,7 +41,7 @@ NS Identifier Creation Notification
     ...    Test title: NS Identifier Creation Notification
     ...    Test objective: The objective is to test the dispatch of NS Identifier Creation Notification when a new NS instance resource is created in the NFVO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A subscription for NS identifier creation notifications is available in the NFVO.
-    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -54,7 +54,7 @@ NS Identifier Deletion Notification
     ...    Test title: NS Identifier Deletion Notification
     ...    Test objective: The objective is to test the dispatch of NS Identifier Deletion Notification when a NS instance resource is deleted in the NFVO, and perform a JSON schema and content validation of the delivered notification.The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A NS instance resource is created, and a subscription for NS identifier creation notifications is available in the NFVO.
-    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot b/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot
index c25513fbc..df82b33f3 100644
--- a/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot
@@ -13,7 +13,7 @@ Post Retry operation task
     ...    Test title: Post Retry operation task
     ...    Test objective: The objective is to test that POST method trigger a retry of NS lifecycle operation in case of temporary failure
     ...    Pre-conditions: NS instance status equal to FAILED_TEMP
-    ...    Reference: Clause 6.4.11.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.11.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: NS instance status not equal to FAILED_TEMP
@@ -27,7 +27,7 @@ Post Retry operation task Not Found
     ...    Test title: Post Retry operation task Not Found
     ...    Test objective: The objective is to test that POST method fail in case of NS lifecycle operation not found
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.11.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.11.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -40,7 +40,7 @@ Post Retry operation task Conflict
     ...    Test title: Post Retry operation task Conflict
     ...    Test objective: The objective is to test that POST method fail in case of NS lifecycle operation status conflict (i.e.  NS instance status not equal to FAILED_TEMP)
     ...    Pre-conditions:  NS instance status not equal to FAILED_TEMP
-    ...    Reference: Clause 6.4.11.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.11.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -53,7 +53,7 @@ GET Retry operation task - Method not implemented
     ...    Test title: GET Retry operation task - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.11.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.11.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -65,7 +65,7 @@ PUT Retry operation task - Method not implemented
     ...    Test title: PUT Retry operation task - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.11.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.11.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -77,7 +77,7 @@ PATCH Retry operation task - Method not implemented
     ...    Test title: PATCH Retry operation task - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.11.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.11.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -89,7 +89,7 @@ DELETE Retry operation task - Method not implemented
     ...    Test title: DELETE Retry operation task - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.11.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.11.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot b/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot
index 3b09699e0..9fbbcfeb2 100644
--- a/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot
@@ -13,7 +13,7 @@ POST Rollback operation task
     ...    Test title: POST Rollback operation task
     ...    Test objective: The objective is to test that POST method triggers a rollback on the NS LCM operation
     ...    Pre-conditions: NS instance status equal to FAILED_TEMP
-    ...    Reference: Clause 6.4.12.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.12.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: NS instance status not equal to FAILED_TEMP    
@@ -26,7 +26,7 @@ POST Rollback operation task Not Found
     ...    Test title: POST Rollback operation task Not Found
     ...    Test objective: The objective is to test that POST method fails if  NS LCM operation is not found
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.12.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.12.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -39,7 +39,7 @@ POST Rollback operation task Conflict
     ...    Test title: POST Rollback operation task Conflict
     ...    Test objective: The objective is to test that POST method fail in case of NS LCM operation status conflict (i.e. NS instance status not equal to FAILED_TEMP)
     ...    Pre-conditions: NS instance status not equal to FAILED_TEMP
-    ...    Reference: Clause 6.4.12.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.12.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none      
@@ -52,7 +52,7 @@ GET Rollback operation task - Method not implemented
     ...    Test title: GET Rollback operation task - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.12.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.12.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ PUT Rollback operation task - Method not implemented
     ...    Test title: PUT Rollback operation task - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.12.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.12.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -76,7 +76,7 @@ PATCH Rollback operation task - Method not implemented
     ...    Test title: PATCH Rollback operation task - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.12.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.12.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -88,7 +88,7 @@ DELETE Rollback operation task - Method not implemented
     ...    Test title: DELETE Rollback operation task - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.12.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.12.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot b/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot
index 8343fa87b..03d2459e4 100644
--- a/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot
@@ -13,7 +13,7 @@ POST Scale a nsInstance
     ...    Test title: POST Scale a nsInstance
     ...    Test objective: The objective is to test that POST method scales NS instance
     ...    Pre-conditions: NS instance is INSTANTIATED state
-    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: NS instance is INSTANTIATED state and NS has been scaled
@@ -27,7 +27,7 @@ POST Scale a nsInstance - Conflict (Not Instantited)
     ...    Test title: POST Scale a nsInstance - Conflict (Not Instantited)
     ...    Test objective: The objective is to test that POST method cannot scale NS instance because of conflict in resource status (i.e. because the resource is in  NOT_INSTANTIATED state)
     ...    Pre-conditions: NS instance is in NOT_INSTANTIATED state.
-    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The Scale NS operation is not triggered on the NFVO
@@ -40,7 +40,7 @@ GET Scale NSInstance- Method not implemented
     ...    Test title: GET Scale NSInstance- Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -52,7 +52,7 @@ PUT Scale NSInstance - Method not implemented
     ...    Test title: PUT Scale NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ PATCH Scale NSInstance - Method not implemented
     ...    Test title: PATCH Scale NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -76,7 +76,7 @@ DELETE Scale NSInstance - Method not implemented
     ...    Test title: DELETE Scale NSInstance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSLifecycleManagement-API/ScaleNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/ScaleNSTaskWorkflow.robot
index bdcf5e86a..dd49111b0 100644
--- a/SOL005/NSLifecycleManagement-API/ScaleNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/ScaleNSTaskWorkflow.robot
@@ -14,7 +14,7 @@ Scale Flow of NS lifecycle management operations
     ...    Test title: Instantiate Flow of NS lifecycle management operations
     ...    Test objective: The objective is to test the workflow for Instantiate a NS instance
     ...    Pre-conditions: the resource is in NOT_INSTANTIATED state
-    ...    Reference: Clause 6.4.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: the resource is in INSTANTIATED state    
diff --git a/SOL005/NSLifecycleManagement-API/Subscriptions.robot b/SOL005/NSLifecycleManagement-API/Subscriptions.robot
index 5b4916c93..ff62a7c04 100644
--- a/SOL005/NSLifecycleManagement-API/Subscriptions.robot
+++ b/SOL005/NSLifecycleManagement-API/Subscriptions.robot
@@ -12,7 +12,7 @@ POST Create a new subscription
     ...    Test title: POST Create a new subscription
     ...    Test objective: The objective is to test that POST method create a subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.16.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.16.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: subscription is created in the NFVO     
@@ -27,7 +27,7 @@ POST Create a new Subscription - DUPLICATION
     ...    Test title: POST Create a new subscription - DUPLICATION
     ...    Test objective: The objective is to test that POST method create a duplicate subscription 
     ...    Pre-conditions: a subscription shall already exist
-    ...    Reference: Clause 6.4.16.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.16.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: duplication supported by NFVO
     ...    Post-Conditions: duplicate subscription is created in the NFVO     
@@ -41,7 +41,7 @@ POST Create a new Subscription - NO-DUPLICATION
     ...    Test title: POST Create a new subscription - NO-DUPLICATION
     ...    Test objective: The objective is to test that POST method cannot create a duplicate subscription 
     ...    Pre-conditions: a subscription shall already exist
-    ...    Reference: Clause 6.4.16.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.16.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: duplication NOT supported by NFVO
     ...    Post-Conditions: duplicate subscription is not created in the NFVO     
@@ -54,7 +54,7 @@ GET Subscriptions
     ...    Test title: GET Subscriptions
     ...    Test objective: The objective is to test that GET method  retrieve the list of existing subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -67,7 +67,7 @@ GET Subscription - Filter
     ...    Test title: GET Subscription - Filter
     ...    Test objective: The objective is Get the list of active subscriptions using a filter
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -80,7 +80,7 @@ GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test title: GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is Get the list of active subscriptions using an invalid filter
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -93,7 +93,7 @@ GET subscriptions with "all_fields" attribute selector
     ...    Test title: GET subscriptions with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -106,7 +106,7 @@ GET subscriptions with "exclude_default" attribute selector
     ...    Test title: GET subscriptions with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -119,7 +119,7 @@ GET subscriptions with "fields" attribute selector
     ...    Test title: GET subscriptions with "fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -132,7 +132,7 @@ GET subscriptions with "exclude_fields" attribute selector
     ...    Test title: GET subscriptions with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -145,7 +145,7 @@ PUT subscriptions - Method not implemented
     ...    Test title: PUT subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method cannot modify a NS lifecycle management subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.16.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.16.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -157,7 +157,7 @@ PATCH subscriptions - Method not implemented
     ...    Test title: PATCH subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method cannot modify a NS lifecycle management subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.16.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.16.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -169,7 +169,7 @@ DELETE subscriptions - Method not implemented
     ...    Test title: DELETE subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method cannot modify a NS lifecycle management subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.16.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.16.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: Subscription is not deleted
@@ -181,7 +181,7 @@ GET Subscriptions as Paged Response
     ...    Test title: GET Subscriptions as Paged Response
     ...    Test objective: The objective is to test that GET method  retrieve the list of existing subscriptions as paged response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -194,7 +194,7 @@ GET subscriptions - Bad Request Response too Big
     ...    Test title: GET subscriptions - Bad Request Response too Big
     ...    Test objective: The objective is test that the retrieval of active subscriptions list fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
index f04165ec2..942c47487 100644
--- a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
@@ -12,7 +12,7 @@ POST Terminate a NSInstance
     ...    Test title: POST Terminate a NSInstance
     ...    Test objective: The objective is to test that POST method terminate the NS
     ...    Pre-conditions: NS instance in INSTANTIATED state
-    ...    Reference: Clause 6.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: NS instance has NOT_INSTANTIATED state
@@ -26,7 +26,7 @@ POST Terminate a NSInstance - Conflict (Not Instantited)
     ...    Test title: POST Terminate a NSInstance - Conflict (Not Instantited)
     ...    Test objective: The objective is to test that POST method cannot terminate the NS because of conflict in resource status (i.e. the resource is not in INSTANTIATED state) 
     ...    Pre-conditions: NS instance is in NOT_INSTANTIATED state
-    ...    Reference: Clause 6.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: NS instance is in NOT_INSTANTIATED state
@@ -40,7 +40,7 @@ GET Terminate NSInstance- Method not implemented
     ...    Test title: GET Terminate NSInstance- Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -52,7 +52,7 @@ PUT Terminate NSInstance - Method not implemented
     ...    Test title: PUT Terminate NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.8.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.8.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: resource state not modified
@@ -64,7 +64,7 @@ PATCH Terminate NSInstance - Method not implemented
     ...    Test title: PATCH Terminate NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.8.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.8.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: resource state not modified
@@ -76,7 +76,7 @@ DELETE Terminate NSInstance - Method not implemented
     ...    Test title: DELETE Terminate NSInstance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.8.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.8.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: resource state not modified
diff --git a/SOL005/NSLifecycleManagement-API/TerminateNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/TerminateNSTaskWorkflow.robot
index fe25b1042..802a35ac0 100644
--- a/SOL005/NSLifecycleManagement-API/TerminateNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/TerminateNSTaskWorkflow.robot
@@ -14,7 +14,7 @@ Terminate Flow of NS lifecycle management operations
     ...    Test title: Terminate Flow of NS lifecycle management operations
     ...    Test objective: The objective is to test the workflow for Terminate a NS instance
     ...    Pre-conditions: the resource is in INSTANTIATED state
-    ...    Reference: Clause 6.4.8 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.8 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: the resource is in NOT_INSTANTIATED state
diff --git a/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot b/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot
index bd9ebc651..171fac57a 100644
--- a/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot
@@ -13,7 +13,7 @@ POST Update a NSInstance
     ...    Test title: POST Update a NSInstance
     ...    Test objective: The objective is to test that POST method update a NS instance
     ...    Pre-conditions: An NS instance is in INSTANTIATED state
-    ...    Reference: Clause 6.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS instance is still INSTANTIATED and updated on the NFVO
@@ -26,7 +26,7 @@ POST Update a NSInstance - Conflict (Not Instantited)
     ...    Test title: POST Update a NSInstance - Conflict (Not Instantited)
     ...    Test objective: The objective is to test that POST method fail if a NS Instance is not existing or is in NOT_INSTANTIATED state
     ...    Pre-conditions: An NS instance is in INSTANTIATED state 
-    ...    Reference: Clause 6.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The  NS instance is not updated on the NFVO
@@ -39,7 +39,7 @@ GET Update NSInstance- Method not implemented
     ...    Test title: GET Update NSInstance- Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -51,7 +51,7 @@ PUT Update NSInstance - Method not implemented
     ...    Test title: PUT Update NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The  NS instance is not updated on the NFVO
@@ -63,7 +63,7 @@ PATCH Update NSInstance - Method not implemented
     ...    Test title: PATCH Update NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The  NS instance is not updated on the NFVO
@@ -75,7 +75,7 @@ DELETE Update NSInstance - Method not implemented
     ...    Test title: DELETE Update NSInstance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The  NS instance is not deleted on the NFVO
diff --git a/SOL005/NSLifecycleManagement-API/UpdateNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/UpdateNSTaskWorkflow.robot
index 053c7b382..f64a83120 100644
--- a/SOL005/NSLifecycleManagement-API/UpdateNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/UpdateNSTaskWorkflow.robot
@@ -14,7 +14,7 @@ Update Flow of NS lifecycle management operations
     ...    Test title: Update Flow of NS lifecycle management operations
     ...    Test objective: The objective is to test the workflow for Update a NS instance
     ...    Pre-conditions: the resource is in INSTANTIATED state
-    ...    Reference: Clause 6.4.6 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.6 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: the resource is in INSTANTIATED state
-- 
GitLab


From a27bc07dc347a534f27e8f2c77c20d7114a234d2 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 14 Oct 2020 11:53:23 +0500
Subject: [PATCH 089/322] reference updated

---
 .../ApiVersion.robot                          | 20 ++++++-------
 .../IndividualPmJob.robot                     | 14 +++++-----
 .../IndividualReport.robot                    | 12 ++++----
 .../IndividualSubscription.robot              | 14 +++++-----
 .../IndividualThreshold.robot                 | 14 +++++-----
 .../Notifications.robot                       |  4 +--
 .../NSPerformanceManagement-API/PMJobs.robot  | 28 +++++++++----------
 .../Subscriptions.robot                       | 24 ++++++++--------
 .../Thresholds.robot                          | 20 ++++++-------
 9 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/SOL005/NSPerformanceManagement-API/ApiVersion.robot b/SOL005/NSPerformanceManagement-API/ApiVersion.robot
index 17bbc85f4..c3232f1b2 100644
--- a/SOL005/NSPerformanceManagement-API/ApiVersion.robot
+++ b/SOL005/NSPerformanceManagement-API/ApiVersion.robot
@@ -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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL005/NSPerformanceManagement-API/IndividualPmJob.robot b/SOL005/NSPerformanceManagement-API/IndividualPmJob.robot
index 818dc1368..7ab7999b9 100644
--- a/SOL005/NSPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL005/NSPerformanceManagement-API/IndividualPmJob.robot
@@ -12,7 +12,7 @@ GET individual NS Performance Job
     ...    Test title: Get individual NS Performance Job
     ...    Test objective: The objective is to test the retrieval of an individual NS Performance monitoring job and perform a JSON schema and content validation of the collected job data structure
     ...    Pre-conditions: A NS instance is instantiated. One or more NS Performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -26,7 +26,7 @@ GET individual NS Performance Job with invalid resource identifier
     ...    Test title: Get individual NS Performance Job with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual NS Performance monitoring job fails when using an invalid resource identifier, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A NS instance is instantiated. One or more NS Performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +39,7 @@ DELETE Individual NS Performance Job with invalid resource identifier
     ...    Test title: Delete individual NS Performance Job with invalid resource identifier
     ...    Test objective: The objective is to test that the deletion of an individual NS Performance monitoring job fails when using an invalid resource identifier
     ...    Pre-conditions: A NS instance is instantiated. One or more NS Performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -51,7 +51,7 @@ POST Individual NS Performance Job - Method not implemented
     ...    Test title: POST Individual NS Performance Job - method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new NS Performance Monitoring Job
     ...    Pre-conditions: A NS instance is instantiated
-    ...    Reference: Clause 7.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -63,7 +63,7 @@ PUT Individual NS Performance Job - Method not implemented
     ...    Test title: PUT Individual NS Performance Job - method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing NS Performance Monitoring Job
     ...    Pre-conditions: A NS instance is instantiated. One or more NS Performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -75,7 +75,7 @@ PATCH Individual NS Performance Job - Method not implemented
     ...    Test title: PATCH Individual NS Performance Job - method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing new NS Performance Monitoring Job
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -87,7 +87,7 @@ DELETE Individual NS Performance Job
     ...    Test title: Delete Individual NS Performance Job
     ...    Test objective: The objective is to test the deletion of an individual NS Performance monitoring job
     ...    Pre-conditions: A NS instance is instantiated. One or more NS Performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS Performance Job is no more available in the NFVO    
diff --git a/SOL005/NSPerformanceManagement-API/IndividualReport.robot b/SOL005/NSPerformanceManagement-API/IndividualReport.robot
index 53926a226..b79aee7dc 100644
--- a/SOL005/NSPerformanceManagement-API/IndividualReport.robot
+++ b/SOL005/NSPerformanceManagement-API/IndividualReport.robot
@@ -12,7 +12,7 @@ Get Individual Performance Report
     ...    Test title: Get Individual Performance Report
     ...    Test objective: The objective is to test the retrieval of an individual NS performance report associated to a monitoring job and perform a JSON schema validation of the collected report data structure
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance reports are set for a monitoring job in the NFVO.
-    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ Get Individual Performance Report with invalid resource endpoint
     ...    Test title: Get Individual Performance Report with invalid resource endpoint
     ...    Test objective:  The objective is to test that the retrieval of an individual NS performance report associated to a monitoring job fails when using an invalid resource endpoint 
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance reports are set for a monitoring job in the NFVO.
-    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -37,7 +37,7 @@ POST Individual Performance Report - Method not implemented
     ...    Test title: POST Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new NS performance report within a monitoring job
     ...    Pre-conditions: A NS instance is instantiated.
-    ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS performance report is not created on the NFVO
@@ -50,7 +50,7 @@ PUT Individual Performance Report - Method not implemented
     ...    Test title: PUT Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing NS performance report within a monitoring job
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance reports are set for a monitoring job in the NFVO.
-    ...    Reference: Clause 7.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS performance report is not modified by the operation
@@ -63,7 +63,7 @@ PATCH Individual Performance Report - Method not implemented
     ...    Test title: PATCH Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing NS performance report within a monitoring job
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance reports are set for a monitoring job in the NFVO.
-    ...    Reference: Clause 7.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS performance report is not modified by the operation
@@ -76,7 +76,7 @@ DELETE Individual Performance Report - Method not implemented
     ...    Test title: DELETE Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing NS performance report within a monitoring job
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance reports are set for a monitoring job in the NFVO.
-    ...    Reference: Clause 7.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS performance report is not deleted by the operation
diff --git a/SOL005/NSPerformanceManagement-API/IndividualSubscription.robot b/SOL005/NSPerformanceManagement-API/IndividualSubscription.robot
index 1ceeaea22..02370945f 100644
--- a/SOL005/NSPerformanceManagement-API/IndividualSubscription.robot
+++ b/SOL005/NSPerformanceManagement-API/IndividualSubscription.robot
@@ -16,7 +16,7 @@ GET Individual NS Performance Subscription
     ...    Test title: GET Individual NS Performance Subscription
     ...    Test objective: The objective is to test the retrieval of individual NS Performance subscription and perform a JSON schema and content validation of the returned subscription data structure
     ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -30,7 +30,7 @@ GET Individual NS Performance Subscription with invalid resource identifier
     ...    Test title: GET Individual NS Performance Subscription with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual NS Performance subscription fails when using an invalid resource identifier
     ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -42,7 +42,7 @@ DELETE Individual NS Performance Subscription with invalid resource identifier
     ...    Test title: DELETE Individual NS Performance Subscription with invalid resource identifier
     ...    Test objective: The objective is to test that the deletion of an individual NS Performance subscription fails when using an invalid resource identifier
     ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.8.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.8.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -54,7 +54,7 @@ POST Individual NS Performance Subscription - Method not implemented
     ...    Test title: POST Individual NS Performance Subscription - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new NS Performance Subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS Performance Subscription is not created on the NFVO
@@ -67,7 +67,7 @@ PUT Individual NS Performance Subscription - Method not implemented
     ...    Test title: PUT Individual NS Performance Subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing NS Performance subscription
     ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.8.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.8.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS Performance subscription is not modified by the operation
@@ -80,7 +80,7 @@ PATCH Individual NS Performance Subscription - Method not implemented
     ...    Test title: PATCH Individual NS Performance Subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing NS Performance subscription
     ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.8.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.8.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS Performance subscription is not modified by the operation
@@ -93,7 +93,7 @@ DELETE Individual NS Performance Subscription
     ...    Test title: DELETE Individual NS Performance Subscription
     ...    Test objective: The objective is to test the deletion of an individual NS Performance subscription
     ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.8.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.8.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS Performance Subscription is not available anymore in the NFVO    
diff --git a/SOL005/NSPerformanceManagement-API/IndividualThreshold.robot b/SOL005/NSPerformanceManagement-API/IndividualThreshold.robot
index 6b3a5c245..2be5fdb3e 100644
--- a/SOL005/NSPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL005/NSPerformanceManagement-API/IndividualThreshold.robot
@@ -14,7 +14,7 @@ GET Individual Threshold
     ...    Test title: GET Individual Threshold
     ...    Test objective: The objective is to test the retrieval of an individual NS performance threshold and perform a JSON schema and content validation of the collected threshold data structure
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -28,7 +28,7 @@ GET Individual Threshold with invalid resource identifier
     ...    Test title: GET Individual Threshold with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual NS performance threshold fails when using an invalid resource identifier
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -40,7 +40,7 @@ DELETE Individual Threshold with invalid resource identifier
     ...    Test title: DELETE Individual Threshold with invalid resource identifier
     ...    Test objective: The objective is to test the deletion of an individual NS performance threshold
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -52,7 +52,7 @@ POST Individual Threshold - Method not implemented
     ...    Test title: POST Individual Threshold - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new NS performance Threshold
     ...    Pre-conditions: A NS instance is instantiated
-    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS performance Threshold is not created on the NFVO
@@ -65,7 +65,7 @@ PUT Individual Threshold - Method not implemented
     ...    Test title: PUT Individual Threshold - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing NS performance threshold
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS performance Threshold is not modified by the operation
@@ -78,7 +78,7 @@ PATCH Individual Threshold - Method not implemented
     ...    Test title: PATCH Individual Threshold - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing NS performance threshold
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS performance Threshold is not modified by the operation
@@ -91,7 +91,7 @@ DELETE Individual Threshold
     ...    Test title: DELETE Individual Threshold
     ...    Test objective: The objective is to test the deletion of an individual NS performance threshold
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS performance Threshold is not available anymore in the NFVO    
diff --git a/SOL005/NSPerformanceManagement-API/Notifications.robot b/SOL005/NSPerformanceManagement-API/Notifications.robot
index fcc032436..4fb4b5de0 100644
--- a/SOL005/NSPerformanceManagement-API/Notifications.robot
+++ b/SOL005/NSPerformanceManagement-API/Notifications.robot
@@ -17,7 +17,7 @@ NS Performance Information Availability Notification
     ...    Test title: NS Performance Information Availability Notification
     ...    Test objective: The objective is to test the dispatch of NS Performance Information Availability Notification when new NS performance information is available in the NFVO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A NS performance job is created, and a subscription for information availability notifications is available in the NFVO.
-    ...    Reference: Clause 7.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -30,7 +30,7 @@ NS Threshold Crossed Notification
     ...    Test title: NS Threshold Crossed Notification
     ...    Test objective: The objective is to test the dispatch of NS Threshold Crossed Notification when a previously set NS performance metric threshold is crossed, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A NS performance job is created, and a threshold subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL005/NSPerformanceManagement-API/PMJobs.robot b/SOL005/NSPerformanceManagement-API/PMJobs.robot
index 2fcdc9a57..3665194be 100644
--- a/SOL005/NSPerformanceManagement-API/PMJobs.robot
+++ b/SOL005/NSPerformanceManagement-API/PMJobs.robot
@@ -14,7 +14,7 @@ GET all NS Performance Monitoring Jobs
     ...    Test title: GET all NS Performance Monitoring Jobs
     ...    Test objective: The objective is to test the retrieval of all the available NS performance monitoring jobs and perform a JSON schema and content validation of the collected jobs data structure
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -28,7 +28,7 @@ GET NS Performance Monitoring Jobs with attribute-based filter
     ...    Test title: GET all NS Performance Monitoring Jobs with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of NS performance monitoring jobs using attribute-based filter, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued attribute-based filter
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -42,7 +42,7 @@ GET all NS Performance Monitoring Jobs with "all_fields" attribute selector
     ...    Test title: GET all NS Performance Monitoring Jobs with "all_fields" attribute selector
     ...    Test objective: The objective is to test the retrieval of all NS performance monitoring jobs "all_fields" attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued "all_fileds" selector
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 4.3.3.2.1, 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 4.3.3.2.1, 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -56,7 +56,7 @@ GET all NS Performance Monitoring Jobs with "exclude_default" attribute selector
     ...    Test title: GET all NS Performance Monitoring Jobs with "exclude_default" attribute selector
     ...    Test objective: The objective is to test the retrieval of all NS performance monitoring jobs "exclude_default" attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued "exclude_default" selector
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 4.3.3.2.1, 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 4.3.3.2.1, 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -70,7 +70,7 @@ GET all NS Performance Monitoring Jobs with "include" attribute selector
     ...    Test title: GET all NS Performance Monitoring Jobs with "include" attribute selector
     ...    Test objective: The objective is to test the retrieval of all NS performance monitoring jobs "include" attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued "include" selector
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 4.3.3.2.1, 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 4.3.3.2.1, 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the use of "include" attribute selector
     ...    Post-Conditions: none
@@ -84,7 +84,7 @@ GET all NS Performance Monitoring Jobs with "exclude" attribute selector
     ...    Test title: GET all NS Performance Monitoring Jobs with exclude_fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all NS performance monitoring jobs "exclude" attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued "exclude" selector
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 4.3.3.2.1, 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 4.3.3.2.1, 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the use of "exclude" attribute selector
     ...    Post-Conditions: none
@@ -98,7 +98,7 @@ GET NS Performance Monitoring Jobs with invalid attribute-based filter
     ...    Test title: GET NS Performance Monitoring Jobs with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of NS performance monitoring jobs fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -111,7 +111,7 @@ GET NS Performance Monitoring Jobs with invalid resource endpoint
     ...    Test title: GET NS Performance Monitoring Jobs with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of NS performance monitoring jobs fails when using invalid resource endpoint
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -123,7 +123,7 @@ Create new NS Performance Monitoring Job
     ...    Test title:  Create a new NS Performance Monitoring Job
     ...    Test objective: The objective is to test the creation of a new NS performance monitoring job and perform the JSON schema validation of the returned job data structure
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS Performance Job is successfully created on the NFVO
@@ -137,7 +137,7 @@ PUT all NS Performance Monitoring Jobs - Method not implemented
     ...    Test title: PUT all NS Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify NS Performance Monitoring Jobs
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -149,7 +149,7 @@ PATCH all NS Performance Monitoring Jobs - Method not implemented
     ...    Test title: PATCH all NS Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update NS Performance Monitoring Jobs
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -161,7 +161,7 @@ DELETE all NS Performance Monitoring Jobs - Method not implemented
     ...    Test title: DELETE all NS Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete NS Performance Monitoring Jobs
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS Performance Monitoring Jobs are not deleted by the failed operation
@@ -174,7 +174,7 @@ GET all NS Performance Monitoring Jobs as Paged Response
     ...    Test title: GET all NS Performance Monitoring Jobs as Paged Response
     ...    Test objective: The objective is to test the retrieval of all the available NS performance monitoring jobs as paged response.
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -187,7 +187,7 @@ GET NS Performance Monitoring Jobs - Bad Request Response too Big
     ...    Test title: GET NS Performance Monitoring Jobs - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of NS performance monitoring jobs fails because reponse is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSPerformanceManagement-API/Subscriptions.robot b/SOL005/NSPerformanceManagement-API/Subscriptions.robot
index 7bfa09b4f..3f97d8afe 100644
--- a/SOL005/NSPerformanceManagement-API/Subscriptions.robot
+++ b/SOL005/NSPerformanceManagement-API/Subscriptions.robot
@@ -17,7 +17,7 @@ Get All NS Performance Subscriptions
     ...    Test title: Get All NS Performance Subscriptions
     ...    Test objective: The objective is to test the retrieval of all NS Performance subscriptions and perform a JSON schema validation of the returned subscriptions data structure
     ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -31,7 +31,7 @@ Get NS Performance Subscriptions with attribute-based filter
     ...    Test title: Get NS Performance Subscriptions with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of NS Performance subscriptions using attribute-based filter, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -46,7 +46,7 @@ Get NS Performance Subscriptions with invalid attribute-based filter
     ...    Test title: Get NS Performance Subscriptions with attribute-based filters
     ...    Test objective: The objective is to test that the retrieval of NS Performance subscriptions fails when using invalid attribute-based filters, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -60,7 +60,7 @@ GET NS Performance Subscription with invalid resource endpoint
     ...    Test title: GET NS Performance Subscription with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of all NS Performance subscriptions fails when using invalid resource endpoint.
     ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -73,7 +73,7 @@ Create new NS Performance subscription
     ...    Test title: Create new NS Performance subscription
     ...    Test objective: The objective is to test the creation of a new NS Performance subscription and perform a JSON schema and content validation of the returned subscription data structure
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS Performance subscription is successfully set and it matches the issued subscription
@@ -90,7 +90,7 @@ Create duplicated NS Performance subscription with NFVO not creating duplicated
     ...    Test title: Create duplicated NS Performance subscription with NFVO not creating duplicated subscriptions
     ...    Test objective: The objective is to test the attempt of a creation of a duplicated NS Performance subscription and check that no new subscription is created by the NFVO and a link to the original subscription is returned
     ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO does not support the creation of duplicated subscriptions
     ...    Post-Conditions: The existing NS Performance subscription returned is available in the NFVO
@@ -106,7 +106,7 @@ Create duplicated NS Performance subscription with NFVO creating duplicated subs
     ...    Test title: Create duplicated NS Performance subscription with NFVO creating duplicated subscriptions
     ...    Test objective: The objective is to test the creation of a duplicated NS Performance subscription and perform a JSON schema and content validation of the returned duplicated subscription data structure
     ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the creation of duplicated subscriptions
     ...    Post-Conditions: The duplicated NS Performance subscription is successfully set and it matches the issued subscription    
@@ -122,7 +122,7 @@ PUT NSD Performance Subscriptions - Method not implemented
     ...    Test title: PUT NS Performance Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify NS Performance subscriptions
     ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -135,7 +135,7 @@ PATCH NSD Performance Subscriptions - Method not implemented
     ...    Test title: PATCH NS Performance Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update NS Performance subscriptions
     ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -148,7 +148,7 @@ DELETE NSD Performance Subscriptions - Method not implemented
     ...    Test title: DELETE NS Performance Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete NS Performance subscriptions
     ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.7.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.7.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS Performance subscriptions are not deleted by the failed operation 
@@ -160,7 +160,7 @@ Get All NS Performance Subscriptions as Paged Response
     ...    Test title: Get All NS Performance Subscriptions as Paged Response
     ...    Test objective: The objective is to test the retrieval of all NS Performance subscriptions as paged response.
     ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -173,7 +173,7 @@ Get NS Performance Subscriptions - Bad Request Response too Big
     ...    Test title: Get NS Performance Subscriptions - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of NS Performance subscriptions fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSPerformanceManagement-API/Thresholds.robot b/SOL005/NSPerformanceManagement-API/Thresholds.robot
index 8affd84fe..a57d72fb5 100644
--- a/SOL005/NSPerformanceManagement-API/Thresholds.robot
+++ b/SOL005/NSPerformanceManagement-API/Thresholds.robot
@@ -14,7 +14,7 @@ GET All Performance Thresholds
     ...    Test title: GET All Performance Thresholds
     ...    Test objective: The objective is to test the retrieval of all the available NS performance thresholds and perform a JSON schema validation of the collected thresholds data structure
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ GET Performance Thresholds with attribute-based filter
     ...    Test title: GET Performance Thresholds with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of all the available NS performance thresholds when using attribute-based filters, perform a JSON schema validation of the collected thresholds data structure, and verify that the retrieved information matches the issued attribute-based filter
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ GET Performance Thresholds with invalid attribute-based filter
     ...    Test title: GET Performance Thresholds with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of NS performance thresholds fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -53,7 +53,7 @@ GET Performance Thresholds with invalid resource endpoint
     ...    Test title: GET Performance Thresholds with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of NS performance thresholds fails when using invalid resource endpoint, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -66,7 +66,7 @@ Create new Performance Threshold
     ...    Test title:  Create new Performance Threshold
     ...    Test objective: The objective is to test the creation of a new NS performance threshold and perform the JSON schema validation of the returned threshold data structure
     ...    Pre-conditions: A NS instance is instantiated.
-    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS performance Threshold is successfully created on the NFVO
@@ -81,7 +81,7 @@ PUT Performance Thresholds - Method not implemented
     ...    Test title: PUT Performance Thresholds - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify NS performance Thresholds
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -93,7 +93,7 @@ PATCH Performance Thresholds - Method not implemented
     ...    Test title: PATCH Performance Thresholds - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify NS performance Thresholds
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -105,7 +105,7 @@ DELETE Performance Thresholds - Method not implemented
     ...    Test title: DELETE Performance Thresholds - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to update NS performance Thresholds
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS performance thresholds are not deleted by the failed operation
@@ -118,7 +118,7 @@ GET All Performance Thresholds as Paged Response
     ...    Test title: GET All Performance Thresholds as Paged Response
     ...    Test objective: The objective is to test the retrieval of all the available NS performance thresholds as paged response.
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -131,7 +131,7 @@ GET Performance Thresholds - Bad Request Response too Big
     ...    Test title: GET Performance Thresholds - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of NS performance thresholds fails because reponse is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
-- 
GitLab


From 1ad31b69f5d548f45f882f3f7bdafa3df864e0fd Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 14 Oct 2020 11:56:28 +0500
Subject: [PATCH 090/322] reference updated

---
 SOL005/NSFaultManagement-API/Alarms.robot     | 42 +++++++++----------
 SOL005/NSFaultManagement-API/ApiVersion.robot | 20 ++++-----
 .../IndividualAlarm.robot                     | 16 +++----
 .../IndividualSubscription.robot              | 10 ++---
 .../NotificationEndpoint.robot                |  6 +--
 .../NSFaultManagement-API/Subscriptions.robot | 42 +++++++++----------
 6 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/SOL005/NSFaultManagement-API/Alarms.robot b/SOL005/NSFaultManagement-API/Alarms.robot
index 6b2f028e0..50f47bcd7 100644
--- a/SOL005/NSFaultManagement-API/Alarms.robot
+++ b/SOL005/NSFaultManagement-API/Alarms.robot
@@ -12,7 +12,7 @@ POST Alarms - Method not implemented
     ...    Test title:POST Alarms - Method not implemented
     ...    Test objective: The objective is to test that Post method is not allowed to create Fault management alarms on NFV
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none 
     ...    Post-Conditions:  alarm not created
@@ -24,7 +24,7 @@ GET information about multiple alarms
     ...    Test title: GET information about multiple alarms
     ...    Test objective: The objective is to retrieve information about the alarm list and perform a JSON schema and content validation of the returned alarms data structure
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -37,7 +37,7 @@ GET information about multiple alarms with filters
     ...    Test title: GET information about multiple alarms with filters
     ...    Test objective: The objective is to retrieve information about the alarm list and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ GET information about multiple alarms Bad Request Invalid attribute-based filter
     ...    Test title: GET information about multiple alarms Bad Request Invalid attribute-based filtering parameters
     ...    Test objective:  The objective is to try to retrieve information about the alarm list with invalid filters and perform a JSON schema and content validation of the returned problem details data structure
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions:  none
@@ -63,7 +63,7 @@ GET information about multiple alarms with "all_fields" attribute selector
     ...    Test title: GET information about multiple alarms with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: 
-    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -76,7 +76,7 @@ GET information about multiple alarms with exclude_default attribute selector
     ...    Test title: GET information about multiple alarms with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: 
-    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -90,7 +90,7 @@ GET information about multiple alarms with fields attribute selector
     ...    Test title: GET information about multiple alarms with fields attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: 
-    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -103,7 +103,7 @@ GET information about multiple alarms with "exclude_fields" attribute selector
     ...    Test title: GET information about multiple alarms with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: 
-    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: 
     ...    Post-Conditions: none
@@ -116,7 +116,7 @@ PUT Alarms - Method not implemented
     ...    Test title: PUT Alarms - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed for Fault management alarms on NFV
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -129,7 +129,7 @@ PATCH Alarms - Method not implemented
     ...    Test title: PATCH Alarms - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed for Fault management alarms on NFV
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -141,7 +141,7 @@ DELETE Alarms - Method not implemented
     ...    Test title: DELETE Alarms - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed for Fault management alarms on NFV
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: alarm not deleted
@@ -153,7 +153,7 @@ GET information about multiple alarms as Paged Response
     ...    Test title: GET information about multiple alarms as Paged Response
     ...    Test objective: The objective is to retrieve information about the alarm list as paged response.
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -166,7 +166,7 @@ GET information about multiple alarms - Bad Request Response too Big
     ...    Test title: GET information about multiple alarms - Bad Request Response too Big
     ...    Test objective:  The objective is to test that the retrieval of information about the alarm list fails because response is too big, and perform a JSON schema and content validation of the returned problem details data structure
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions:  none
@@ -179,7 +179,7 @@ GET information about multiple alarms with filter "id"
     ...    Test title: GET information about multiple alarms with filter "id"
     ...    Test objective: The objective is to retrieve information about the alarm list with filter "id" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -193,7 +193,7 @@ GET information about multiple alarms with filter "rootCauseFaultyComponent.faul
     ...    Test title: GET information about multiple alarms with filter "rootCauseFaultyComponent.faultyNestedNsInstanceId"
     ...    Test objective: The objective is to retrieve information about the alarm list with filter "rootCauseFaultyComponent.faultyNestedNsInstanceId" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -207,7 +207,7 @@ GET information about multiple alarms with filter "rootCauseFaultyComponent.faul
     ...    Test title: GET information about multiple alarms with filter "rootCauseFaultyComponent.faultyNsVirtualLinkInstanceId"
     ...    Test objective: The objective is to retrieve information about the alarm list with filter "rootCauseFaultyComponent.faultyNsVirtualLinkInstanceId" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -221,7 +221,7 @@ GET information about multiple alarms with filter "rootCauseFaultyComponent.faul
     ...    Test title: GET information about multiple alarms with filter "rootCauseFaultyComponent.faultyVnfInstanceId"
     ...    Test objective: The objective is to retrieve information about the alarm list with filter "rootCauseFaultyComponent.faultyVnfInstanceId" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -236,7 +236,7 @@ GET information about multiple alarms with filter "rootCauseFaultyResource.fault
     ...    Test title: GET information about multiple alarms with filter "rootCauseFaultyResource.faultyResourceType"
     ...    Test objective: The objective is to retrieve information about the alarm list with filter "rootCauseFaultyResource.faultyResourceType" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -250,7 +250,7 @@ GET information about multiple alarms with filter "eventType"
     ...    Test title: GET information about multiple alarms with filter "eventType"
     ...    Test objective: The objective is to retrieve information about the alarm list with filter "eventType" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -264,7 +264,7 @@ GET information about multiple alarms with filter "perceivedSeverity"
     ...    Test title: GET information about multiple alarms with filter "perceivedSeverity"
     ...    Test objective: The objective is to retrieve information about the alarm list with filter "perceivedSeverity" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -278,7 +278,7 @@ GET information about multiple alarms with filter "probableCause"
     ...    Test title: GET information about multiple alarms with filter "probableCause"
     ...    Test objective: The objective is to retrieve information about the alarm list with filter "probableCause" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
diff --git a/SOL005/NSFaultManagement-API/ApiVersion.robot b/SOL005/NSFaultManagement-API/ApiVersion.robot
index ed17827d7..18dc486a9 100644
--- a/SOL005/NSFaultManagement-API/ApiVersion.robot
+++ b/SOL005/NSFaultManagement-API/ApiVersion.robot
@@ -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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL005/NSFaultManagement-API/IndividualAlarm.robot b/SOL005/NSFaultManagement-API/IndividualAlarm.robot
index 50583cd9e..b6481159f 100644
--- a/SOL005/NSFaultManagement-API/IndividualAlarm.robot
+++ b/SOL005/NSFaultManagement-API/IndividualAlarm.robot
@@ -14,7 +14,7 @@ POST Individual Alarm - Method not implemented
     ...    Test title:POST Individual Alarm - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed for Fault management individual alarm on NFV
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions:  alarm is not created
@@ -26,7 +26,7 @@ GET information about Individual Alarm
     ...    Test title: GET information about Individual Alarm 
     ...    Test objective: The objective is to retrieve information about individual alarm and perform a JSON schema and content validation of the returned alarm data structure
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none   
@@ -39,7 +39,7 @@ GET information about Invalid Individual Alarm
     ...    Test title: GET information about Invalid Individual Alarm 
     ...    Test objective: The objective is to try to read an Invalid individual alarm and get 404 not found response code
     ...    Pre-conditions: The related alarm does not exists
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions:   none 
@@ -52,7 +52,7 @@ PUT Individual Alarm - Method not implemented
     ...    Test title:PUT Individual Alarm - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed for Fault management individual alarm on NFV
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions:   none
@@ -64,7 +64,7 @@ PATCH Alarm
     ...    Test title: Modify an individual alarm resource
     ...    Test objective: The objective is to Modify an individual alarm resource and perform a JSON schema and content validation of the returned alarm modifications data structure
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 8.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions:  none
@@ -77,7 +77,7 @@ PATCH Alarm - Conflict
     ...    Test title: Modify an individual alarm resource - Conflict
     ...    Test objective: The objective is to test that an individual alarm resource cannot be modified if the alarm is already in the state that is requested to be set
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 8.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -91,7 +91,7 @@ PATCH Alarm - Precondition failed
     ...    Test title: Modify an individual alarm resource - Precondition failed
     ...    Test objective: The objective is to test that an individual alarm resource cannot be modifed if the resource was modified by another entity
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 8.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: 
@@ -104,7 +104,7 @@ DELETE Individual Alarm - Method not implemented
     ...    Test title:DELETE Individual Alarm - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed for Fault management individual alarm on NFV
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: alarm not deleted
diff --git a/SOL005/NSFaultManagement-API/IndividualSubscription.robot b/SOL005/NSFaultManagement-API/IndividualSubscription.robot
index bada3922c..50ab67ca2 100644
--- a/SOL005/NSFaultManagement-API/IndividualSubscription.robot
+++ b/SOL005/NSFaultManagement-API/IndividualSubscription.robot
@@ -11,7 +11,7 @@ Post Individual Subscription - Method not implemented
     ...    Test title:Post Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed for Fault management subscription on NFV  
     ...    Pre-conditions:none 
-    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: subscription is not created
@@ -23,7 +23,7 @@ Get Information about an individual subscription
     ...    Test title: Get Information about an individual subscription
     ...    Test objective: The objective is to read an individual subscription for NFVO alarms subscribed by the client and perform a JSON schema and content validation of the returned fault management individual subscription data structure
     ...    Pre-conditions: The subscription with the given id exists
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -36,7 +36,7 @@ PUT an individual subscription - Method not implemented
     ...    Test title:PUT an individual subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed for Fault management subscription on NFV   
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -48,7 +48,7 @@ PATCH an individual subscription - Method not implemented
     ...    Test title:PATCH an individual subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed for Fault management subscription on NFV  
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -60,7 +60,7 @@ DELETE an individual subscription
     ...    Test title:DELETE an individual subscription
     ...    Test objective: The objective is to DELETE an individual subscription 
     ...    Pre-conditions: The Subsbcription already exists
-    ...    Reference: Clause 8.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: subscription is not deleted
diff --git a/SOL005/NSFaultManagement-API/NotificationEndpoint.robot b/SOL005/NSFaultManagement-API/NotificationEndpoint.robot
index 650bb2a7a..e256c9b9b 100644
--- a/SOL005/NSFaultManagement-API/NotificationEndpoint.robot
+++ b/SOL005/NSFaultManagement-API/NotificationEndpoint.robot
@@ -16,7 +16,7 @@ NS Fault Alarm Notification
     ...    Test title: NS Fault Alarm Notification
     ...    Test objective: The objective is to test the dispatch of NS Fault Alarm Notification when a virtualised resource within an NS instance fails, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A NS instance is instantiated, and a subscription for fault alarm notifications is available in the NFVO.
-    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -29,7 +29,7 @@ NS Fault Alarm Cleared Notification
     ...    Test title: NS Fault Alarm Cleared Notification
     ...    Test objective: The objective is to test the dispatch of NS Fault Alarm Cleared Notification when a faulty virtualised resource within an NS instance is cleared, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A NS instance is instantiated, a virtualised resource is in faulty state, and a subscription for fault alarm cleared notifications is available in the NFVO.
-    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -42,7 +42,7 @@ NS Fault Alarm List Rebuilt Notification
     ...    Test title: NS Fault Alarm List Rebuilt Notification 
     ...    Test objective: The objective is to test the dispatch of NS Fault Alarm List Rebuilt Notification when the NFVO decides to rebuild the list of its NS alarms, e.g. due to a corruption in the alarm storage, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A NS instance is instantiated, one or more virtualised resource are in faulty state, and a subscription for fault alarm list rebuilt notifications is available in the NFVO.
-    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL005/NSFaultManagement-API/Subscriptions.robot b/SOL005/NSFaultManagement-API/Subscriptions.robot
index 0fb8ac8ce..3fa988c74 100644
--- a/SOL005/NSFaultManagement-API/Subscriptions.robot
+++ b/SOL005/NSFaultManagement-API/Subscriptions.robot
@@ -13,7 +13,7 @@ Create a new alarm subscription
     ...    Test title: Create a new alarm subscription
     ...    Test objective: The objective is to create a new Fault management alarm subscriptions and perform a JSON schema and content validation of the returned fault management alarms subscription data structure
     ...    Pre-conditions: no subscription with the same filter and callbackUri exists
-    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -28,7 +28,7 @@ Create a new alarm subscription - DUPLICATION
     ...    Test title: Create a new alarm subscription - DUPLICATION
     ...    Test objective: The objective is to create a new subscription with the NFV allowing duplication and perform a JSON schema and content validation of the returned fault management alarms subscription data structure..
     ...    Pre-conditions: subscription with the same filter and callbackUri exists
-    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability: the NFVO allows creating a subscription resource if another subscription resource with the same filter and callbackUri already exists
     ...    Post-Conditions: none
@@ -42,7 +42,7 @@ Create a new alarm subscription - NO DUPLICATION
     ...    Test title: Create a new alarm subscription - NO DUPLICATION
     ...    Test objective: The objective is to create a new subscription with the NFV not allowing duplication and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: subscription with the same filter and callbackUri exists
-    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability: the NFVO decides to not create a duplicate subscription resource 
     ...    Post-Conditions: none
@@ -55,7 +55,7 @@ Retrieve a list of alarm subscriptions
     ...    Test title: Retrieve a list of alarm subscriptions
     ...    Test objective: The objective is to retrieve the list of active subscriptions and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -68,7 +68,7 @@ Retrieve a list of alarm subscriptions - Filter
     ...    Test title: Retrieve a list of alarm subscriptions - Filter
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -81,7 +81,7 @@ GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test title: GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test objective:The objective is to retrieve the list of active subscriptions with Invalid attribute-based filtering parameters and perform a JSON schema and content validation of the returned problem details data structure.
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:   none
     ...    Post-Conditions: none     
@@ -94,7 +94,7 @@ GET subscriptions with "all_fields" attribute selector
     ...    Test title: GET subscriptions with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -107,7 +107,7 @@ GET subscriptions with "exclude_default" attribute selector
     ...    Test title: GET subscriptions with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -120,7 +120,7 @@ GET subscriptions with "fields" attribute selector
     ...    Test title: GET subscriptions with "fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -133,7 +133,7 @@ GET subscriptions with "exclude_fields" attribute selector
     ...    Test title: GET subscriptions with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -146,7 +146,7 @@ PUT subscriptions - Method not implemented
     ...    Test title:PUT subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to for Fault management subscriptions on NFV 
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions:   none
@@ -158,7 +158,7 @@ PATCH subscriptions - Method not implemented
     ...    Test title:PATCH subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to for Fault management subscriptions on NFV  
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions:   none
@@ -170,7 +170,7 @@ DELETE subscriptions - Method not implemented
     ...    Test title: DELETE subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to for Fault management subscriptions on NFV 
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: subscription is not deleted
@@ -182,7 +182,7 @@ Retrieve a list of alarm subscriptions as Paged Response
     ...    Test title: Retrieve a list of alarm subscriptions as Paged Response
     ...    Test objective: The objective is to retrieve the list of active subscriptions as paged response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -195,7 +195,7 @@ GET subscriptions - Bad Request Response too Big
     ...    Test title: GET subscriptions - Bad Request Response too Big
     ...    Test objective:The objective is test that the retrieval of active subscriptions list fails because response is too big, and perform a JSON schema and content validation of the returned problem details data structure.
     ...    Pre-conditions:  none
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:   none
     ...    Post-Conditions: none     
@@ -208,7 +208,7 @@ Retrieve a list of alarm subscriptions with filter "id"
     ...    Test title: Retrieve a list of alarm subscriptions with filter "id"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "id" and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -222,7 +222,7 @@ Retrieve a list of alarm subscriptions with filter "filter.notificationTypes"
     ...    Test title: Retrieve a list of alarm subscriptions with filter "filter.notificationTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.notificationTypes" and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -236,7 +236,7 @@ Retrieve a list of alarm subscriptions with filter "filter.faultyResourceTypes"
     ...    Test title: Retrieve a list of alarm subscriptions with filter "filter.faultyResourceTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.faultyResourceTypes" and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -250,7 +250,7 @@ Retrieve a list of alarm subscriptions with filter "filter.perceivedSeverities"
     ...    Test title: Retrieve a list of alarm subscriptions with filter "filter.perceivedSeverities"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.perceivedSeverities" and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -264,7 +264,7 @@ Retrieve a list of alarm subscriptions with filter "filter.eventTypes"
     ...    Test title: Retrieve a list of alarm subscriptions with filter "filter.eventTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.eventTypes" and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -278,7 +278,7 @@ Retrieve a list of alarm subscriptions with filter "filter.probableCauses"
     ...    Test title: Retrieve a list of alarm subscriptions with filter "filter.probableCauses"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.probableCauses" and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
-- 
GitLab


From 8aca3a66862e82ed7b5d36c8762e5f63474163b8 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 14 Oct 2020 11:58:35 +0500
Subject: [PATCH 091/322] reference updated

---
 .../VNFPackageManagement-API/ApiVersion.robot | 20 ++++++------
 .../IndividualSubscription.robot              | 14 ++++----
 .../IndividualVNFPackage.robot                | 22 ++++++-------
 .../Notifications.robot                       |  6 ++--
 .../Subscriptions.robot                       | 22 ++++++-------
 .../VNFDInIndividualVNFPackage.robot          | 22 ++++++-------
 .../VNFPackageArtifacts.robot                 | 22 ++++++-------
 .../VNFPackageContent.robot                   | 22 ++++++-------
 .../VNFPackageContentViaURI.robot             | 12 +++----
 .../VNFPackages.robot                         | 32 +++++++++----------
 10 files changed, 97 insertions(+), 97 deletions(-)

diff --git a/SOL005/VNFPackageManagement-API/ApiVersion.robot b/SOL005/VNFPackageManagement-API/ApiVersion.robot
index 609a71d1a..942147599 100644
--- a/SOL005/VNFPackageManagement-API/ApiVersion.robot
+++ b/SOL005/VNFPackageManagement-API/ApiVersion.robot
@@ -12,7 +12,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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -24,7 +24,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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -37,7 +37,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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -49,7 +49,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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -61,7 +61,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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -73,7 +73,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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -85,7 +85,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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -98,7 +98,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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -110,7 +110,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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -122,7 +122,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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL005/VNFPackageManagement-API/IndividualSubscription.robot b/SOL005/VNFPackageManagement-API/IndividualSubscription.robot
index c72164f90..49da09d46 100644
--- a/SOL005/VNFPackageManagement-API/IndividualSubscription.robot
+++ b/SOL005/VNFPackageManagement-API/IndividualSubscription.robot
@@ -12,7 +12,7 @@ GET Individual VNF Package Subscription
     ...    Test title: GET Individual VNF Package Subscription
     ...    Test objective: The objective is to test the retrieval of individual VNF package subscription and perform a JSON schema and content validation of the returned subscription data structure
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -26,7 +26,7 @@ GET Individual VNF Package Subscription with invalid resource identifier
     ...    Test title: GET Individual VNF Package Subscription with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package subscription fails when using an invalid resource identifier
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -38,7 +38,7 @@ DELETE Individual VNF Package Subscription with invalid resource identifier
     ...    Test title: DELETE Individual VNF Package Subscription with invalid resource identifier
     ...    Test objective: The objective is to test that the deletion of an individual VNF package subscription fails when using an invalid resource identifier
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.9.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.9.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -50,7 +50,7 @@ POST Individual VNF Package Subscription - Method not implemented
     ...    Test title: POST Individual VNF Package Subscription - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF Package Subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -62,7 +62,7 @@ PUT Individual VNF Package Subscription - Method not implemented
     ...    Test title: PUT Individual VNF Package Subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF Package subscription
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.9.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.9.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -74,7 +74,7 @@ PATCH Individual VNF Package Subscription - Method not implemented
     ...    Test title: PATCH Individual VNF Package Subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing VNF Package subscription
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.9.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.9.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -86,7 +86,7 @@ DELETE Individual VNF Package Subscription
     ...    Test title: DELETE Individual VNF Package Subscription
     ...    Test objective: The objective is to test the deletion of an individual VNF package subscription
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.9.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.9.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package Subscription is not available anymore in the NFVO    
diff --git a/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot b/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot
index f47c41c4d..b14a4142f 100644
--- a/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot
+++ b/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot
@@ -11,7 +11,7 @@ GET Individual VNF Package
     ...    Test title: GET Individual VNF Package
     ...    Test objective: The objective is to test the retrieval of an individual VNF package information perform a JSON schema validation of the collected data structure
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ GET Individual VNF Package with invalid resource identifier
     ...    Test title: GET Individual VNF Package with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package fails when using an invalid resource identifier
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -37,7 +37,7 @@ POST Individual VNF Package - Method not implemented
     ...    Test title: POST Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new VNF Package
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -49,7 +49,7 @@ PUT Individual VNF Package - Method not implemented
     ...    Test title: PUT Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNF Package
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -61,7 +61,7 @@ Disable Individual VNF Package
     ...    Test title: Disable Individual VNF Package  
     ...    Test objective: The objective is to test the disabling of an individual VNF Package  and perform a JSON schema and content validation of the collected data structure
     ...    Pre-conditions: One or more VNF Packages are onboarded in the NFVO in ENABLED operational state.
-    ...    Reference: Clause 9.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package is in operational state DISABLED
@@ -75,7 +75,7 @@ Disable Individual VNF Package with conflict due to operational state DISABLED
     ...    Test title: Disable Individual VNF Package with conflict due to operational state DISABLED
     ...    Test objective: The objective is to test that disabling an individual VNF Package that is already in DISABLED operational state fails and perform a JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more VNF Packages are onboarded in the NFVO in DISABLED operational state (Test ID 5.3.5.2.5).
-    ...    Reference: Clause 9.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -88,7 +88,7 @@ Enable Individual VNF Package
     ...    Test title: Enable Individual VNF Package
     ...    Test objective: The objective is to test the enabling of an individual VNF Package and perform a JSON schema and content validation of the collected data structure
     ...    Pre-conditions: One or more VNF Packages are onboarded in the NFVO in DISABLED operational state (Test ID 5.3.5.2.5).
-    ...    Reference: Clause 9.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package is in operational state ENABLED
@@ -102,7 +102,7 @@ Enable Individual VNF Package with conflict due to operational state ENABLED
     ...    Test title: Enable Individual VNF Package with conflict due to operational state ENABLED
     ...    Test objective: The objective is to test that enabling an individual VNF Package that is already in ENABLED operational state fails and perform a JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more VNF Packages are onboarded in the NFVO in ENABLED operational state (Test ID 5.3.5.2.7).
-    ...    Reference: Clause 9.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -115,7 +115,7 @@ DELETE Individual VNF Package
     ...    Test title: DELETE Individual VNF Package
     ...    Test objective: The objective is to test the deletion of an individual VNF Package
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO in DISABLED operational state
-    ...    Reference: Clause 9.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package is not available anymore in the NFVO 
@@ -128,7 +128,7 @@ DELETE Individual VNF Package in operational state ENABLED
     ...    Test title:  DELETE Individual VNF Package in operational state ENABLED
     ...    Test objective: The objective is to test that the deletion of an individual VNF Package in operational state ENABLED fails. The test also performs a JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: One or more VNF Package are onboarded in the NFVO in ENABLED operational state (Test ID 5.3.1.2.7).
-    ...    Reference: Clause 9.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package is not deleted by the failed operation. 
@@ -142,7 +142,7 @@ DELETE Individual VNF Package used for instantiated VNF instances
     ...    Test title:  DELETE Individual VNF Package used for instantiated VNF instances
     ...    Test objective: The objective is to test that the deletion of an individual VNF Package that is used in instantiated VNF instances fails. The test also performs a JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: One or more VNF instances are instantiated based on the concerned VNF package.
-    ...    Reference: Clause 9.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package is not deleted by the failed operation. 
diff --git a/SOL005/VNFPackageManagement-API/Notifications.robot b/SOL005/VNFPackageManagement-API/Notifications.robot
index fefa8c79b..ac66428ec 100644
--- a/SOL005/VNFPackageManagement-API/Notifications.robot
+++ b/SOL005/VNFPackageManagement-API/Notifications.robot
@@ -16,7 +16,7 @@ VNF Package Onboarding Notification
     ...    Test title: VNF Package Onboarding Notification
     ...    Test objective: The objective is to test the dispatch of VNF Package Onboarding notification when the VNF package onboarding operation is successfully completed, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF package subscription for onboarding notifications is available in the NFVO.
-    ...    Reference: Clause 9.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -29,7 +29,7 @@ VNF Package Operational State Change Notification
     ...    Test title: VNF Package Operational State Change Notification
     ...    Test objective: The objective is to test the dispatch of VNF Package Change notification when the VNF package operational state is modified, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF package subscription for change notifications is available in the NFVO.
-    ...    Reference: Clause 9.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -43,7 +43,7 @@ VNF Package Deletion Notification
     ...    Test title: VNF Package Deletion Notification
     ...    Test objective: The objective is to test the dispatch of VNF Package Change notification when the VNF package is deleted on the NFVO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF package subscription for change notifications is available in the NFVO.
-    ...    Reference: Clause 9.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL005/VNFPackageManagement-API/Subscriptions.robot b/SOL005/VNFPackageManagement-API/Subscriptions.robot
index 8ca89778a..4ea7e9d35 100644
--- a/SOL005/VNFPackageManagement-API/Subscriptions.robot
+++ b/SOL005/VNFPackageManagement-API/Subscriptions.robot
@@ -16,7 +16,7 @@ Get All VNF Package Subscriptions
     ...    Test title: GET all VNF Package Subscriptions
     ...    Test objective: The objective is to test the retrieval of all VNF package subscriptions and perform a JSON schema validation of the returned subscriptions data structure
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -30,7 +30,7 @@ Get VNF Package Subscriptions with attribute-based filter
     ...    Test title: Get VNF Package Subscriptions with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of VNF package subscriptions using attribute-based filter, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -45,7 +45,7 @@ Get VNF Package Subscriptions with invalid attribute-based filter
     ...    Test title: Get VNF Package Subscriptions with attribute-based filters
     ...    Test objective: The objective is to test that the retrieval of VNF package subscriptions fails when using invalid attribute-based filters, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -58,7 +58,7 @@ GET VNF Package Subscription with invalid resource endpoint
     ...    Test title: GET VNF Package Subscription with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of all VNF package subscriptions fails when using invalid resource endpoint.
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -70,7 +70,7 @@ Create new VNF Package subscription
     ...    Test title: Create new VNF Package subscription
     ...    Test objective: The objective is to test the creation of a new VNF package subscription and perform a JSON schema and content validation of the returned subscription data structure
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF package subscription is successfully set and it matches the issued subscription    
@@ -86,7 +86,7 @@ Create duplicated VNF Package subscription with NFVO not creating duplicated sub
     ...    Test title: Create duplicated VNF Package subscription with NFVO not creating duplicated subscriptions
     ...    Test objective: The objective is to test the attempt of a creation of a duplicated VNF package subscription and check that no new subscription is created by the NFVO and a link to the original subscription is returned
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO does not support the creation of duplicated subscriptions
     ...    Post-Conditions: The existing VNF package subscription returned is available in the NFVO
@@ -102,7 +102,7 @@ Create duplicated VNF Package subscription with NFVO creating duplicated subscri
     ...    Test title: Create duplicated VNF Package subscription with NFVO creating duplicated subscriptions
     ...    Test objective: The objective is to test the creation of a duplicated VNF package subscription and perform a JSON schema and content validation of the returned duplicated subscription data structure
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the creation of duplicated subscriptions
     ...    Post-Conditions: The duplicated VNF package subscription is successfully set and it matches the issued subscription
@@ -117,7 +117,7 @@ PUT VNF Package Subscriptions - Method not implemented
     ...    Test title: PUT VNF Package Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF package subscriptions
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.8.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.8.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -129,7 +129,7 @@ PATCH VNF Package Subscriptions - Method not implemented
     ...    Test title: PATCH VNF Package Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF package subscriptions
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.8.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.8.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -154,7 +154,7 @@ Get All VNF Package Subscriptions as Paged Response
     ...    Test title: GET all VNF Package Subscriptions as Paged Response
     ...    Test objective: The objective is to test the retrieval of all VNF package subscriptions as paged response.
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -167,7 +167,7 @@ Get VNF Package Subscriptions - Bad Request Response too Big
     ...    Test title: Get VNF Package Subscriptions - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of VNF package subscriptions fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot b/SOL005/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
index 05586203f..79778b325 100644
--- a/SOL005/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
+++ b/SOL005/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
@@ -11,7 +11,7 @@ Get single file VNFD in Individual VNF Package in Plain Format
     ...    Test title: Get single file VNFD in Individual VNF Package in Plain Format
     ...    Test objective: The objective is to test the retrieval of the VNFD in plain format for an individual VNF package and perform a validation that returned content is in plain format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The VNFD is implemented as a single file
     ...    Post-Conditions: none
@@ -24,7 +24,7 @@ Get VNFD in Individual VNF Package in Zip Format
     ...    Test title: Get VNFD in Individual VNF Package in Zip Format
     ...    Test objective: The objective is to test the retrieval of the VNFD in zip format for an individual VNF package and perform a validation that returned content is in zip format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -37,7 +37,7 @@ Get single file VNFD in Individual VNF Package in Plain or Zip Format
     ...    Test title: Get single file VNFD in Individual VNF Package in Plain or Zip Format
     ...    Test objective: The objective is to test the retrieval of the single file VNFD for an individual VNF package when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that returned content is in Plain or Zip format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The VNFD is implemented as a single file
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ Get multi file VNFD in Individual VNF Package in Plain or Zip Format
     ...    Test title: Get multi file VNFD in Individual VNF Package in Plain or Zip Format
     ...    Test objective: The objective is to test the retrieval of the multi file VNFD for an individual VNF package when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that returned content is in Zip format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The VNFD is implemented as a multi file
     ...    Post-Conditions: none
@@ -63,7 +63,7 @@ Get multi file VNFD in Individual VNF Package in Plain Format
     ...    Test title: Get multi file VNFD in Individual VNF Package in Plain Format
     ...    Test objective: The objective is to test that the retrieval of the multi file VNFD for an individual VNF package fails when requesting it in Plain format, and perform a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The VNFD is implemented as a multi file
     ...    Post-Conditions: none
@@ -76,7 +76,7 @@ Get VNFD in Individual VNF Package with invalid resource identifier
     ...    Test title: Get VNFD in Individual VNF Package with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of the VNFD for an individual VNF Package fails when using an invalid resource identifier
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -88,7 +88,7 @@ Get VNFD in Individual VNF Package with conflict due to onboarding state
     ...    Test title: Get VNFD in Individual VNF Package with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of the VNFD for an individual VNF Package fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the VNF package for which the VNFD is requested is different from ONBOARDED.
-    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -101,7 +101,7 @@ POST VNFD in Individual VNF Package - Method not implemented
     ...    Test title: POST VNFD in Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new VNFD
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -113,7 +113,7 @@ PUT VNFD in Individual VNF Package - Method not implemented
     ...    Test title: PUT VNFD in Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNFD
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -125,7 +125,7 @@ PATCH VNFD in Individual VNF Package - Method not implemented
     ...    Test title: PATCH VNFD in Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update a VNFD
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -137,7 +137,7 @@ DELETE VNFD in Individual VNF Package - Method not implemented
     ...    Test title: DELETE VNFD in Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNFD
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNFD is not deleted by the failed operation
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageArtifacts.robot b/SOL005/VNFPackageManagement-API/VNFPackageArtifacts.robot
index 72304b904..09b951e99 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageArtifacts.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageArtifacts.robot
@@ -11,7 +11,7 @@ GET Individual VNF Package Artifact
     ...    Test title: GET Individual VNF Package Artifact
     ...    Test objective: The objective is to test the retrieval of an individual VNF package artifact
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -23,7 +23,7 @@ GET Individual VNF Package Artifact in octet stream format
     ...    Test title: GET Individual VNF Package Artifact in octet stream format
     ...    Test objective: The objective is to test the retrieval of an individual VNF package artifact when the NFVO cannot determine the artifact content type. The test performs a validation that the returned artifcat in is octet-stream format 
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO cannot determine the content type of the artifact
     ...    Post-Conditions: none
@@ -36,7 +36,7 @@ GET Individual VNF Package Artifact with Range Request and NFVO supporting Range
     ...    Test title: GET Individual VNF Package Artifact with Range Request and NFVO supporting Range Requests
     ...    Test objective: The objective is to test the retrieval of an individual VNF package artifact when using a range request to return single range of bytes from the file, with the NFVO supporting it. The test also perform a validation that returned content matches the issued range
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ GET Individual VNF Package Artifact with Range Request and NFVO not supporting R
     ...    Test title: GET Individual VNF Package Artifact with Range Request and NFVO not supporting Range Requests
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package artifact, when using a range request to return single range of bytes from the file and the NFVO not supporting it, returns the full VNF Package artifact.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO does not support range requests to return single range of bytes from the VNF package artifact
     ...    Post-Conditions: none    
@@ -62,7 +62,7 @@ GET Individual VNF Package Artifact with invalid Range Request
     ...    Test title: GET Individual VNF Package Artifact with invalid Range Request
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package artifact fails when using a range request that does not match any available byte range in the file.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
     ...    Post-Conditions: none      
@@ -74,7 +74,7 @@ GET Individual VNF Package Artifact with invalid resource identifier
     ...    Test title: GET Individual VNF Package Artifact with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package artifact fails when using an invalid resource identifier
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -86,7 +86,7 @@ GET Individual VNF Package Artifact with conflict due to onboarding state
     ...    Test title: GET Individual VNF Package Artifact with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package artifact fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the VNF package for which the content is requested is different from ONBOARDED.
-    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -99,7 +99,7 @@ POST Individual VNF Package Artifact - Method not implemented
     ...    Test title: POST Individual VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new VNF Package artifact
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -111,7 +111,7 @@ PUT Individual VNF Package Artifact - Method not implemented
     ...    Test title: PUT Individual VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNF Package artifact
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -123,7 +123,7 @@ PATCH Individual VNF Package Artifact - Method not implemented
     ...    Test title: PATCH Individual VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that PATCH  method is not allowed to update a VNF Package artifact
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -135,7 +135,7 @@ DELETE Individual VNF Package Artifact - Method not implemented
     ...    Test title: DELETE Individual VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNF Package artifact
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.7.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package artifact is not deleted by the failed operation
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageContent.robot b/SOL005/VNFPackageManagement-API/VNFPackageContent.robot
index 661a04e62..ec895526c 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageContent.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageContent.robot
@@ -12,7 +12,7 @@ GET Individual VNF Package Content
     ...    Test title: GET Individual VNF Package Content
     ...    Test objective: The objective is to test the retrieval of an individual VNF package content and perform a validation that returned content is in zip format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ GET Individual VNF Package Content with Range Request and NFVO supporting Range
     ...    Test title: GET Individual VNF Package Content with Range Request and NFVO supporting Range Requests
     ...    Test objective: The objective is to test the retrieval of an individual VNF package content when using a range request to return single range of bytes from the file, with the NFVO supporting it. The test also perform a validation that returned content matches the issued range
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package file
     ...    Post-Conditions: none
@@ -40,7 +40,7 @@ GET Individual VNF Package Content with Range Request and NFVO not supporting Ra
     ...    Test title: GET Individual VNF Package Content with Range Request and NFVO not supporting Range Requests
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package content, when using a range request to return single range of bytes from the file and the NFVO not supporting it, returns the full VNF Package file.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO does not support range requests to return single range of bytes from the VNF package file
     ...    Post-Conditions: none    
@@ -53,7 +53,7 @@ GET Individual VNF Package Content with invalid Range Request
     ...    Test title: GET Individual VNF Package Content with invalid Range Request
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package content fails when using a range request that does not match any available byte range in the file.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package file
     ...    Post-Conditions: none      
@@ -65,7 +65,7 @@ GET Individual VNF Package Content with invalid resource identifier
     ...    Test title: GET Individual VNF Package Content with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package content fails when using an invalid resource identifier
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -77,7 +77,7 @@ GET Individual VNF Package Content with conflict due to onboarding state
     ...    Test title: GET Individual VNF Package Content with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package content fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the VNF package for which the content is requested is different from ONBOARDED.
-    ...    Reference: Clause 9.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -90,7 +90,7 @@ POST Individual VNF Package Content - Method not implemented
     ...    Test title: POST Individual VNF Package Content - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new VNF Package content
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -102,7 +102,7 @@ Upload VNF Package Content
     ...    Test title: Upload VNF Package Content
     ...    Test objective: The objective is to test the upload of a VNF Package Content in Zip format.
     ...    Pre-conditions: One or more VNF Packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package content is successfully uploaded and available in the NFVO
@@ -115,7 +115,7 @@ Upload VNF Package Content with conflict due to onboarding state
     ...    Test title: Upload VNF Package Content with conflict due to onboarding state
     ...    Test objective: The objective is to test that the upload of the VNF Package Content fails due to a conflict when the VNF Package is not in onboarding state CREATED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the VNF Package for which the content is requested is different from CREATED.
-    ...    Reference: Clause 9.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -128,7 +128,7 @@ PATCH Individual VNF Package Content - Method not implemented
     ...    Test title: PATCH Individual VNF Package Content - Method not implemented
     ...    Test objective: The objective is to test that PATCH  method is not allowed to update a VNF Package content
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -140,7 +140,7 @@ DELETE Individual VNF Package Content - Method not implemented
     ...    Test title: DELETE Individual VNF Package Content - Method not implemented
     ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNF Package content
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package content is not deleted by the failed operation
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageContentViaURI.robot b/SOL005/VNFPackageManagement-API/VNFPackageContentViaURI.robot
index 6369bdeeb..5a2fd0c8d 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageContentViaURI.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageContentViaURI.robot
@@ -12,7 +12,7 @@ Upload VNF Package Content from URI
     ...    Test title: Upload VNF Package Content from URI
     ...    Test objective: The objective is to test the upload of a VNF Package Content from URI.
     ...    Pre-conditions: One or more VNF Packages are in onboarding state CREATED in the NFVO.
-    ...    Reference: Clause 9.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ Upload VNF Package Content from URI with conflict due to onboarding state
     ...    Test title: Upload VNF Package Content from URI with conflict due to onboarding state
     ...    Test objective: The objective is to test that the upload of the VNF Package Content from URI fails due to a conflict when the VNF Package is not in onboarding state CREATED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the VNF Package for which the content is requested is different from CREATED.
-    ...    Reference: Clause 9.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -39,7 +39,7 @@ GET Individual VNF Package Content from URI - Method not implemented
     ...    Test title: GET Individual VNF Package Content from URI - Method not implemented
     ...    Test objective: The objective is to test that GET  method is not allowed to retrieve a VNF Package content from URI
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -51,7 +51,7 @@ PUT Individual VNF Package Content from URI - Method not implemented
     ...    Test title: PUT Individual VNF Package Content from URI - Method not implemented
     ...    Test objective: The objective is to test that PUT  method is not allowed to modify a VNF Package content from URI
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -63,7 +63,7 @@ PATCH Individual VNF Package Content from URI - Method not implemented
     ...    Test title: PATCH Individual VNF Package Content - Method not implemented
     ...    Test objective: The objective is to test that PATCH  method is not allowed to update a VNF Package content from URI
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -75,7 +75,7 @@ DELETE Individual VNF Package Content from URI - Method not implemented
     ...    Test title: DELETE Individual VNF Package Content - Method not implemented
     ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNF Package content from URI
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package content is not deleted by the failed operation
diff --git a/SOL005/VNFPackageManagement-API/VNFPackages.robot b/SOL005/VNFPackageManagement-API/VNFPackages.robot
index 3cfc30de7..6b681ce00 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackages.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackages.robot
@@ -11,7 +11,7 @@ GET all VNF Packages
     ...    Test title: GET all VNF Packages
     ...    Test objective: The objective is to test the retrieval of all the available VNF packages information and perform a JSON schema and content validation of the collected data structure
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -28,7 +28,7 @@ GET VNF Packages with attribute-based filter
     ...    Test title: GET VNF Packages with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of VNF packages using attribute-based filter, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued attribute-based filter
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -42,7 +42,7 @@ GET VNF Packages with invalid attribute-based filter
     ...    Test title: GET VNF Packages with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of VNF packages fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -55,7 +55,7 @@ Get all VNF Packages with malformed authorization token
     ...    Test title: Get all VNF Packages Information with malformed authorization token
     ...    Test objective: The objective is to test that the retrieval of VNF Packages fails when using malformed authorization token
     ...    Pre-conditions: One or more VNF Packages are onboarded in the NFVO.
-    ...    Reference: Clause 4.5.3.3, 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 4.5.3.3, 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -67,7 +67,7 @@ Get all VNF Packages without authorization token
     ...    Test title: Get all VNF Packages without authorization token
     ...    Test objective: The objective is to test that the retrieval of VNF Packages fails when omitting the authorization token
     ...    Pre-conditions: One or more VNF Packages are onboarded in the NFVO.
-    ...    Reference: Clause 4.5.3.3, 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 4.5.3.3, 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -79,7 +79,7 @@ GET VNF Packages with "all_fields" attribute selector
     ...    Test title: GET VNF Packages with "all_fields" attribute selector
     ...    Test objective: The objective is to test the retrieval of VNF packages with "all_fields" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "all_fileds" selector
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 4.3.3.2.1, 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 4.3.3.2.1, 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -93,7 +93,7 @@ GET VNF Packages with "exclude_default" attribute selector
     ...    Test title: GET VNF Packages with exclude_default attribute selector
     ...    Test objective: The objective is to test the retrieval of VNF packages with "exclude_default" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "exclude_default" selector
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 4.3.3.2.1, 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 4.3.3.2.1, 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none        
@@ -107,7 +107,7 @@ GET VNF Packages with "fields" attribute selector
     ...    Test title: GET VNF Packages with fields attribute selector
     ...    Test objective: The objective is to test the retrieval of VNF packages with "fields" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "fields" selector
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 4.3.3.2.1, 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 4.3.3.2.1, 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The VNFM supports the use of fields attribute selector
     ...    Post-Conditions: none
@@ -121,7 +121,7 @@ GET VNF Packages with "exclude_fields" attribute selector
     ...    Test title: GET VNF Packages with exclude_fields attribute selector
     ...    Test objective: The objective is to test the retrieval of VNF packages with "exclude_fields" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "exclude_fields" selector
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 4.3.3.2.1, 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 4.3.3.2.1, 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The VNFM supports the use of exclude_fields attribute selector
     ...    Post-Conditions: none
@@ -135,7 +135,7 @@ GET all VNF Packages with invalid resource endpoint
     ...    Test title: GET VNF Packages with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of VNF packages fails when using invalid resource endpoint
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -147,7 +147,7 @@ Create new VNF Package Resource
     ...    Test title: Create new VNF Package Resource
     ...    Test objective: The objective is to test the creation of a new VNF Package Resource and perform the JSON schema validation of the returned structure
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package Resource is successfully created on the NFVO
@@ -162,7 +162,7 @@ PUT all VNF Packages - Method not implemented
     ...    Test title: PUT all VNF Packages - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify existing VNF Packages
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -174,7 +174,7 @@ PATCH all VNF Packages - Method not implemented
     ...    Test title: PATCH all VNF Packages - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update existing VNF Packages
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -186,7 +186,7 @@ DELETE all VNF Packages - Method not implemented
     ...    Test title: DELETE all VNF Packages - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete existing VNF Packages
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Packages are not deleted by the failed operation
@@ -199,7 +199,7 @@ GET all VNF Packages as Paged Response
     ...    Test title: GET all VNF Packages as Paged Response
     ...    Test objective: The objective is to test the retrieval of all the available VNF packages information as paged response.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -212,7 +212,7 @@ GET VNF Packages - Bad Request Response too Big
     ...    Test title: GET VNF Packages - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of VNF packages fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
-- 
GitLab


From adaaa05b99429668e2bdf402bfaac5c1629fc7a7 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Wed, 14 Oct 2020 16:28:01 +0200
Subject: [PATCH 092/322] fix for issue #121 in SOL002-VNFIndicator-API

---
 .../IndividualVNFindicator.robot              |  1 -
 SOL002/VNFIndicator-API/Subscriptions.robot   |  3 +--
 SOL002/VNFIndicator-API/VNFIndicators.robot   |  1 -
 .../VnfIndicatorsInVnfInstanceId.robot        |  1 -
 .../environment/individualSubscription.txt    |  5 ----
 .../environment/individualVnfIndicator.txt    |  6 -----
 .../environment/subscriptions.txt             | 10 -------
 .../environment/variables.txt                 | 26 ++++++++++++++++++-
 .../environment/vnfIndicatorinVnfInstance.txt |  7 -----
 .../environment/vnfIndicators.txt             |  8 ------
 10 files changed, 26 insertions(+), 42 deletions(-)
 delete mode 100644 SOL002/VNFIndicator-API/environment/individualSubscription.txt
 delete mode 100644 SOL002/VNFIndicator-API/environment/individualVnfIndicator.txt
 delete mode 100644 SOL002/VNFIndicator-API/environment/subscriptions.txt
 delete mode 100644 SOL002/VNFIndicator-API/environment/vnfIndicatorinVnfInstance.txt
 delete mode 100644 SOL002/VNFIndicator-API/environment/vnfIndicators.txt

diff --git a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
index 19b7fb469..437cb6f3a 100644
--- a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
+++ b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/individualVnfIndicator.txt
 Library           REST    ${EM-VNF_SCHEMA}://${EM-VNF_HOST}:${EM-VNF_PORT}    ssl_verify=false
 
 *** Test Cases ***
diff --git a/SOL002/VNFIndicator-API/Subscriptions.robot b/SOL002/VNFIndicator-API/Subscriptions.robot
index 0e208cd33..d0f7f89dd 100644
--- a/SOL002/VNFIndicator-API/Subscriptions.robot
+++ b/SOL002/VNFIndicator-API/Subscriptions.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/subscriptions.txt
 Library           OperatingSystem
 Library           JSONLibrary
 Library           Process
@@ -220,7 +219,7 @@ Send Post Request for VNF Indicator Subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${template}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    ${body}=        Format String    ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
diff --git a/SOL002/VNFIndicator-API/VNFIndicators.robot b/SOL002/VNFIndicator-API/VNFIndicators.robot
index f3f8f20f8..0addde858 100644
--- a/SOL002/VNFIndicator-API/VNFIndicators.robot
+++ b/SOL002/VNFIndicator-API/VNFIndicators.robot
@@ -4,7 +4,6 @@ Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
 Library           JSONLibrary
 Library           String
-Resource          environment/vnfIndicators.txt
 Library           REST    ${EM-VNF_SCHEMA}://${EM-VNF_HOST}:${EM-VNF_PORT}    ssl_verify=false
 
 *** Test Cases ***
diff --git a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
index 14cb88972..b25da0214 100644
--- a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
+++ b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
@@ -2,7 +2,6 @@
 Documentation     This resource represents VNF indicators related to a VNF instance. The client can use this resource to query multiple VNF indicators that are related to a particular VNF instance.
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/vnfIndicatorinVnfInstance.txt
 Library           JSONLibrary
 Library           String 
 Library           REST    ${EM-VNF_SCHEMA}://${EM-VNF_HOST}:${EM-VNF_PORT}    ssl_verify=false
diff --git a/SOL002/VNFIndicator-API/environment/individualSubscription.txt b/SOL002/VNFIndicator-API/environment/individualSubscription.txt
deleted file mode 100644
index 1ae759290..000000000
--- a/SOL002/VNFIndicator-API/environment/individualSubscription.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-*** Variables ***
-${subscriptionId}    f3ae6df7-07e1-47c9-8924-9ebe10343586
-${erroneousSubscriptionId}    442e3ee5-0499-4849-9b31-eb91ce1638f1    # Not existing ID on the subscriptions
-${response}=    httpresponse
-${origResponse}=    httpresponse
\ No newline at end of file
diff --git a/SOL002/VNFIndicator-API/environment/individualVnfIndicator.txt b/SOL002/VNFIndicator-API/environment/individualVnfIndicator.txt
deleted file mode 100644
index 5e90a5d70..000000000
--- a/SOL002/VNFIndicator-API/environment/individualVnfIndicator.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-*** Variables ***
-${vnfInstanceId}    80b0deba-c398-445b-bef0-ac0fe733e3d0
-${indicatorId}    34e70855-a9d3-4fef-aece-76a3cd266ec8
-${notAllowedIndicatorId}    notAllowedId
-${erroneousIndicatorId}    erroneousIndicatorId
-${response}=    httpresponse
diff --git a/SOL002/VNFIndicator-API/environment/subscriptions.txt b/SOL002/VNFIndicator-API/environment/subscriptions.txt
deleted file mode 100644
index ec4b63ac0..000000000
--- a/SOL002/VNFIndicator-API/environment/subscriptions.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-*** Variables ***
-${vnfInstanceId}    80b0deba-c398-445b-bef0-ac0fe733e3d0
-${indicatorId}    34e70855-a9d3-4fef-aece-76a3cd266ec8
-${erroneousIndicatorId}    erroneousIndicatorId
-${POS_FILTER}     callbackUri=http://127.0.0.1/subscribe
-${NEG_FILTER}     callback=http://127.0.0.1/subscribe
-${response}=    httpresponse
-${total_polling_time}   2 min
-${polling_interval}     10 sec
-${SEPERATOR}      =
\ No newline at end of file
diff --git a/SOL002/VNFIndicator-API/environment/variables.txt b/SOL002/VNFIndicator-API/environment/variables.txt
index 22f32a1fb..b08433660 100644
--- a/SOL002/VNFIndicator-API/environment/variables.txt
+++ b/SOL002/VNFIndicator-API/environment/variables.txt
@@ -24,4 +24,28 @@ ${callback_port}    9091
 ${callback_endpoint}    /endpoint
 ${callback_endpoint_error}    /endpoint_404
 
-${response}       some_response_object
\ No newline at end of file
+${response}       some_response_object
+
+
+${subscriptionId}    f3ae6df7-07e1-47c9-8924-9ebe10343586
+${erroneousSubscriptionId}    442e3ee5-0499-4849-9b31-eb91ce1638f1    # Not existing ID on the subscriptions
+${origResponse}=    httpresponse
+
+${vnfInstanceId}    80b0deba-c398-445b-bef0-ac0fe733e3d0
+${indicatorId}    34e70855-a9d3-4fef-aece-76a3cd266ec8
+${notAllowedIndicatorId}    notAllowedId
+${erroneousIndicatorId}    erroneousIndicatorId
+
+${POS_FILTER}     callbackUri=http://127.0.0.1/subscribe
+${NEG_FILTER}     callback=http://127.0.0.1/subscribe
+${total_polling_time}   2 min
+${polling_interval}     10 sec
+${SEPERATOR}      =
+
+${erroneousVnfInstanceId}    erroneousVnfInstanceId
+${POS_FIELDS}     name=vnfIndicator
+${NEG_FIELDS}     wrongName=any_value
+
+
+${vnfIndicators}  =     
+${VAR_SEPERATOR}    &
\ No newline at end of file
diff --git a/SOL002/VNFIndicator-API/environment/vnfIndicatorinVnfInstance.txt b/SOL002/VNFIndicator-API/environment/vnfIndicatorinVnfInstance.txt
deleted file mode 100644
index 8651dee3d..000000000
--- a/SOL002/VNFIndicator-API/environment/vnfIndicatorinVnfInstance.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-*** Variables ***
-${vnfInstanceId}    80b0deba-c398-445b-bef0-ac0fe733e3d0
-${erroneousVnfInstanceId}    erroneousVnfInstanceId
-${POS_FIELDS}     name=vnfIndicator
-${NEG_FIELDS}     wrongName=any_value
-${response}=    httpresponse
-${SEPERATOR}      =
\ No newline at end of file
diff --git a/SOL002/VNFIndicator-API/environment/vnfIndicators.txt b/SOL002/VNFIndicator-API/environment/vnfIndicators.txt
deleted file mode 100644
index 847659079..000000000
--- a/SOL002/VNFIndicator-API/environment/vnfIndicators.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-*** Variables ***
-${POS_FIELDS}     name=vnfIndicator&vnfInstanceId=80b0deba-c398-445b-bef0-ac0fe733e3d0
-${NEG_FIELDS}     wrongName=wrongValue
-${response}       some_response_object
-${vnfIndicators}  =
-${SEPERATOR}      =
-${VAR_SEPERATOR}    &
-${POS_FILTER}  =
\ No newline at end of file
-- 
GitLab


From 4d3c4cb7d6d1124b08e777e9a08ed7442699bb57 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Wed, 14 Oct 2020 16:44:50 +0200
Subject: [PATCH 093/322] adding missing update

---
 SOL002/VNFIndicator-API/IndividualSubscription.robot | 1 -
 1 file changed, 1 deletion(-)

diff --git a/SOL002/VNFIndicator-API/IndividualSubscription.robot b/SOL002/VNFIndicator-API/IndividualSubscription.robot
index 4e75f80c7..68e5bb49d 100644
--- a/SOL002/VNFIndicator-API/IndividualSubscription.robot
+++ b/SOL002/VNFIndicator-API/IndividualSubscription.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/individualSubscription.txt
 Library           OperatingSystem
 Library           REST    ${EM-VNF_SCHEMA}://${EM-VNF_HOST}:${EM-VNF_PORT}    ssl_verify=false
 
-- 
GitLab


From 1c8f22e32e870e6b75a41223ad47eda0e08cea0c Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Wed, 14 Oct 2020 17:18:57 +0200
Subject: [PATCH 094/322] restored subscriptions tests in SOL002 VNF PM

---
 .../IndividualSubscription.robot              |  98 ++++++
 .../Subscriptions.robot                       | 175 +++++++++++
 .../VNFPerformanceManagementKeywords.robot    | 297 +++++++++++++++++-
 .../environment/variables.txt                 |  37 ++-
 4 files changed, 602 insertions(+), 5 deletions(-)
 create mode 100644 SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot
 create mode 100644 SOL002/VNFPerformanceManagement-API/Subscriptions.robot

diff --git a/SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot b/SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot
new file mode 100644
index 000000000..1d9d2d429
--- /dev/null
+++ b/SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot
@@ -0,0 +1,98 @@
+*** Settings ***
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt    # Generic Parameters
+Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
+Library           OperatingSystem
+Library           JSONLibrary
+Resource          VNFPerformanceManagementKeywords.robot
+
+*** Test Cases ***
+GET Individual VNF Performance Subscription
+    [Documentation]    Test ID: 6.3.3.7.1
+    ...    Test title: GET Individual VNF Performance Subscription
+    ...    Test objective: The objective is to test the retrieval of individual VNF performance subscription and perform a JSON schema and content validation of the returned subscription data structure
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference: Clause 6.4.8.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Individual VNF Performance Subscription
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is   PmSubscription
+    Check HTTP Response Body Subscription Identifier matches the requested Subscription
+
+GET Individual VNF Performance Subscription with invalid resource identifier
+    [Documentation]    Test ID: 6.3.3.7.2
+    ...    Test title: GET Individual VNF Performance Subscription with invalid resource identifier
+    ...    Test objective: The objective is to test that the retrieval of an individual VNF performance subscription fails when using an invalid resource identifier
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference: Clause 6.4.8.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET individual VNF Performance Subscription with invalid resource identifier
+    Check HTTP Response Status Code Is    404
+
+DELETE Individual VNF Performance Subscription
+    [Documentation]    Test ID: 6.3.3.7.3
+    ...    Test title: DELETE Individual VNF Performance Subscription
+    ...    Test objective: The objective is to test the deletion of an individual VNF performance subscription
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference: Clause 6.4.8.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: The VNF Performance Subscription is not available anymore in the VNFM    
+    Send Delete request for individual VNF Performance Subscription
+    Check HTTP Response Status Code Is    204
+    Check Postcondition VNF Performance Subscription is Deleted
+
+DELETE Individual VNF Performance Subscription with invalid resource identifier
+    [Documentation]    Test ID: 6.3.3.7.4
+    ...    Test title: DELETE Individual VNF Performance Subscription with invalid resource identifier
+    ...    Test objective: The objective is to test that the deletion of an individual VNF performance subscription fails when using an invalid resource identifier
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference: Clause 6.4.8.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none   
+    Send Delete request for individual VNF Performance Subscription with invalid resource identifier
+    Check HTTP Response Status Code Is    404
+
+POST Individual VNF Performance Subscription - Method not implemented
+    [Documentation]    Test ID: 6.3.3.7.5
+    ...    Test title: POST Individual VNF Performance Subscription - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF Performance Subscription
+    ...    Pre-conditions: A VNF instance is instantiated
+    ...    Reference: Clause 6.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: The VNF Performance Subscription is not created on the VNFM
+    Send Post request for individual VNF Performance Subscription
+    Check HTTP Response Status Code Is    405
+    Check Postcondition VNF Performance Subscription is not Created
+
+PUT Individual VNF Performance Subscription - Method not implemented
+    [Documentation]    Test ID: 6.3.3.7.6
+    ...    Test title: PUT Individual VNF Performance Subscription - Method not implemented
+    ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF Performance subscription
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference: Clause 6.4.8.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: The VNF Performance subscription is not modified by the operation
+    Send Put request for individual VNF Performance Threshold
+    Check HTTP Response Status Code Is    405
+    Check Postcondition VNF Performance Subscription is Unmodified (Implicit)
+
+PATCH Individual VNF Performance Subscription - Method not implemented
+    [Documentation]    Test ID: 6.3.3.7.7
+    ...    Test title: PATCH Individual VNF Performance Subscription - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing VNF Performance subscription
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference: Clause 6.4.8.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: The VNF Performance subscription is not modified by the operation
+    Send Patch request for individual VNF Performance Threshold
+    Check HTTP Response Status Code Is    405
+    Check Postcondition VNF Performance Subscription is Unmodified (Implicit)
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/Subscriptions.robot b/SOL002/VNFPerformanceManagement-API/Subscriptions.robot
new file mode 100644
index 000000000..c9948009b
--- /dev/null
+++ b/SOL002/VNFPerformanceManagement-API/Subscriptions.robot
@@ -0,0 +1,175 @@
+*** Settings ***
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt    # Generic Parameters
+Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
+Library           OperatingSystem
+Library           JSONLibrary
+Resource          VNFPerformanceManagementKeywords.robot
+Library           MockServerLibrary
+Library           Process
+Suite Setup       Create Sessions
+Suite Teardown    Terminate All Processes    kill=true
+
+*** Test Cases ***
+GET all VNF Performance Subscriptions
+    [Documentation]    Test ID: 6.3.3.6.1
+    ...    Test title: GET all VNF Performance Subscriptions
+    ...    Test objective: The objective is to test the retrieval of all VNF performance subscriptions and perform a JSON schema validation of the returned subscriptions data structure
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    Get all VNF Performance Subscriptions
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    PmSubscriptions
+
+GET VNF Performance Subscriptions with attribute-based filter
+    [Documentation]    Test ID: 6.3.3.6.2
+    ...    Test title: GET VNF Performance Subscriptions with attribute-based filter
+    ...    Test objective: The objective is to test the retrieval of VNF performance subscriptions using attribute-based filter, perform a JSON schema validation of the collected indicators data structure, and verify that the retrieved information matches the issued attribute-based filters 
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get VNF Performance Subscriptions with attribute-based filters
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    PmSubscriptions
+    Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filter 
+
+GET VNF Performance Management Subscriptions with invalid attribute-based filter
+    [Documentation]    Test ID: 6.3.3.6.3
+    ...    Test title: GET VNF Performance Management Subscriptions with invalid attribute-based filter
+    ...    Test objective: The objective is to test that the retrieval of VNF performance subscriptions fails when using invalid attribute-based filters, and perform the JSON schema validation of the failed operation HTTP response. 
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get VNF Performance Subscriptions with invalid attribute-based filters
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails 
+
+GET VNF Performance Subscriptions with invalid resource endpoint
+    [Documentation]    Test ID: 6.3.3.6.4
+    ...    Test title: GET VNF Performance Subscriptions with invalid resource endpoint
+    ...    Test objective: The objective is to test that the retrieval of all VNF performance subscriptions fails when using invalid resource endpoint.
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    Get VNF Performance Subscriptions with invalid resource endpoint
+    Check HTTP Response Status Code Is    404
+    
+Create new VNF Performance subscription
+    [Documentation]    Test ID: 6.3.3.6.5
+    ...    Test title: Create new VNF Performance subscription
+    ...    Test objective: The objective is to test the creation of a new VNF performance subscription and perform a JSON schema and content validation of the returned subscription data structure
+    ...    Pre-conditions: A VNF instance is instantiated.
+    ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: The VNF performance subscription is successfully set and it matches the issued subscription    
+    Send Post Request for VNF Performance Subscription
+    Check HTTP Response Status Code Is    201
+    Check HTTP Response Body Json Schema Is    PmSubscription
+    Check HTTP Response Body PmSubscription Attributes Values Match the Issued Subscription
+    Check Postcondition VNF Performance Subscription Is Set 
+
+
+Create duplicated VNF Performance subscription with VNFM not creating duplicated subscriptions
+    [Tags]    no-duplicated-subs
+    [Documentation]    Test ID: 6.3.3.6.6
+    ...    Test title: Create duplicated VNF Performance subscription with VNFM not creating duplicated subscriptions
+    ...    Test objective: The objective is to test the attempt of a creation of a duplicated VNF performance subscription and check that no new subscription is created by the VNFM and a link to the original subscription is returned
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: The VNFM does not support the creation of duplicated subscriptions
+    ...    Post-Conditions: The existing VNF performance subscription returned is available in the VNFM 
+    Send Post Request for Duplicated VNF Performance Subscription
+    Check HTTP Response Status Code Is    303
+    Check HTTP Response Body Is Empty
+    Check HTTP Response Header Contains    Location
+    Check Postcondition Subscription Resource Returned in Location Header Is Available
+
+Create duplicated VNF Performance subscription with VNFM creating duplicated subscriptions
+    [Tags]    duplicated-subs
+    [Documentation]    Test ID: 6.3.3.6.7
+    ...    Test title: Create duplicated VNF Performance subscription with VNFM creating duplicated subscriptions
+    ...    Test objective: The objective is to test the creation of a duplicated VNF performance subscription and perform a JSON schema and content validation of the returned duplicated subscription data structure
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: The VNFM supports the creation of duplicated subscriptions
+    ...    Post-Conditions: The duplicated VNF performance subscription is successfully set and it matches the issued subscription
+    Send Post Request for Duplicated VNF Performance Subscription
+    Check HTTP Response Status Code Is    201
+    Check HTTP Response Body Json Schema Is    PmSubscription
+    Check HTTP Response Body PmSubscription Attributes Values Match the Issued Subscription
+    Check Postcondition VNF Performance Subscription Is Set 
+
+PUT VNF Performance Subscriptions - Method not implemented
+    [Documentation]    Test ID: 6.3.3.6.8
+    ...    Test title: PUT VNF Performance Subscriptions - Method not implemented
+    ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF performance subscriptions
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference: Clause 6.4.7.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send Put Request for VNF Performance Subscriptions
+    Check HTTP Response Status Code Is    405 
+    
+PATCH VNF Performance Subscriptions - Method not implemented
+    [Documentation]    Test ID: 6.3.3.6.9
+    ...    Test title: PATCH VNF Performance Subscriptions - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF performance subscriptions
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference: Clause 6.4.7.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send Patch Request for VNF Performance Subscriptions
+    Check HTTP Response Status Code Is    405
+    
+DELETE VNF Performance Subscriptions - Method not implemented
+    [Documentation]    Test ID: 6.3.3.6.10
+    ...    Test title: DELETE VNF Performance Subscriptions - Method not implemented
+    ...    Test objective: The objective is to test that DELETE method is not allowed to delete VNF performance subscriptions
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference: Clause 6.4.7.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: The VNF performance subscriptions are not deleted by the failed operation   
+    Send Delete Request for VNF Performance Subscriptions
+    Check HTTP Response Status Code Is    405
+    Check Postcondition VNF Performance Subscriptions Exists
+    
+GET VNF Performance Subscriptions to get Paged Response
+    [Documentation]    Test ID: 6.3.3.6.11
+    ...    Test title: GET VNF Performance Subscriptions to get Paged Response
+    ...    Test objective: The objective is to test the retrieval of all VNF performance subscriptions to get Paged Response
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    Get all VNF Performance Subscriptions
+    Check HTTP Response Status Code Is    200
+    Check LINK in Header
+    
+GET VNF Performance Management Subscriptions for Bad Request Response too big
+    [Documentation]    Test ID: 6.3.3.6.12
+    ...    Test title: GET VNF Performance Management Subscriptions for Bad Request Response too big
+    ...    Test objective: The objective is to test that the retrieval of VNF performance subscriptions fails when response is too big, and perform the JSON schema validation of the failed operation HTTP response. 
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get VNF Performance Subscriptions with invalid attribute-based filters
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails 
diff --git a/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
index 394c97280..99da3d1a8 100644
--- a/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
+++ b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
@@ -1,8 +1,7 @@
 *** Settings ***
 Library    String
 Resource    environment/variables.txt
-Resource    environment/subscriptions.txt
-Resource    environment/individualSubscription.txt
+
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 Library    MockServerLibrary 
 Library    OperatingSystem
@@ -13,12 +12,263 @@ Library    JSONSchemaLibrary    schemas/
 Library    Process    
 
 *** Keywords ***
+
+Get all VNF Performance Subscriptions
+    [Documentation]    The client can use this method to query the list of active subscriptions to Performance management notifications
+    ...    subscribed by the client.
+    ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
+    ...    request and response data structures, and response codes.
+    Set headers    {"Accept": "application/json"}
+    Set headers    {"Content-Type": "application/json"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    # Integer    response status    200
+    # Log    Received a 200 OK as expected
+    # ${contentType}=    Output    response headers Content-Type
+    # Should Contain    ${contentType}    application/json
+    # ${result}=    Output    response body
+    # Validate Json    PmSubscriptions.schema.json    ${result}
+    # Log    Validated PmSubscription schema
+
+
+ Get VNF Performance Subscriptions with attribute-based filters
+    [Documentation]    The client can use this method to query the list of active subscriptions to Performance management notifications
+    ...    subscribed by the client.
+    ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
+    ...    request and response data structures, and response codes.
+    Set headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ok}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    # Integer    response status    200
+    # Log    Received a 200 OK as expected
+    # ${contentType}=    Output    response headers Content-Type
+    # Should Contain    ${contentType}    application/json
+    # ${result}=    Output    response body
+    # Validate Json    PmSubscriptions.schema.json    ${result}
+    # Log    Validated PmSubscription schema    
+    
+
+
+Get VNF Performance Subscriptions with invalid attribute-based filters
+    [Documentation]    The client can use this method to query the list of active subscriptions to Performance management notifications
+    ...    subscribed by the client.
+    ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
+    ...    request and response data structures, and response codes.
+    Set headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ko}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    # Integer    response status    400
+    # Log    Received a 400 Bad Request as expected
+    # ${contentType}=    Output    response headers Content-Type
+    # Should Contain    ${contentType}    application/json
+    # ${result}=    Output    response body
+    # Validate Json    ProblemDetails.schema.json    ${result}
+    # Log    Validated ProblemDetails schema
+    
+    
+Get VNF Performance Subscriptions with invalid resource endpoint
+    [Documentation]    The client can use this method to query the list of active subscriptions to Performance management notifications
+    ...    subscribed by the client.
+    ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
+    ...    request and response data structures, and response codes.
+    Set headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    # Integer    response status    404
+    # Log    Received a 404 Not found as expected
+    # ${contentType}=    Output    response headers Content-Type
+    # Should Contain    ${contentType}    application/json
+    # ${result}=    Output    response body
+    # Validate Json    ProblemDetails.schema.json    ${result}
+    # Log    Validated ProblemDetails schema    
+
+
+
+Send Post Request for VNF Performance Subscription
+    [Documentation]    The POST method creates a new subscription.
+    ...    This method shall follow the provisions specified in the tables 6.4.7.3.1-1 and 6.4.7.3.1-2 for URI query parameters,
+    ...    request and response data structures, and response codes.
+    ...    Creation of two subscription resources with the same callbackURI and the same filter can result in performance
+    ...    degradation and will provide duplicates of notifications to the NFVO, and might make sense only in very rare use cases.
+    ...    Consequently, the VNFM may either allow creating a subscription resource if another subscription resource with the
+    ...    same filter and callbackUri already exists (in which case it shall return the "201 Created" response code), or may decide
+    ...    to not create a duplicate subscription resource (in which case it shall return a "303 See Other" response code referencing
+    ...    the existing subscription resource with the same filter and callbackUri).
+    Set headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Set headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    ${body_request}=    Get File    jsons/subscriptions.json
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body_request}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    Run Keyword If    ${VNFM_CHECKS_NOTIF_ENDPOINT} == 1
+    ...       Check Notification Endpoint
+    # Integer    response status    201
+    # Log    Received a 201 Created as expected
+    # ${contentType}=    Output    response headers Content-Type
+    # Should Contain    ${contentType}    application/json
+    # ${result}=    Output    response body
+    # Validate Json    PmSubscription.schema.json    ${result}
+    # Log    Validated PmSubscription schema
+    # Log    Trying to validate the Location header
+    # ${headers}=    Output    response headers
+    # Should Contain    ${headers}    Location
+
+
+Send Post Request for Duplicated VNF Performance Subscription
+    [Documentation]    The POST method creates a new subscription.
+    ...    This method shall follow the provisions specified in the tables 6.4.7.3.1-1 and 6.4.7.3.1-2 for URI query parameters,
+    ...    request and response data structures, and response codes.
+    ...    Creation of two subscription resources with the same callbackURI and the same filter can result in performance
+    ...    degradation and will provide duplicates of notifications to the NFVO, and might make sense only in very rare use cases.
+    ...    Consequently, the VNFM may either allow creating a subscription resource if another subscription resource with the
+    ...    same filter and callbackUri already exists (in which case it shall return the "201 Created" response code), or may decide
+    ...    to not create a duplicate subscription resource (in which case it shall return a "303 See Other" response code referencing
+    ...    the existing subscription resource with the same filter and callbackUri).
+    Set headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Set headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    ${body_request}=    Get File    jsons/subscriptions.json
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body_request}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}    
+    # Integer    response status    303
+    # Log    Received a 303 See other as expected
+    # ${contentType}=    Output    response headers Content-Type
+    # Should Contain    ${contentType}    application/json
+    # ${result}=    Output    response body
+    # Should Be Empty    ${result}
+    # Log    Body is empty
+    # Log    Trying to validate the Location header
+    # ${headers}=    Output    response headers
+    # Should Contain    ${headers}    Location
+    
+
+
+Send Put Request for VNF Performance Subscriptions
+    [Documentation]    This method is not supported. When this method is requested on this resource, the VNFM shall return a "405 Method
+    ...    Not Allowed" response as defined in Clause 4.3.5.4.
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    # Integer    response status    405
+    # Log    Received 405 Method not implemented as expected
+
+Send Patch Request for VNF Performance Subscriptions
+    [Documentation]    This method is not supported. When this method is requested on this resource, the VNFM shall return a "405 Method
+    ...    Not Allowed" response as defined in Clause 4.3.5.4.
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    # Integer    response status    405
+    # Log    Received 405 Method not implemented as expected
+
+Send Delete Request for VNF Performance Subscriptions
+    [Documentation]    This method is not supported. When this method is requested on this resource, the VNFM shall return a "405 Method
+    ...    Not Allowed" response as defined in Clause 4.3.5.4.
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    # Integer    response status    405
+    # Log    Received 405 Method not implemented as expected
+
+Get Individual VNF Performance Subscription
+    Set headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+GET individual VNF Performance Subscription with invalid resource identifier
+    Set headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Send Delete request for individual VNF Performance Subscription
+    Set headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Send Delete request for individual VNF Performance Subscription with invalid resource identifier
+    Log    Trying to delete a subscription in the VNFM with invalid id
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Send Post request for individual VNF Performance Subscription
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Send Put request for individual VNF Performance Threshold
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    ${origOutput}=    Output    response
+    Set Suite Variable    ${origResponse}    ${origOutput}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Send Patch request for individual VNF Performance Threshold
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    ${origOutput}=    Output    response
+    Set Suite Variable    ${origResponse}    ${origOutput}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Check Postcondition VNF Performance Subscription is Unmodified (Implicit)
+    Log    Check postconidtion subscription not modified
+    GET individual VNF Performance Subscription
+    Log    Check Response matches original VNF Threshold
+    ${subscription}=    evaluate    json.loads('''${response['body']}''')    json
+    Should Be Equal As Strings    ${origResponse['body']['id']}    ${subscription.id}
+    Should Be Equal As Strings    ${origResponse['body']['callbackUri']}    ${subscription.callbackUri}
+
+Check Postcondition VNF Performance Subscription is not Created
+    Log    Trying to get a new subscription
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    Check HTTP Response Status Code Is    404 
+
+Check Postcondition VNF Performance Subscription is Deleted
+    Log    Check Postcondition Subscription is deleted
+    GET individual VNF Performance Subscription
+    Check HTTP Response Status Code Is    404 
+
+Check HTTP Response Body Subscription Identifier matches the requested Subscription
+    Log    Trying to check response ID
+    Should Be Equal As Strings    ${response['body']['id']}    ${subscriptionId} 
+    Log    Subscription identifier as expected
     
 Check HTTP Response Status Code Is
     [Arguments]    ${expected_status}    
     Should Be Equal As Strings   ${response['status']}    ${expected_status}
     Log    Status code validated 
     
+    
+    
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
     Should Contain    ${response['headers']['Content-Type']}    application/json
@@ -26,9 +276,48 @@ Check HTTP Response Body Json Schema Is
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK  
 
+
 Check HTTP Response Body Is Empty
     Should Be Empty    ${response['body']}    
-    Log    No json schema is provided. Validation OK          
+    Log    No json schema is provided. Validation OK  
+
+
+Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filter
+    Log    Check Response includes VNF Performance Management according to filter
+    Should Be Equal As Strings    ${response['body'][0]['callbackUri']}    ${callbackUri_Sub}
+
+Check HTTP Response Body PmSubscription Attributes Values Match the Issued Subscription
+    Log    Check Response matches subscription
+    ${body}=    Get File    jsons/subscriptions.json
+    ${subscription}=    evaluate    json.loads('''${body}''')    json
+    Should Be Equal As Strings    ${response['body']['callbackUri']}    ${subscription['callbackUri']}
+
+Check Postcondition VNF Performance Subscription Is Set
+    Log    Check Postcondition subscription exist
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    Check HTTP Response Status Code Is    200
+
+Check Postcondition Subscription Resource Returned in Location Header Is Available
+    Log    Going to check postcondition
+    GET    ${response['headers']['Location']}
+    Integer    response status    200
+    Log    Received a 200 OK as expected
+    ${contentType}=    Output    response headers Content-Type
+    Should Contain    ${contentType}    application/json
+    ${result}=    Output    response body
+    Validate Json    PmSubscription.schema.json    ${result}
+    Log    Validated PmSubscription schema
+    ${body}=    Get File    jsons/subscriptions.json
+    ${subscription}=    evaluate    json.loads('''${body}''')    json
+    Should Be Equal    ${result['callbackUri']}    ${subscription['callbackUri']}
+    Log    Validated Issued subscription is same as original
+ 
+Check Postcondition VNF Performance Subscriptions Exists
+    Log    Checking that subscriptions exists
+    Get all VNF Performance Subscriptions         
 
 Check HTTP Response Header Contains
     [Arguments]    ${CONTENT_TYPE}
@@ -59,6 +348,6 @@ Check Notification Endpoint
     Wait Until Keyword Succeeds    ${total_polling_time}   ${polling_interval}   Verify Mock Expectation    ${notification_request}
     Clear Requests  ${callback_endpoint}
     
-Check HTTP Response Header Contain Link
+Check LINK in Header
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
diff --git a/SOL002/VNFPerformanceManagement-API/environment/variables.txt b/SOL002/VNFPerformanceManagement-API/environment/variables.txt
index c6f2f9a80..8636509cb 100644
--- a/SOL002/VNFPerformanceManagement-API/environment/variables.txt
+++ b/SOL002/VNFPerformanceManagement-API/environment/variables.txt
@@ -27,4 +27,39 @@ ${response}        http-response
 
 ${objectInstanceIds}    1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
 
-${subscribe}    /subscribe
\ No newline at end of file
+${subscribe}    /subscribe
+
+
+
+${pmJobId}        29f4ff6a-be91-4ec8-856e-fcf1e2479e4e
+${erroneousPmJobId}    erroneousPmJobId
+${newPmJobId}    newPmJobId
+${OrigResponse}=    httpresponse
+
+${thresholdId}    1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
+${erroneousThresholdId}    erroneousThresholdId
+${newThresholdId}    newThresholdId
+
+${POS_FILTER}     objectInstanceIds=${objectInstanceIds}
+${NEG_FILTER}     criteriaPmJob=erroneousAttributeName
+${fields}         criteria,reports
+${SEPERATOR}      =
+
+${reportId}       0fb4c875-e07f-46ca-a9dd-13907667a568
+${erroneousReportId}    erroneousReportId
+${newReportId}    newReportId
+
+
+${FILTER_OK}      objectInstanceId=1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
+${FILTER_KO}      criterias=erroneousFilter
+
+${subscriptionId}    17563e75-0e14-4bd7-94b4-6bbb869c79aa
+${erroneousSubscriptionId}    erroneousSubscriptionId
+${newSubscriptionId}    newSubsciptionId
+
+${callbackUri_Sub}    http://172.22.1.7:9091/vnfpm/subscriptions
+${filter_ok}      callbackUri=${callbackUri_Sub}
+${filter_ko}      erroneousFilter=erroneous
+${total_polling_time}   2 min
+${polling_interval}     10 sec
+
-- 
GitLab


From 5b3489351cb237ea8b095025882263457180a6df Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Wed, 14 Oct 2020 17:20:25 +0200
Subject: [PATCH 095/322] fix for issue #121 in SOL002-VNFPerformance-API

---
 SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot | 1 -
 .../VNFPerformanceManagement-API/IndividualReport.robot   | 1 -
 .../IndividualThreshold.robot                             | 1 -
 SOL002/VNFPerformanceManagement-API/PMJobs.robot          | 1 -
 SOL002/VNFPerformanceManagement-API/Thresholds.robot      | 1 -
 .../environment/IndividualPmJob.txt                       | 6 ------
 .../environment/individualThresholds.txt                  | 6 ------
 .../VNFPerformanceManagement-API/environment/pmJobs.txt   | 8 --------
 .../VNFPerformanceManagement-API/environment/reports.txt  | 7 -------
 .../environment/thresholds.txt                            | 5 -----
 10 files changed, 37 deletions(-)
 delete mode 100644 SOL002/VNFPerformanceManagement-API/environment/IndividualPmJob.txt
 delete mode 100644 SOL002/VNFPerformanceManagement-API/environment/individualThresholds.txt
 delete mode 100644 SOL002/VNFPerformanceManagement-API/environment/pmJobs.txt
 delete mode 100644 SOL002/VNFPerformanceManagement-API/environment/reports.txt
 delete mode 100644 SOL002/VNFPerformanceManagement-API/environment/thresholds.txt

diff --git a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
index eeced512b..b95e714b4 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
@@ -2,7 +2,6 @@
 Library     JSONSchemaLibrary    schemas/
 Resource    environment/variables.txt    # Generic Parameters
 Library     JSONLibrary
-Resource    environment/IndividualPmJob.txt
 Library     REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 Library     OperatingSystem
 Library     DependencyLibrary
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
index 7570068dd..b3205fa84 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/reports.txt
 Library           JSONLibrary
 Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
index 003817da6..d5bed32bd 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -4,7 +4,6 @@ Resource          environment/variables.txt    # Generic Parameters
 Library           JSONLibrary
 Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 Library           OperatingSystem
-Resource          environment/individualThresholds.txt
 
 *** Test Cases ***
 GET Individual Threshold
diff --git a/SOL002/VNFPerformanceManagement-API/PMJobs.robot b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
index 62747fa37..160d12642 100644
--- a/SOL002/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
@@ -4,7 +4,6 @@ Resource          environment/variables.txt    # Generic Parameters
 Library           JSONLibrary
 Library           OperatingSystem
 Library           String
-Resource          environment/pmJobs.txt
 Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 
 *** Test Cases ***
diff --git a/SOL002/VNFPerformanceManagement-API/Thresholds.robot b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
index 6dead1e56..98db5849e 100644
--- a/SOL002/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
@@ -4,7 +4,6 @@ Resource          environment/variables.txt    # Generic Parameters
 Library           JSONLibrary
 Library           String
 Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
-Resource          environment/thresholds.txt
 Library           OperatingSystem
 
 *** Test Cases ***
diff --git a/SOL002/VNFPerformanceManagement-API/environment/IndividualPmJob.txt b/SOL002/VNFPerformanceManagement-API/environment/IndividualPmJob.txt
deleted file mode 100644
index 3fc3b0a0d..000000000
--- a/SOL002/VNFPerformanceManagement-API/environment/IndividualPmJob.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-*** Variables ***
-${pmJobId}        29f4ff6a-be91-4ec8-856e-fcf1e2479e4e
-${erroneousPmJobId}    erroneousPmJobId
-${newPmJobId}    newPmJobId
-${response}=    httpresponse
-${OrigResponse}=    httpresponse
diff --git a/SOL002/VNFPerformanceManagement-API/environment/individualThresholds.txt b/SOL002/VNFPerformanceManagement-API/environment/individualThresholds.txt
deleted file mode 100644
index 1efba79c6..000000000
--- a/SOL002/VNFPerformanceManagement-API/environment/individualThresholds.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-*** Variables ***
-${thresholdId}    1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
-${erroneousThresholdId}    erroneousThresholdId
-${newThresholdId}    newThresholdId
-${response}=    httpresponse
-${origResponse}=    httpresponse
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/environment/pmJobs.txt b/SOL002/VNFPerformanceManagement-API/environment/pmJobs.txt
deleted file mode 100644
index 7d16002b3..000000000
--- a/SOL002/VNFPerformanceManagement-API/environment/pmJobs.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-*** Settings ***
-Resource          variables.txt    # Generic Parameters
-*** Variables ***
-${POS_FILTER}     objectInstanceIds=${objectInstanceIds}
-${NEG_FILTER}     criteriaPmJob=erroneousAttributeName
-${fields}         criteria,reports
-${response}=    httpresponse
-${SEPERATOR}      =
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/environment/reports.txt b/SOL002/VNFPerformanceManagement-API/environment/reports.txt
deleted file mode 100644
index 6ac5f7c0b..000000000
--- a/SOL002/VNFPerformanceManagement-API/environment/reports.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-*** Variables ***
-${pmJobId}        1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
-${reportId}       0fb4c875-e07f-46ca-a9dd-13907667a568
-${erroneousReportId}    erroneousReportId
-${newReportId}    newReportId
-${response}=    httpresponse
-${OrigResponse}=    httpresponse
diff --git a/SOL002/VNFPerformanceManagement-API/environment/thresholds.txt b/SOL002/VNFPerformanceManagement-API/environment/thresholds.txt
deleted file mode 100644
index b044c053e..000000000
--- a/SOL002/VNFPerformanceManagement-API/environment/thresholds.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-*** Variables ***
-${FILTER_OK}      objectInstanceId=1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
-${FILTER_KO}      criterias=erroneousFilter
-${response}=    httpresponse
-${SEPERATOR}      =
\ No newline at end of file
-- 
GitLab


From 6a1d6c7a9e8bd5fb23face78b21247a44b616d4d Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Thu, 15 Oct 2020 11:41:41 +0500
Subject: [PATCH 096/322] fix for issue 131

---
 .../NSLifecycleManagement-API/NotificationEndpoint.robot  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot b/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot
index 9290ef85e..b2723439b 100644
--- a/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot
+++ b/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot
@@ -46,8 +46,8 @@ NS Identifier Creation Notification
     ...    Applicability: none
     ...    Post-Conditions: none 
     Trigger the creation of a NS instance resource (external action)
-    Check NS Identifier Creation Notification Http POST Request Body Json Schema Is    NsIdentifierDeletionNotification
-    Check NS Identifier Creation Notification Http POST Request Body notificationType attribute Is    NsIdentifierDeletionNotification
+    Check NS Identifier Creation Notification Http POST Request Body Json Schema Is    NsIdentifierCreationNotification
+    Check NS Identifier Creation Notification Http POST Request Body notificationType attribute Is    NsIdentifierCreationNotification
     
 NS Identifier Deletion Notification
     [Documentation]    Test ID: 5.3.2.17.4
@@ -59,8 +59,8 @@ NS Identifier Deletion Notification
     ...    Applicability: none
     ...    Post-Conditions: none 
     Trigger the deletion of a NS instance resource (external action)
-    Check NS Identifier Deletion Notification Http POST Request Body Json Schema Is    NsIdentifierCreationNotification
-    Check NS Identifier Deletion Notification Http POST Request Body notificationType attribute Is    NsIdentifierCreationNotification
+    Check NS Identifier Deletion Notification Http POST Request Body Json Schema Is    NsIdentifierDeletionNotification
+    Check NS Identifier Deletion Notification Http POST Request Body notificationType attribute Is    NsIdentifierDeletionNotification
     
 *** Keywords ***
 Trigger a NS LCM operation (external action) 
-- 
GitLab


From 7531ca18b18b33868840a3500f4980ce4a91b553 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Fri, 16 Oct 2020 12:01:19 +0500
Subject: [PATCH 097/322] 2.7.1 SOL005 NSD deltas and bugs fix added

---
 SOL005/NSDManagement-API/NSD.robot            | 10 ++
 ...DContent.robot => NSDArchiveContent.robot} | 84 +---------------
 .../NSDManagementKeywords.robot               | 99 ++++++-------------
 ...Content.robot => PNFDArchiveContent.robot} | 55 +++++++++--
 SOL005/NSDManagement-API/Subscriptions.robot  | 24 +++--
 5 files changed, 105 insertions(+), 167 deletions(-)
 create mode 100644 SOL005/NSDManagement-API/NSD.robot
 rename SOL005/NSDManagement-API/{NSDContent.robot => NSDArchiveContent.robot} (66%)
 rename SOL005/NSDManagement-API/{PNFDContent.robot => PNFDArchiveContent.robot} (69%)

diff --git a/SOL005/NSDManagement-API/NSD.robot b/SOL005/NSDManagement-API/NSD.robot
new file mode 100644
index 000000000..6271e3afe
--- /dev/null
+++ b/SOL005/NSDManagement-API/NSD.robot
@@ -0,0 +1,10 @@
+*** Settings ***
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt    # Generic Parameters
+Resource          environment/nsDescriptors.txt    # Specific nsDescriptors Parameters
+Resource          NSDManagementKeywords.robot
+Library           JSONLibrary
+Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+Library           OperatingSystem
+
+*** Test Cases ***
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/NSDContent.robot b/SOL005/NSDManagement-API/NSDArchiveContent.robot
similarity index 66%
rename from SOL005/NSDManagement-API/NSDContent.robot
rename to SOL005/NSDManagement-API/NSDArchiveContent.robot
index aaf583164..1e6b6fb40 100644
--- a/SOL005/NSDManagement-API/NSDContent.robot
+++ b/SOL005/NSDManagement-API/NSDArchiveContent.robot
@@ -9,19 +9,6 @@ Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_veri
 Library           OperatingSystem
 
 *** Test Cases ***
-Get single file NSD Content in Plain Format
-    [Documentation]    Test ID: 5.3.1.3.1
-    ...    Test title: Get single file NSD Content in Plain Format
-    ...    Test objective: The objective is to test the retrieval of the NSD Content in plain format and perform a validation that returned content is in plain format
-    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The NSD is implemented as a single file
-    ...    Post-Conditions: none
-    Get single file NSD Content in Plain Format
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    text/plain
-
 Get NSD Content in Zip Format
     [Documentation]    Test ID: 5.3.1.3.2
     ...    Test title: Get NSD Content in Zip Format
@@ -35,45 +22,6 @@ Get NSD Content in Zip Format
     Check HTTP Response Status Code Is    200
     Check HTTP Response Header Content-Type Is    application/zip
 
-Get single file NSD Content in Plain or Zip Format
-    [Documentation]    Test ID: 5.3.1.3.3
-    ...    Test title: Get single file NSD Content in Plain or Zip Format
-    ...    Test objective: The objective is to test the retrieval of the single file NSD Content when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that returned content is in Plain or Zip format
-    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The NSD Content is implemented as a single file
-    ...    Post-Conditions: none
-    Get single file NSD Content in Plain or Zip Format
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is Any of   text/plain    application/zip
-    
-Get multi file NSD Content in Plain or Zip Format
-    [Documentation]    Test ID: 5.3.1.3.4
-    ...    Test title: Get multi file NSD Content in Plain or Zip Format
-    ...    Test objective: The objective is to test the retrieval of the multi file NSD Content when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that returned content is in Zip format
-    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The NSD is implemented as a multi file
-    ...    Post-Conditions: none
-    Get multi file NSD Content in Plain or Zip Format
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
-
-Get multi file NSD Content in Plain Format
-    [Documentation]    Test ID: 5.3.1.3.5
-    ...    Test title: Get multi file NSD Content in Plain Format
-    ...    Test objective: The objective is to test that the retrieval of the multi file NSD Content fails when requesting it in Plain format, and perform a validation of the JSON schema validation of the failed operation HTTP response
-    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The NSD Content is implemented as a multi file
-    ...    Post-Conditions: none
-    Get multi file NSD Content in Plain Format
-    Check HTTP Response Status Code Is    406
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-
 Get NSD Content with invalid resource identifier
     [Documentation]    Test ID: 5.3.1.3.6
     ...    Test title: Get NSD Content with invalid resource identifier
@@ -85,6 +33,7 @@ Get NSD Content with invalid resource identifier
     ...    Post-Conditions: none
     Get NSD Content with invalid resource identifier
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 Get NSD Content with conflict due to onboarding state
     [Documentation]    Test ID: 5.3.1.3.7
@@ -137,7 +86,8 @@ GET NSD Content with invalid Range Request
     ...    Applicability: The NFVO supports range requests to return single range of bytes from the NSD file
     ...    Post-Conditions: none      
     GET NSD Content with invalid Range Request
-    Check HTTP Response Status Code Is    416     
+    Check HTTP Response Status Code Is    416  
+    Check HTTP Response Body Json Schema Is   ProblemDetails   
         
 Upload NSD Content as Zip file in asynchronous mode
     [Documentation]    Test ID: 5.3.1.3.11
@@ -151,20 +101,6 @@ Upload NSD Content as Zip file in asynchronous mode
     Send PUT Request to upload NSD Content as zip file in asynchronous mode
     Check HTTP Response Status Code Is    202
     Check Post Condition NSD Content has been Uploaded
-    
-    
-Upload NSD Content as plain text file in asynchronous mode
-    [Documentation]    Test ID: 5.3.1.3.12
-    ...    Test title: Upload NSD Content as plain text file in asynchronous mode
-    ...    Test objective: The objective is to test the upload of an NSD Content in plain text format when the NFVO supports the asynchronous upload mode.
-    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The NFVO supports the upload of NSD contents in asynchronous mode
-    ...    Post-Conditions: none
-    Send PUT Request to upload NSD Content as plain text file in asynchronous mode
-    Check HTTP Response Status Code Is    202   
-    Check Post Condition NSD Content has been Uploaded
    
 Upload NSD Content as Zip file in synchronous mode
     [Documentation]    Test ID: 5.3.1.3.13
@@ -178,20 +114,6 @@ Upload NSD Content as Zip file in synchronous mode
     Send PUT Request to upload NSD Content as zip file in synchronous mode
     Check HTTP Response Status Code Is    204
     Check Postcondition NSD Content is uploaded and available in the NFVO
-    
-Upload NSD Content as plain text file in synchronous mode
-    [Documentation]    Test ID: 5.3.1.3.14
-    ...    Test title: Upload NSD Content as plain text file in synchronous mode
-    ...    Test objective: The objective is to test the upload of an NSD Content in plain text format when the NFVO supports the synchronous upload mode.
-    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The NFVO supports the upload of NSD contents in synchronous mode
-    ...    Post-Conditions: The NSD content is successfully uploaded and available in the NFVO
-    Send PUT Request to upload NSD Content as plain text file in synchronous mode
-    Check HTTP Response Status Code Is    204 
-    Check Postcondition NSD Content is uploaded and available in the NFVO
-
  
 Upload NSD Content with conflict due to onboarding state
    [Documentation]    Test ID: 5.3.1.3.15
diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index 9304e5e06..4304dc316 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -319,15 +319,7 @@ Check HTTP Response Header Content-Length Is Present and Matches the requested r
     Log    Check Content-Length HTTP Header
     Should Contain    ${response['headers']}    Content-Length
     Should Be Equal As Integers    ${response['headers']['Content-Length']}    ${length}
-    Log    Header Content-Length is present
-
-Get single file NSD Content in Plain Format
-    Log    Trying to get a NSD present in the NFVO Catalogue
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd_content
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output} 
+    Log    Header Content-Length is present 
 
 Get NSD Content in Zip Format
     Log    Trying to get a NSD present in the NFVO Catalogue
@@ -337,35 +329,8 @@ Get NSD Content in Zip Format
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
-Get single file NSD Content in Plain or Zip Format
-    Log    Trying to get a NSD present in the NFVO Catalogue
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd_content
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    
-Get multi file NSD Content in Plain or Zip Format
-    Log    Trying to get a VNFD from a given NSD Management present in the NFVO Catalogue
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output} 
-
-Get multi file NSD Content in Plain Format
-    Log    Trying to get a negative case performing a get on a NSD present in the NFVO Catalogue. Accept will be text/plain but NSD is composed my multiple files.
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output} 
-
 Get NSD Content with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${erroneous_nsdInfoId}/nsd_content
@@ -374,7 +339,6 @@ Get NSD Content with invalid resource identifier
 
 Get NSD Content with conflict due to onboarding state
     Log    Trying to get a VNFD from a given NSD Management present in the NFVO Catalogue
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${notOnboardedNsdInfoId}/nsd_content
@@ -410,18 +374,7 @@ Send PUT Request to upload NSD Content as zip file in asynchronous mode
     ${response}=    Output    response body
     Should Be Empty    ${response}
     ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output} 
-
-Send PUT Request to upload NSD Content as plain text file in asynchronous mode
-    Log    Trying to perform a PUT. This method upload the content of a NSD
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=  Get File  ${contentPlainFile}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd_content    ${body}
-    ${response}=    Output    response body
-    Should Be Empty    ${response}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output} 
+    Set Suite Variable    ${response}    ${output}  
 
 Send PUT Request to upload NSD Content as zip file in synchronous mode
     Log    Trying to perform a PUT. This method upload the content of a NSD
@@ -434,17 +387,6 @@ Send PUT Request to upload NSD Content as zip file in synchronous mode
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
-Send PUT Request to upload NSD Content as plain text file in synchronous mode
-    Log    Trying to perform a PUT. This method upload the content of a NSD
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=  Get File  ${contentPlainFile}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd_content    ${body}
-    ${response}=    Output    response body
-    Should Be Empty    ${response}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output} 
-
 Check Post Condition NSD Content has been Uploaded
     Log    Checking NsdOnboardingNotification Recieved
     Wait Until Keyword Succeeds    ${retry}    ${interval}  Check Response is NsdOnboardingNotification
@@ -458,7 +400,7 @@ Check Response is NsdOnboardingNotification
 
 
 Check Postcondition NSD Content is uploaded and available in the NFVO
-    Get single file NSD Content in Plain or Zip Format
+    Get NSD Content in Zip Format
     Check HTTP Response Status Code Is    200
  
 Send PUT Request to upload NSD Content with conflict due to onboarding state
@@ -718,7 +660,25 @@ Send PUT Request for Individual PNF Descriptor
 
 Get PNFD Content
     Log    Trying to get a NSD present in the NFVO Catalogue
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get PNFD Content with Range Request
+    Log    Trying to get a NSD present in the NFVO Catalogue with range request
+    Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
+    Set Headers    {"Range": "${range}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get PNFD Content with invalid Range Request
+    Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content
     ${output}=    Output    response
@@ -726,7 +686,7 @@ Get PNFD Content
 
 Get PNFD Content with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${erroneous_pnfdInfoId}/pnfd_content
     ${output}=    Output    response
@@ -734,15 +694,15 @@ Get PNFD Content with invalid resource identifier
 
 Get PNFD Content with conflict due to onboarding state
     Log    Trying to get a PNFD present in the NFVO Catalogue
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${onboardingStatePnfdId}/pnfd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
-Send PUT Request to upload PNFD Content as plain text file
+Send PUT Request to upload PNFD Content as zip file
     Log    Trying to perform a PUT. This method upload the content of a PNFD
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${body}=  Get File  ${contentFilePnfd}
     PUT    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content    ${body}
@@ -753,7 +713,7 @@ Send PUT Request to upload PNFD Content as plain text file
 
 Send PUT Request to upload PNFD Content with conflict due to onboarding state
     Log    Trying to perform a PUT. This method upload the content of a PNFD
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${body}=  Get Binary File  ${contentFilePnfd}
     PUT    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${creatingNsdInfoId}/pnfd_content    ${body}
@@ -1056,4 +1016,7 @@ Check PostCondition GET Individual Network Service Descriptor Information
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoId}
-    Should Be Equal As Strings     ${response['status']}    200
\ No newline at end of file
+    Should Be Equal As Strings     ${response['status']}    200
+    
+Wait for individual grant successful notification
+    Wait Until Keyword Succeeds    ${retry}   ${interval}    Get PNFD Content
diff --git a/SOL005/NSDManagement-API/PNFDContent.robot b/SOL005/NSDManagement-API/PNFDArchiveContent.robot
similarity index 69%
rename from SOL005/NSDManagement-API/PNFDContent.robot
rename to SOL005/NSDManagement-API/PNFDArchiveContent.robot
index 740ef2a26..ccf003da8 100644
--- a/SOL005/NSDManagement-API/PNFDContent.robot
+++ b/SOL005/NSDManagement-API/PNFDArchiveContent.robot
@@ -12,7 +12,7 @@ Library           OperatingSystem
 Get PNFD Content
     [Documentation]    Test ID: 5.3.1.6.1
     ...    Test title: Get PNFD Content
-    ...    Test objective: The objective is to test the retrieval of the PNFD Content in plain format and perform a validation that returned content is in plain format
+    ...    Test objective: The objective is to test the retrieval of the PNFD Content in zip format and perform a validation that returned content is in plain format
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
     ...    Reference: Clause 5.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
@@ -20,7 +20,7 @@ Get PNFD Content
     ...    Post-Conditions: none
     Get PNFD Content 
     Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    text/plain
+    Check HTTP Response Header Content-Type Is    application/zip
 
 Get PNFD Content with invalid resource identifier
     [Documentation]    Test ID: 5.3.1.6.2
@@ -47,27 +47,25 @@ Get PNFD Content with conflict due to onboarding state
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is   ProblemDetails
 
-
-Upload PNFD Content as plain text file
+Upload PNFD Content as zip file
     [Documentation]    Test ID: 5.3.1.6.4
-    ...    Test title: Upload PNFD Content as plain text file
+    ...    Test title: Upload PNFD Content as zip file
     ...    Test objective: The objective is to test the upload of a PNFD Content in plain text format.
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 5.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The uploaded PNFD content is available in the NFVO
-    Send PUT Request to upload PNFD Content as plain text file
+    Send PUT Request to upload PNFD Content as zip file
     Check HTTP Response Status Code Is    204
     Check Postcondition PNFD Content Exists
 
- 
 Upload PNFD Content with conflict due to onboarding state
    [Documentation]    Test ID: 5.3.1.6.5
     ...    Test title: Upload PNFD Content with conflict due to onboarding state
     ...    Test objective: The objective is to test that the upload of the PNFD Content fails due to a conflict when the PNFD is not in onboarding state CREATED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the PNFD for which the PNFD Content is requested is different from CREATED.
-    ...    Reference: Clause 5.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 5.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -111,3 +109,42 @@ DELETE PNFD Content - Method not implemented
     Send DELETE Request for PNFD Content
     Check HTTP Response Status Code Is    405
     Check Postcondition PNFD Content Exists
+
+Get PNFD Content with Range Request and NFVO supporting Range Requests
+    [Documentation]    Test ID: 5.3.1.6.9
+    ...    Test title: Get PNFD Content with Range Request and NFVO supporting Range Requests
+    ...    Test objective: The objective is to test the retrieval of the PNFD Content in plain format when using a range request to return single range of bytes from the file, with the NFVO supporting it
+    ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get PNFD Content with Range Request 
+    Check HTTP Response Status Code Is    206
+    Check HTTP Response Header Content-Type Is    application/zip
+    Check HTTP Response Header Content-Range Is Present and Matches the requested range
+    
+Get PNFD Content with invalid Range Request
+    [Documentation]    Test ID: 5.3.1.6.10
+    ...    Test title: Get PNFD Content with invalid Range Request
+    ...    Test objective: The objective is to test the retrieval of the PNFD Content in plain format and perform a validation that returned content is in plain format
+    ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get PNFD Content with invalid Range Request
+    Check HTTP Response Status Code Is    416
+    
+Upload PNFD Archive Content
+    [Documentation]    Test ID: 5.3.1.6.11
+    ...    Test title: Upload PNFD Archive Content
+    ...    Test objective: The objective is to test the PNFD archive has been accepted for uploading, but the processing has not been completed.
+    ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PUT Request to upload PNFD Content as zip file
+    Check HTTP Response Status Code Is    202
+    Wait for individual grant successful notification
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/Subscriptions.robot b/SOL005/NSDManagement-API/Subscriptions.robot
index d70615f82..131b7c2ff 100644
--- a/SOL005/NSDManagement-API/Subscriptions.robot
+++ b/SOL005/NSDManagement-API/Subscriptions.robot
@@ -24,7 +24,6 @@ Get All NSD Management Subscriptions
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    NsdmSubscriptions
     
-
 Get NSD Management Subscriptions with attribute-based filter
     [Documentation]    Test ID: 5.3.1.7.2
     ...    Test title: Get NSD Management Subscriptions with attribute-based filter
@@ -39,7 +38,6 @@ Get NSD Management Subscriptions with attribute-based filter
     Check HTTP Response Body Json Schema Is    NsdmSubscriptions
     Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filter
     
-
 Get NSD Management Subscriptions with invalid attribute-based filter
     [Documentation]    Test ID: 5.3.1.7.3
     ...    Test title: Get NSD Management Subscriptions with attribute-based filters
@@ -64,6 +62,7 @@ GET NSD Management Subscription with invalid resource endpoint
     ...    Post-Conditions: none   
     Get NSD Management Subscriptions with invalid resource endpoint
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails 
     
 Create new NSD Management subscription
     [Documentation]    Test ID: 5.3.1.7.5
@@ -80,7 +79,6 @@ Create new NSD Management subscription
     Check HTTP Response Body NsdmSubscription Attributes Values Match the Issued Subscription
     Check Postcondition NSD Management Subscription Is Set 
     
-
 Create duplicated NSD Management subscription with NFVO not creating duplicated subscriptions
     [Tags]    no-duplicated-subs
     [Documentation]    Test ID: 5.3.1.7.6
@@ -97,7 +95,6 @@ Create duplicated NSD Management subscription with NFVO not creating duplicated
     Check HTTP Response Header Contains    Location
     Check Postcondition Subscription Resource Returned in Location Header Is Available
 
-
 Create duplicated NSD Management subscription with NFVO creating duplicated subscriptions
     [Tags]    duplicated-subs
     [Documentation]    Test ID: 5.3.1.7.7
@@ -114,7 +111,6 @@ Create duplicated NSD Management subscription with NFVO creating duplicated subs
     Check HTTP Response Body NsdmSubscription Attributes Values Match the Issued Subscription
     Check Postcondition NSD Management Subscription Is Set 
 
-
 PUT NSD Management Subscriptions - Method not implemented
     [Documentation]    Test ID: 5.3.1.7.8
     ...    Test title: PUT NSD Management Subscriptions - Method not implemented
@@ -126,8 +122,7 @@ PUT NSD Management Subscriptions - Method not implemented
     ...    Post-Conditions: none
     Send Put Request for NSD Management Subscriptions
     Check HTTP Response Status Code Is    405
-    
-    
+        
 PATCH NSD Management Subscriptions - Method not implemented
     [Documentation]    Test ID: 5.3.1.7.9
     ...    Test title: PATCH NSD Management Subscriptions - Method not implemented
@@ -139,7 +134,6 @@ PATCH NSD Management Subscriptions - Method not implemented
     ...    Post-Conditions: none
     Send Patch Request for NSD Management Subscriptions
     Check HTTP Response Status Code Is    405
-    
         
 DELETE NSD Management Subscriptions - Method not implemented
     [Documentation]    Test ID: 5.3.1.7.10
@@ -178,4 +172,16 @@ Get NSD Management Subscriptions - Bad Request Response too Big
     ...    Post-Conditions: none
     Get all NSD Management Subscriptions
     Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is   ProblemDetails
\ No newline at end of file
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+Create new NSD Management subscription - Unprocessable Entity
+    [Documentation]    Test ID: 5.3.1.7.13
+    ...    Test title: Create new NSD Management subscription - Unprocessable Entity
+    ...    Test objective: The objective is to test the creation of a new NSD Management subscription fials when content type of the payload body is supported and the payload body of a request contains syntactically correct data but the data cannot be processed
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send Post Request for NSD Management Subscription
+    Check HTTP Response Status Code Is    422
\ No newline at end of file
-- 
GitLab


From 43547b7b4c4751fa22ca79ae617a57ee9dac4393 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Fri, 16 Oct 2020 12:02:12 +0500
Subject: [PATCH 098/322] TDs removed

---
 SOL005/NSDManagement-API/NSDArchiveContent.robot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SOL005/NSDManagement-API/NSDArchiveContent.robot b/SOL005/NSDManagement-API/NSDArchiveContent.robot
index 1e6b6fb40..7a1e39016 100644
--- a/SOL005/NSDManagement-API/NSDArchiveContent.robot
+++ b/SOL005/NSDManagement-API/NSDArchiveContent.robot
@@ -163,4 +163,4 @@ DELETE NSD Content - Method not implemented
     ...    Post-Conditions: The NSD content is not deleted by the failed operation
     Send DELETE Request for NSD Content
     Check HTTP Response Status Code Is    405
-    Check Postcondition NSD Content Exists
+    Check Postcondition NSD Content Exists
\ No newline at end of file
-- 
GitLab


From 632473819a5c7c4e58213c6f5b8ceac143489ce1 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Fri, 16 Oct 2020 15:06:10 +0500
Subject: [PATCH 099/322] New Resource NSD added

---
 SOL005/NSDManagement-API/NSD.robot            | 142 +++++++++++++++++-
 .../NSDManagementKeywords.robot               |  95 +++++++++++-
 2 files changed, 234 insertions(+), 3 deletions(-)

diff --git a/SOL005/NSDManagement-API/NSD.robot b/SOL005/NSDManagement-API/NSD.robot
index 6271e3afe..2757b4872 100644
--- a/SOL005/NSDManagement-API/NSD.robot
+++ b/SOL005/NSDManagement-API/NSD.robot
@@ -7,4 +7,144 @@ Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
 Library           OperatingSystem
 
-*** Test Cases ***
\ No newline at end of file
+*** Test Cases ***
+*** Test Cases ***
+Get single file NSD Content in Plain Format
+    [Documentation]    Test ID: 5.3.1.10.1
+    ...    Test title: Get single file NSD in Plain Format
+    ...    Test objective: The objective is to test the retrieval of the NSD in plain format within a NSD archive and perform a validation that returned content is in plain format
+    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NSD is implemented as a single file
+    ...    Post-Conditions: none
+    Get single file NSD in Plain Format
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    text/plain
+
+Get NSD in Zip Format
+    [Documentation]    Test ID: 5.3.1.10.2
+    ...    Test title: Get NSD in Zip Format
+    ...    Test objective: The objective is to test the retrieval of the NSD in zip format within a NSD archive and perform a validation that returned content is in zip format
+    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get NSD in Zip Format
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+
+Get single file NSD in Plain or Zip Format 
+    [Documentation]    Test ID: 5.3.1.10.3
+    ...    Test title: Get single file NSDin Plain or Zip Format
+    ...    Test objective: The objective is to test the retrieval of the single file NSD within a NSD archive when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that response is in Plain or Zip format
+    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NSD is implemented as a single file
+    ...    Post-Conditions: none
+    Get single file NSD in Plain or Zip Format
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is Any of   text/plain    application/zip
+    
+Get multi file NSD in Plain or Zip Format
+    [Documentation]    Test ID: 5.3.1.10.4
+    ...    Test title: Get multi file NSD in Plain or Zip Format
+    ...    Test objective: The objective is to test the retrieval of the multi file NSD within a NSD archive when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that returned content is in Zip format
+    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NSD is implemented as a multi file
+    ...    Post-Conditions: none
+    Get multi file NSD in Plain or Zip Format
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+
+Get multi file NSD in Plain Format
+    [Documentation]    Test ID: 5.3.1.10.5
+    ...    Test title: Get multi file NSD in Plain Format
+    ...    Test objective: The objective is to test that the retrieval of the multi file NSD within a NSD archive fails when requesting it in Plain format, and perform a validation of the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NSD is implemented as a multi file
+    ...    Post-Conditions: none
+    Get multi file NSD in Plain Format
+    Check HTTP Response Status Code Is    406
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+
+Get NSD Content with invalid resource identifier
+    [Documentation]    Test ID: 5.3.1.10.6
+    ...    Test title: Get NSD Content with invalid resource identifier
+    ...    Test objective: The objective is to test that the retrieval of the NSD within a NSD archive fails when using an invalid resource identifier
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get NSD with invalid resource identifier
+    Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+
+Get NSD with conflict due to onboarding state
+    [Documentation]    Test ID: 5.3.1.10.7
+    ...    Test title: Get NSD with conflict due to onboarding state
+    ...    Test objective: The objective is to test that the retrieval of the NSD within a NSD archive fails due to a conflict when the NSD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: The onboarding state of the NSD is different from ONBOARDED.
+    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Get NSD with conflict due to onboarding state
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails              
+
+POST NSD - Method not implemented
+    [Documentation]    Test ID: 5.3.1.10.8
+    ...    Test title: POST NSD - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not allowed to create a new Network Service Descriptor
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.4a.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send POST Request for NSD
+    Check HTTP Response Status Code Is    405
+    
+PUT NSD - Method not implemented
+    [Documentation]    Test ID: 5.3.1.10.9
+    ...    Test title: PUT NSD - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.4a.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PUT Request for NSD
+    Check HTTP Response Status Code Is    405
+
+PATCH NSD Content - Method not implemented
+    [Documentation]    Test ID: 5.3.1.10.10
+    ...    Test title: PATCH NSD Content - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.4a.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PATCH Request for NSD Content
+    Check HTTP Response Status Code Is    405
+
+DELETE NSD Content - Method not implemented
+    [Documentation]    Test ID: 5.3.1.10.11
+    ...    Test title: DELETE NSD Content - Method not implemented
+    ...    Test objective: The objective is to test that DELETE method is not allowed to delete Network Service Descriptor content
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.4a.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: The NSD content is not deleted by the failed operation
+    Send DELETE Request for NSD Content
+    Check HTTP Response Status Code Is    405
+    Check Postcondition NSD Content Exists
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index 4304dc316..9967ec48b 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -849,8 +849,7 @@ Check HTTP Response Status Code Is
     [Arguments]    ${expected_status}    
     Should Be Equal As Strings     ${response['status']}    ${expected_status}
     Log    Status code validated 
-    
-    
+        
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
     Should Contain    ${response['headers']['Content-Type']}    application/json
@@ -1020,3 +1019,95 @@ Check PostCondition GET Individual Network Service Descriptor Information
     
 Wait for individual grant successful notification
     Wait Until Keyword Succeeds    ${retry}   ${interval}    Get PNFD Content
+
+Get single file NSD in Plain Format
+    Log    Trying to get a NSD present in the NFVO Catalogue
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Get NSD in Zip Format
+    Log    Trying to get a NSD present in the NFVO Catalogue
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get single file NSD in Plain or Zip Format
+    Log    Trying to get a NSD present in the NFVO Catalogue
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Get multi file NSD in Plain or Zip Format
+    Log    Trying to get a VNFD from a given NSD Management present in the NFVO Catalogue
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Get multi file NSD in Plain Format
+    Log    Trying to get a negative case performing a get on a NSD present in the NFVO Catalogue. Accept will be text/plain but NSD is composed my multiple files.
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get NSD with invalid resource identifier
+    Log    Trying to perform a negative get, using an erroneous package ID
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${erroneous_nsdInfoId}/nsd
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get NSD with conflict due to onboarding state
+    Log    Trying to get a VNFD from a given NSD Management present in the NFVO Catalogue
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${notOnboardedNsdInfoId}/nsd
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
+    
+Send POST Request for NSD
+    Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
+    Log    Trying to perform a POST. This method should not be implemented
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    POST    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
+
+Send PUT Request for NSD
+    Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
+    Log    Trying to perform a PATCH. This method should not be implemented
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    PUT    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
+
+Send PATCH Request for NSD
+    Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
+    Log    Trying to perform a PATCH. This method should not be implemented
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    PATCH    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
+
+Send DELETE Request for NSD
+    Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
+    Log    Trying to perform a DELETE. This method should not be implemented
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    DELETE    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
-- 
GitLab


From 0ec571627c324f442e5e1521f731178566718ea4 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Fri, 16 Oct 2020 15:07:55 +0500
Subject: [PATCH 100/322] minor bugs fixed

---
 SOL005/NSDManagement-API/NSD.robot             | 18 ++++++++----------
 .../NSDManagement-API/NSDArchiveContent.robot  | 11 +++++------
 .../NSDManagementKeywords.robot                |  3 ---
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/SOL005/NSDManagement-API/NSD.robot b/SOL005/NSDManagement-API/NSD.robot
index 2757b4872..e71c8d905 100644
--- a/SOL005/NSDManagement-API/NSD.robot
+++ b/SOL005/NSDManagement-API/NSD.robot
@@ -7,7 +7,6 @@ Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
 Library           OperatingSystem
 
-*** Test Cases ***
 *** Test Cases ***
 Get single file NSD Content in Plain Format
     [Documentation]    Test ID: 5.3.1.10.1
@@ -124,27 +123,26 @@ PUT NSD - Method not implemented
     Send PUT Request for NSD
     Check HTTP Response Status Code Is    405
 
-PATCH NSD Content - Method not implemented
+PATCH NSD - Method not implemented
     [Documentation]    Test ID: 5.3.1.10.10
-    ...    Test title: PATCH NSD Content - Method not implemented
+    ...    Test title: PATCH NSD - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.4a.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
-    Send PATCH Request for NSD Content
+    Send PATCH Request for NSD
     Check HTTP Response Status Code Is    405
 
-DELETE NSD Content - Method not implemented
+DELETE NSD - Method not implemented
     [Documentation]    Test ID: 5.3.1.10.11
-    ...    Test title: DELETE NSD Content - Method not implemented
-    ...    Test objective: The objective is to test that DELETE method is not allowed to delete Network Service Descriptor content
+    ...    Test title: DELETE NSD - Method not implemented
+    ...    Test objective: The objective is to test that DELETE method is not allowed to delete Network Service Descriptor
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.4a.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NSD content is not deleted by the failed operation
+    ...    Post-Conditions: none
     Send DELETE Request for NSD Content
-    Check HTTP Response Status Code Is    405
-    Check Postcondition NSD Content Exists
\ No newline at end of file
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/NSDArchiveContent.robot b/SOL005/NSDManagement-API/NSDArchiveContent.robot
index 7a1e39016..045c3f3af 100644
--- a/SOL005/NSDManagement-API/NSDArchiveContent.robot
+++ b/SOL005/NSDManagement-API/NSDArchiveContent.robot
@@ -94,7 +94,7 @@ Upload NSD Content as Zip file in asynchronous mode
     ...    Test title: Upload NSD Content as Zip file in asynchronous mode
     ...    Test objective: The objective is to test the upload of an NSD Content in Zip format when the NFVO supports the asynchronous upload mode.
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 5.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the upload of NSD contents in asynchronous mode
     ...    Post-Conditions: NSD Uploaded
@@ -107,7 +107,7 @@ Upload NSD Content as Zip file in synchronous mode
     ...    Test title: Upload NSD Content as Zip file in synchronous mode
     ...    Test objective: The objective is to test the upload of an NSD Content in Zip format when the NFVO supports the synchronous upload mode.
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 5.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the upload of NSD contents in synchronous mode
     ...    Post-Conditions: The NSD content is successfully uploaded and available in the NFVO
@@ -120,7 +120,7 @@ Upload NSD Content with conflict due to onboarding state
     ...    Test title: Upload NSD Content with conflict due to onboarding state
     ...    Test objective: The objective is to test that the upload of the NSD Content fails due to a conflict when the NSD is not in onboarding state CREATED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the NSD for which the NSD Content is requested is different from ONBOARDED.
-    ...    Reference: Clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Reference: Clause 5.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -160,7 +160,6 @@ DELETE NSD Content - Method not implemented
     ...    Reference: Clause 5.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NSD content is not deleted by the failed operation
+    ...    Post-Conditions: none
     Send DELETE Request for NSD Content
-    Check HTTP Response Status Code Is    405
-    Check Postcondition NSD Content Exists
\ No newline at end of file
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index 9967ec48b..61ec26c2b 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -436,9 +436,6 @@ Send DELETE Request for NSD Content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
-Check Postcondition NSD Content Exists
-    Get NSD Content in Zip Format
-
 GET all PNF Descriptors Information
     Log    The GET method queries multiple PNF descriptors
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-- 
GitLab


From 731933e071324078e0c4e17fd580df82ec0ccf17 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Fri, 16 Oct 2020 15:58:48 +0500
Subject: [PATCH 101/322] New Resource NSD Archive Manifest added

---
 SOL005/NSDManagement-API/NSD.robot            | 25 ++++++--
 .../NSDManagementKeywords.robot               | 64 +++++++++++++++++++
 2 files changed, 83 insertions(+), 6 deletions(-)

diff --git a/SOL005/NSDManagement-API/NSD.robot b/SOL005/NSDManagement-API/NSD.robot
index e71c8d905..b70f7ab85 100644
--- a/SOL005/NSDManagement-API/NSD.robot
+++ b/SOL005/NSDManagement-API/NSD.robot
@@ -97,10 +97,23 @@ Get NSD with conflict due to onboarding state
     ...    Post-Conditions: none 
     Get NSD with conflict due to onboarding state
     Check HTTP Response Status Code Is    409
-    Check HTTP Response Body Json Schema Is   ProblemDetails              
+    Check HTTP Response Body Json Schema Is   ProblemDetails    
+    
+Get NSD with security information
+    [Documentation]    Test ID: 5.3.1.10.8
+    ...    Test title: Get NSD with security information
+    ...    Test objective: The objective is to test the retrieval of the NSD within a NSD archive shall include in the ZIP archive the security information when requested with "include_signature" parameter
+    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get NSD with security information
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip          
 
 POST NSD - Method not implemented
-    [Documentation]    Test ID: 5.3.1.10.8
+    [Documentation]    Test ID: 5.3.1.10.9
     ...    Test title: POST NSD - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new Network Service Descriptor
     ...    Pre-conditions: none
@@ -112,7 +125,7 @@ POST NSD - Method not implemented
     Check HTTP Response Status Code Is    405
     
 PUT NSD - Method not implemented
-    [Documentation]    Test ID: 5.3.1.10.9
+    [Documentation]    Test ID: 5.3.1.10.10
     ...    Test title: PUT NSD - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor
     ...    Pre-conditions: none
@@ -124,7 +137,7 @@ PUT NSD - Method not implemented
     Check HTTP Response Status Code Is    405
 
 PATCH NSD - Method not implemented
-    [Documentation]    Test ID: 5.3.1.10.10
+    [Documentation]    Test ID: 5.3.1.10.11
     ...    Test title: PATCH NSD - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor
     ...    Pre-conditions: none
@@ -136,7 +149,7 @@ PATCH NSD - Method not implemented
     Check HTTP Response Status Code Is    405
 
 DELETE NSD - Method not implemented
-    [Documentation]    Test ID: 5.3.1.10.11
+    [Documentation]    Test ID: 5.3.1.10.12
     ...    Test title: DELETE NSD - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete Network Service Descriptor
     ...    Pre-conditions: none
@@ -144,5 +157,5 @@ DELETE NSD - Method not implemented
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
-    Send DELETE Request for NSD Content
+    Send DELETE Request for NSD
     Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index 61ec26c2b..60d89bf45 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -1108,3 +1108,67 @@ Send DELETE Request for NSD
     DELETE    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
+    
+Get NSD with security information
+    Log    Trying to get a NSD present in the NFVO Catalogue
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd/include_signatures
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get NSD Archive Manifest
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdPlain}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get NSD Archive Manifest with security information
+    Log    Trying to get a NSD present in the NFVO Catalogue
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/manifest/include_signatures
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Get NSD Archive Manifest with conflict due to onboarding state
+    Log    Trying to get a VNFD from a given NSD Management present in the NFVO Catalogue
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${notOnboardedNsdInfoId}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Send POST Request for NSD Archive Manifest
+    Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
+    Log    Trying to perform a POST. This method should not be implemented
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    POST    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
+
+Send PUT Request for NSD Archive Manifest
+    Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
+    Log    Trying to perform a PATCH. This method should not be implemented
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    PUT    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
+
+Send PATCH Request for NSD Archive Manifest
+    Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
+    Log    Trying to perform a PATCH. This method should not be implemented
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    PATCH    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
+
+Send DELETE Request for NSD Archive Manifest
+    Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
+    Log    Trying to perform a DELETE. This method should not be implemented
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    DELETE    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
\ No newline at end of file
-- 
GitLab


From 2a68cb3510b9800d284e58835e8071453f14fa5f Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Fri, 16 Oct 2020 16:00:40 +0500
Subject: [PATCH 102/322] file NSDArchiveManifest.robot added

---
 .../NSDArchiveManifest.robot                  | 96 +++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 SOL005/NSDManagement-API/NSDArchiveManifest.robot

diff --git a/SOL005/NSDManagement-API/NSDArchiveManifest.robot b/SOL005/NSDManagement-API/NSDArchiveManifest.robot
new file mode 100644
index 000000000..3980452b9
--- /dev/null
+++ b/SOL005/NSDManagement-API/NSDArchiveManifest.robot
@@ -0,0 +1,96 @@
+*** Settings ***
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt    # Generic Parameters
+Resource          environment/nsDescriptors.txt    # Specific nsDescriptors Parameters
+Resource          NSDManagementKeywords.robot
+Library           JSONLibrary
+Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+Library           OperatingSystem
+
+*** Test Cases ***
+Get NSD Archive Manifest
+    [Documentation]    Test ID: 5.3.1.11.1
+    ...    Test title: Get NSD Archive Manifest
+    ...    Test objective: The objective is to test that GET method reads the content of the manifest file within an NSD archive
+    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get NSD Archive Manifest
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    text/plain
+    
+Get NSD Archive Manifest with security information
+    [Documentation]    Test ID: 5.3.1.11.2
+    ...    Test title: Get NSD Archive Manifest with security information
+    ...    Test objective: The objective is to test the retrieval of content of the manifest file within an NSD archive shall include in the ZIP archive the security information when requested with "include_signature" parameter
+    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get NSD Archive Manifest with security information
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get NSD Archive Manifest with conflict due to onboarding state
+    [Documentation]    Test ID: 5.3.1.11.3
+    ...    Test title: Get NSD Archive Manifest with conflict due to onboarding state
+    ...    Test objective: The objective is to test that the retrieval of content of the manifest file within an NSD archive fails due to a conflict when the NSD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: The onboarding state of the NSD is different from ONBOARDED.
+    ...    Reference: Clause 5.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Get NSD Archive Manifest with conflict due to onboarding state
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails  
+    
+POST NSD Archive Manifest - Method not implemented
+    [Documentation]    Test ID: 5.3.1.11.4
+    ...    Test title: POST NSD Archive Manifest - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not allowed to create a new Network Service Descriptor Archive Manifest
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.4b.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send POST Request for NSD Archive Manifest
+    Check HTTP Response Status Code Is    405
+    
+PUT NSD Archive Manifest - Method not implemented
+    [Documentation]    Test ID: 5.3.1.11.5
+    ...    Test title: PUT NSD Archive Manifest - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor Archive Manifest
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.4b.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PUT Request for NSD Archive Manifest
+    Check HTTP Response Status Code Is    405
+
+PATCH NSD Archive Manifest - Method not implemented
+    [Documentation]    Test ID: 5.3.1.11.6
+    ...    Test title: PATCH NSD Archive Manifest - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor Archive Manifest
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.4b.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PATCH Request for NSD Archive Manifest
+    Check HTTP Response Status Code Is    405
+
+DELETE NSD Archive Manifest - Method not implemented
+    [Documentation]    Test ID: 5.3.1.11.7
+    ...    Test title: DELETE NSD Archive Manifest - Method not implemented
+    ...    Test objective: The objective is to test that DELETE method is not allowed to delete Network Service Descriptor Archive Manifest
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.4b.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send DELETE Request for NSD Archive Manifest
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
-- 
GitLab


From 604b196ad9cbdf04c7075c786011491f1e5b9172 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 20 Oct 2020 15:28:11 +0500
Subject: [PATCH 103/322] New Resource PNFD added

---
 SOL005/NSDManagement-API/NSD.robot            |   2 +-
 .../NSDManagementKeywords.robot               | 102 ++++++++++-
 SOL005/NSDManagement-API/PNFD.robot           | 162 ++++++++++++++++++
 .../PNFDArchiveContent.robot                  |   5 +-
 4 files changed, 267 insertions(+), 4 deletions(-)
 create mode 100644 SOL005/NSDManagement-API/PNFD.robot

diff --git a/SOL005/NSDManagement-API/NSD.robot b/SOL005/NSDManagement-API/NSD.robot
index b70f7ab85..f91965cae 100644
--- a/SOL005/NSDManagement-API/NSD.robot
+++ b/SOL005/NSDManagement-API/NSD.robot
@@ -8,7 +8,7 @@ Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_veri
 Library           OperatingSystem
 
 *** Test Cases ***
-Get single file NSD Content in Plain Format
+Get single file NSD in Plain Format
     [Documentation]    Test ID: 5.3.1.10.1
     ...    Test title: Get single file NSD in Plain Format
     ...    Test objective: The objective is to test the retrieval of the NSD in plain format within a NSD archive and perform a validation that returned content is in plain format
diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index 60d89bf45..a07d543c9 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -1171,4 +1171,104 @@ Send DELETE Request for NSD Archive Manifest
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
     ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output} 
\ No newline at end of file
+    Set Suite Variable    ${response}    ${output} 
+    
+Get single file PNFD in Plain Format
+    Log    Trying to get a PNFD present in the NFVO Catalogue
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get PNFD in Zip Format
+    Log    Trying to get a PNFD present in the NFVO Catalogue
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get single file PNFD in Plain or Zip Format
+    Log    Trying to get a PNFD present in the NFVO Catalogue
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Get multi file PNFD in Plain or Zip Format
+    Log    Trying to get a VNFD from a given PNFD Management present in the NFVO Catalogue
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Get multi file PNFD in Plain Format
+    Log    Trying to get a negative case performing a get on a PNFD present in the NFVO Catalogue. Accept will be text/plain but PNFD is composed my multiple files.
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get PNFD with invalid resource identifier
+    Log    Trying to perform a negative get, using an erroneous package ID
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${erroneous_PNFDInfoId}/pnfd
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get PNFD with conflict due to onboarding state
+    Log    Trying to get a VNFD from a given PNFD Management present in the NFVO Catalogue
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${onboardingStatePnfdId}/pnfd
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
+    
+Get PNFD with security information
+    Log    Trying to get a PNFD present in the NFVO Catalogue
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/pnfd/include_signatures
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Send POST Request for PNFD
+    Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
+    Log    Trying to perform a POST. This method should not be implemented
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    POST    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
+
+Send PUT Request for PNFD
+    Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
+    Log    Trying to perform a PATCH. This method should not be implemented
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    PUT    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
+
+Send PATCH Request for PNFD
+    Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
+    Log    Trying to perform a PATCH. This method should not be implemented
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    PATCH    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
+
+Send DELETE Request for PNFD
+    Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
+    Log    Trying to perform a DELETE. This method should not be implemented
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    DELETE    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
diff --git a/SOL005/NSDManagement-API/PNFD.robot b/SOL005/NSDManagement-API/PNFD.robot
new file mode 100644
index 000000000..e1bdb91ca
--- /dev/null
+++ b/SOL005/NSDManagement-API/PNFD.robot
@@ -0,0 +1,162 @@
+*** Settings ***
+Documentation     This Clause defines the content of the individual NS descriptor, i.e. PNFD content
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt    # Generic Parameters
+Resource          environment/pnfDescriptors.txt    # Specific PNFDescriptors Parameters
+Resource          NSDManagementKeywords.robot
+Library           JSONLibrary
+Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+Library           OperatingSystem
+
+*** Test Cases ***
+Get single file PNFD in Plain Format
+    [Documentation]    Test ID: 5.3.1.11.1
+    ...    Test title: Get single file PNFD in Plain Format
+    ...    Test objective: The objective is to test the retrieval of the PNFD in plain format within a PNFD archive and perform a validation that returned content is in plain format
+    ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The PNFD is implemented as a single file
+    ...    Post-Conditions: none
+    Get single file PNFD in Plain Format
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    text/plain
+
+Get PNFD in Zip Format
+    [Documentation]    Test ID: 5.3.1.11.2
+    ...    Test title: Get PNFD in Zip Format
+    ...    Test objective: The objective is to test the retrieval of the PNFD in zip format within a PNFD archive and perform a validation that returned content is in zip format
+    ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get PNFD in Zip Format
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+
+Get single file PNFD in Plain or Zip Format 
+    [Documentation]    Test ID: 5.3.1.11.3
+    ...    Test title: Get single file PNFDin Plain or Zip Format
+    ...    Test objective: The objective is to test the retrieval of the single file PNFD within a PNFD archive when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that response is in Plain or Zip format
+    ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The PNFD is implemented as a single file
+    ...    Post-Conditions: none
+    Get single file PNFD in Plain or Zip Format
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is Any of   text/plain    application/zip
+    
+Get multi file PNFD in Plain or Zip Format
+    [Documentation]    Test ID: 5.3.1.11.4
+    ...    Test title: Get multi file PNFD in Plain or Zip Format
+    ...    Test objective: The objective is to test the retrieval of the multi file PNFD within a PNFD archive when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that returned content is in Zip format
+    ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The PNFD is implemented as a multi file
+    ...    Post-Conditions: none
+    Get multi file PNFD in Plain or Zip Format
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+
+Get multi file PNFD in Plain Format
+    [Documentation]    Test ID: 5.3.1.11.5
+    ...    Test title: Get multi file PNFD in Plain Format
+    ...    Test objective: The objective is to test that the retrieval of the multi file PNFD within a PNFD archive fails when requesting it in Plain format, and perform a validation of the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The PNFD is implemented as a multi file
+    ...    Post-Conditions: none
+    Get multi file PNFD in Plain Format
+    Check HTTP Response Status Code Is    406
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+
+Get PNFD Content with invalid resource identifier
+    [Documentation]    Test ID: 5.3.1.11.6
+    ...    Test title: Get PNFD Content with invalid resource identifier
+    ...    Test objective: The objective is to test that the retrieval of the PNFD within a PNFD archive fails when using an invalid resource identifier
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get PNFD with invalid resource identifier
+    Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+
+Get PNFD with conflict due to onboarding state
+    [Documentation]    Test ID: 5.3.1.11.7
+    ...    Test title: Get PNFD with conflict due to onboarding state
+    ...    Test objective: The objective is to test that the retrieval of the PNFD within a PNFD archive fails due to a conflict when the PNFD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: The onboarding state of the PNFD is different from ONBOARDED.
+    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Get PNFD with conflict due to onboarding state
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails    
+    
+Get PNFD with security information
+    [Documentation]    Test ID: 5.3.1.11.8
+    ...    Test title: Get PNFD with security information
+    ...    Test objective: The objective is to test the retrieval of the PNFD within a PNFD archive shall include in the ZIP archive the security information when requested with "include_signature" parameter
+    ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get PNFD with security information
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip   
+    
+POST PNFD - Method not implemented
+    [Documentation]    Test ID: 5.3.1.11.9
+    ...    Test title: POST PNFD - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not allowed to create a new PNFD
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.7a.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send POST Request for PNFD
+    Check HTTP Response Status Code Is    405
+    
+PUT PNFD - Method not implemented
+    [Documentation]    Test ID: 5.3.1.11.10
+    ...    Test title: PUT PNFD - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to update PNFD
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.7a.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PUT Request for PNFD
+    Check HTTP Response Status Code Is    405
+
+PATCH PNFD - Method not implemented
+    [Documentation]    Test ID: 5.3.1.11.11
+    ...    Test title: PATCH PNFD - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to update PNFD
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.7a.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PATCH Request for PNFD
+    Check HTTP Response Status Code Is    405
+
+DELETE PNFD - Method not implemented
+    [Documentation]    Test ID: 5.3.1.11.12
+    ...    Test title: DELETE PNFD - Method not implemented
+    ...    Test objective: The objective is to test that DELETE method is not allowed to delete PNFD
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.7a.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send DELETE Request for PNFD
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/PNFDArchiveContent.robot b/SOL005/NSDManagement-API/PNFDArchiveContent.robot
index ccf003da8..7a1697cc0 100644
--- a/SOL005/NSDManagement-API/PNFDArchiveContent.robot
+++ b/SOL005/NSDManagement-API/PNFDArchiveContent.robot
@@ -33,6 +33,7 @@ Get PNFD Content with invalid resource identifier
     ...    Post-Conditions: none
     Get PNFD Content with invalid resource identifier
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 Get PNFD Content with conflict due to onboarding state
     [Documentation]    Test ID: 5.3.1.6.3
@@ -105,10 +106,9 @@ DELETE PNFD Content - Method not implemented
     ...    Reference: Clause 5.4.7.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The PNFD content is not deleted by the failed operation
+    ...    Post-Conditions: none
     Send DELETE Request for PNFD Content
     Check HTTP Response Status Code Is    405
-    Check Postcondition PNFD Content Exists
 
 Get PNFD Content with Range Request and NFVO supporting Range Requests
     [Documentation]    Test ID: 5.3.1.6.9
@@ -135,6 +135,7 @@ Get PNFD Content with invalid Range Request
     ...    Post-Conditions: none
     Get PNFD Content with invalid Range Request
     Check HTTP Response Status Code Is    416
+    Check HTTP Response Body Json Schema Is   ProblemDetails
     
 Upload PNFD Archive Content
     [Documentation]    Test ID: 5.3.1.6.11
-- 
GitLab


From 863f070cb9cb0ef763a26520f91f6ce1b8933146 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 21 Oct 2020 10:50:55 +0500
Subject: [PATCH 104/322] New Resource PNFD Archive Manifest addedand fix
 issues

---
 .../NSDManagementKeywords.robot               | 56 +++++++++++
 SOL005/NSDManagement-API/PNFD.robot           | 24 ++---
 .../PNFDArchiveManifest.robot                 | 96 +++++++++++++++++++
 3 files changed, 164 insertions(+), 12 deletions(-)
 create mode 100644 SOL005/NSDManagement-API/PNFDArchiveManifest.robot

diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index a07d543c9..245cac747 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -1272,3 +1272,59 @@ Send DELETE Request for PNFD
     DELETE    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
+
+Get PNFD Archive Manifest
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get PNFD Archive Manifest with security information
+    Log    Trying to get a PNFD present in the NFVO Catalogue
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/manifest/include_signatures
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Get PNFD Archive Manifest with conflict due to onboarding state
+    Log    Trying to get a PNFD Management present in the NFVO Catalogue
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${notOnboardedNsdInfoId}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Send POST Request for PNFD Archive Manifest
+    Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
+    Log    Trying to perform a POST. This method should not be implemented
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    POST    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
+
+Send PUT Request for PNFD Archive Manifest
+    Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
+    Log    Trying to perform a PATCH. This method should not be implemented
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    PUT    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
+
+Send PATCH Request for PNFD Archive Manifest
+    Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
+    Log    Trying to perform a PATCH. This method should not be implemented
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    PATCH    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
+
+Send DELETE Request for PNFD Archive Manifest
+    Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
+    Log    Trying to perform a DELETE. This method should not be implemented
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    DELETE    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/PNFD.robot b/SOL005/NSDManagement-API/PNFD.robot
index e1bdb91ca..c63bc467c 100644
--- a/SOL005/NSDManagement-API/PNFD.robot
+++ b/SOL005/NSDManagement-API/PNFD.robot
@@ -10,7 +10,7 @@ Library           OperatingSystem
 
 *** Test Cases ***
 Get single file PNFD in Plain Format
-    [Documentation]    Test ID: 5.3.1.11.1
+    [Documentation]    Test ID: 5.3.1.12.1
     ...    Test title: Get single file PNFD in Plain Format
     ...    Test objective: The objective is to test the retrieval of the PNFD in plain format within a PNFD archive and perform a validation that returned content is in plain format
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
@@ -23,7 +23,7 @@ Get single file PNFD in Plain Format
     Check HTTP Response Header Content-Type Is    text/plain
 
 Get PNFD in Zip Format
-    [Documentation]    Test ID: 5.3.1.11.2
+    [Documentation]    Test ID: 5.3.1.12.2
     ...    Test title: Get PNFD in Zip Format
     ...    Test objective: The objective is to test the retrieval of the PNFD in zip format within a PNFD archive and perform a validation that returned content is in zip format
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
@@ -36,7 +36,7 @@ Get PNFD in Zip Format
     Check HTTP Response Header Content-Type Is    application/zip
 
 Get single file PNFD in Plain or Zip Format 
-    [Documentation]    Test ID: 5.3.1.11.3
+    [Documentation]    Test ID: 5.3.1.12.3
     ...    Test title: Get single file PNFDin Plain or Zip Format
     ...    Test objective: The objective is to test the retrieval of the single file PNFD within a PNFD archive when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that response is in Plain or Zip format
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
@@ -49,7 +49,7 @@ Get single file PNFD in Plain or Zip Format
     Check HTTP Response Header Content-Type Is Any of   text/plain    application/zip
     
 Get multi file PNFD in Plain or Zip Format
-    [Documentation]    Test ID: 5.3.1.11.4
+    [Documentation]    Test ID: 5.3.1.12.4
     ...    Test title: Get multi file PNFD in Plain or Zip Format
     ...    Test objective: The objective is to test the retrieval of the multi file PNFD within a PNFD archive when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that returned content is in Zip format
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
@@ -62,7 +62,7 @@ Get multi file PNFD in Plain or Zip Format
     Check HTTP Response Header Content-Type Is    application/zip
 
 Get multi file PNFD in Plain Format
-    [Documentation]    Test ID: 5.3.1.11.5
+    [Documentation]    Test ID: 5.3.1.12.5
     ...    Test title: Get multi file PNFD in Plain Format
     ...    Test objective: The objective is to test that the retrieval of the multi file PNFD within a PNFD archive fails when requesting it in Plain format, and perform a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
@@ -75,7 +75,7 @@ Get multi file PNFD in Plain Format
     Check HTTP Response Body Json Schema Is   ProblemDetails
 
 Get PNFD Content with invalid resource identifier
-    [Documentation]    Test ID: 5.3.1.11.6
+    [Documentation]    Test ID: 5.3.1.12.6
     ...    Test title: Get PNFD Content with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of the PNFD within a PNFD archive fails when using an invalid resource identifier
     ...    Pre-conditions: none
@@ -88,7 +88,7 @@ Get PNFD Content with invalid resource identifier
     Check HTTP Response Body Json Schema Is   ProblemDetails
 
 Get PNFD with conflict due to onboarding state
-    [Documentation]    Test ID: 5.3.1.11.7
+    [Documentation]    Test ID: 5.3.1.12.7
     ...    Test title: Get PNFD with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of the PNFD within a PNFD archive fails due to a conflict when the PNFD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the PNFD is different from ONBOARDED.
@@ -101,7 +101,7 @@ Get PNFD with conflict due to onboarding state
     Check HTTP Response Body Json Schema Is   ProblemDetails    
     
 Get PNFD with security information
-    [Documentation]    Test ID: 5.3.1.11.8
+    [Documentation]    Test ID: 5.3.1.12.8
     ...    Test title: Get PNFD with security information
     ...    Test objective: The objective is to test the retrieval of the PNFD within a PNFD archive shall include in the ZIP archive the security information when requested with "include_signature" parameter
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
@@ -114,7 +114,7 @@ Get PNFD with security information
     Check HTTP Response Header Content-Type Is    application/zip   
     
 POST PNFD - Method not implemented
-    [Documentation]    Test ID: 5.3.1.11.9
+    [Documentation]    Test ID: 5.3.1.12.9
     ...    Test title: POST PNFD - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new PNFD
     ...    Pre-conditions: none
@@ -126,7 +126,7 @@ POST PNFD - Method not implemented
     Check HTTP Response Status Code Is    405
     
 PUT PNFD - Method not implemented
-    [Documentation]    Test ID: 5.3.1.11.10
+    [Documentation]    Test ID: 5.3.1.12.10
     ...    Test title: PUT PNFD - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update PNFD
     ...    Pre-conditions: none
@@ -138,7 +138,7 @@ PUT PNFD - Method not implemented
     Check HTTP Response Status Code Is    405
 
 PATCH PNFD - Method not implemented
-    [Documentation]    Test ID: 5.3.1.11.11
+    [Documentation]    Test ID: 5.3.1.12.11
     ...    Test title: PATCH PNFD - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update PNFD
     ...    Pre-conditions: none
@@ -150,7 +150,7 @@ PATCH PNFD - Method not implemented
     Check HTTP Response Status Code Is    405
 
 DELETE PNFD - Method not implemented
-    [Documentation]    Test ID: 5.3.1.11.12
+    [Documentation]    Test ID: 5.3.1.12.12
     ...    Test title: DELETE PNFD - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete PNFD
     ...    Pre-conditions: none
diff --git a/SOL005/NSDManagement-API/PNFDArchiveManifest.robot b/SOL005/NSDManagement-API/PNFDArchiveManifest.robot
new file mode 100644
index 000000000..7c3e330db
--- /dev/null
+++ b/SOL005/NSDManagement-API/PNFDArchiveManifest.robot
@@ -0,0 +1,96 @@
+*** Settings ***
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt    # Generic Parameters
+Resource          environment/nsDescriptors.txt    # Specific nsDescriptors Parameters
+Resource          NSDManagementKeywords.robot
+Library           JSONLibrary
+Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+Library           OperatingSystem
+
+*** Test Cases ***
+Get PNFD Archive Manifest
+    [Documentation]    Test ID: 5.3.1.13.1
+    ...    Test title: Get PNFD Archive Manifest
+    ...    Test objective: The objective is to test that GET method reads the content of the manifest file within an PNFD archive
+    ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.7b.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get PNFD Archive Manifest
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    text/plain
+    
+Get PNFD Archive Manifest with security information
+    [Documentation]    Test ID: 5.3.1.13.2
+    ...    Test title: Get PNFD Archive Manifest with security information
+    ...    Test objective: The objective is to test the retrieval of content of the manifest file within an PNFD archive shall include in the ZIP archive the security information when requested with "include_signature" parameter
+    ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.7b.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get PNFD Archive Manifest with security information
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get PNFD Archive Manifest with conflict due to onboarding state
+    [Documentation]    Test ID: 5.3.1.13.3
+    ...    Test title: Get PNFD Archive Manifest with conflict due to onboarding state
+    ...    Test objective: The objective is to test that the retrieval of content of the manifest file within an PNFD archive fails due to a conflict when the PNFD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: The onboarding state of the PNFD is different from ONBOARDED.
+    ...    Reference: Clause 5.4.7b.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Get PNFD Archive Manifest with conflict due to onboarding state
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails  
+    
+POST PNFD Archive Manifest - Method not implemented
+    [Documentation]    Test ID: 5.3.1.13.4
+    ...    Test title: POST PNFD Archive Manifest - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not allowed to create a new Network Service Descriptor Archive Manifest
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.7b.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send POST Request for PNFD Archive Manifest
+    Check HTTP Response Status Code Is    405
+    
+PUT PNFD Archive Manifest - Method not implemented
+    [Documentation]    Test ID: 5.3.1.13.5
+    ...    Test title: PUT PNFD Archive Manifest - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor Archive Manifest
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.7b.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PUT Request for PNFD Archive Manifest
+    Check HTTP Response Status Code Is    405
+
+PATCH PNFD Archive Manifest - Method not implemented
+    [Documentation]    Test ID: 5.3.1.13.6
+    ...    Test title: PATCH PNFD Archive Manifest - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor Archive Manifest
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.7b.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PATCH Request for PNFD Archive Manifest
+    Check HTTP Response Status Code Is    405
+
+DELETE PNFD Archive Manifest - Method not implemented
+    [Documentation]    Test ID: 5.3.1.13.7
+    ...    Test title: DELETE PNFD Archive Manifest - Method not implemented
+    ...    Test objective: The objective is to test that DELETE method is not allowed to delete Network Service Descriptor Archive Manifest
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.7b.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send DELETE Request for PNFD Archive Manifest
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
-- 
GitLab


From 429f89d24c1f13e076cd52535d7d023de6e19c66 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 21 Oct 2020 11:44:42 +0500
Subject: [PATCH 105/322] reference updated

---
 .../ApiVersion.robot                          | 20 +++++------
 .../CancelOperationTask.robot                 | 14 ++++----
 .../CancelOperationWorkflow.robot             |  4 +--
 .../ChangeExternalVNFConnectivityTask.robot   | 10 +++---
 ...hangeExternalVNFConnectivityWorkflow.robot |  2 +-
 .../ChangeVNFFlavourTask.robot                | 14 ++++----
 .../ChangeVNFFlavourWorkflow.robot            |  2 +-
 .../CreateVNFWorkflow.robot                   |  2 +-
 .../DeleteVNFWorkflow.robot                   |  2 +-
 .../FailOperationTask.robot                   | 14 ++++----
 .../FailOperationWorkflow.robot               |  2 +-
 .../HealVNFTask.robot                         | 14 ++++----
 .../HealVNFWorkflow.robot                     |  2 +-
 .../IndividualSubscription.robot              | 12 +++----
 .../IndividualVNFInstance.robot               | 18 +++++-----
 .../IndividualVnfLcmOperationOccurence.robot  | 12 +++----
 .../InstantiateVNFTask.robot                  | 12 +++----
 .../InstantiateVNFTaskWorkflow.robot          |  2 +-
 .../ModifyVNFInformationWorkflow.robot        |  2 +-
 .../NotificationEndpoint.robot                |  8 ++---
 .../OperateVNFTask.robot                      | 14 ++++----
 .../OperateVNFWorkflow.robot                  |  2 +-
 .../RetryOperationTask.robot                  | 14 ++++----
 .../RetryOperationWorkflow.robot              |  4 +--
 .../RollBackOperationWorkflow.robot           |  4 +--
 .../RollbackOperationTask.robot               | 14 ++++----
 .../ScaleVNFTask.robot                        | 14 ++++----
 .../ScaleVNFToLevelTask.robot                 | 14 ++++----
 .../ScaleVNFToLevelWorkflow.robot             |  2 +-
 .../ScaleVNFWorkflow.robot                    |  2 +-
 .../Subscriptions.robot                       | 32 ++++++++---------
 .../TerminateVNFTask.robot                    | 12 +++----
 .../TerminateVNFWorkflow.robot                |  2 +-
 .../VNFInstances.robot                        | 34 +++++++++----------
 .../VnfLcmOperationOccurences.robot           | 28 +++++++--------
 35 files changed, 180 insertions(+), 180 deletions(-)

diff --git a/SOL003/VNFLifecycleManagement-API/ApiVersion.robot b/SOL003/VNFLifecycleManagement-API/ApiVersion.robot
index 9b644479d..dd202cb4f 100644
--- a/SOL003/VNFLifecycleManagement-API/ApiVersion.robot
+++ b/SOL003/VNFLifecycleManagement-API/ApiVersion.robot
@@ -12,7 +12,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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -24,7 +24,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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -37,7 +37,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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -49,7 +49,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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -61,7 +61,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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -73,7 +73,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.6.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -85,7 +85,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.6.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -98,7 +98,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.6.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -110,7 +110,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.6.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -122,7 +122,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.6.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
index a59afa065..cd2102c59 100644
--- a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
@@ -13,7 +13,7 @@ POST Cancel operation task
     ...    Test title: POST Cancel operation task
     ...    Test objective: The POST method initiates cancelling an ongoing VNF lifecycle operation while it is being executed or rolled back, i.e. the "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state.
     ...    Pre-conditions: the "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state.
-    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: VNF instance status equal to FAILED_TEMP     
@@ -26,7 +26,7 @@ POST Cancel operation task Conflict
     ...    Test title: POST Cancel operation task Conflict
     ...    Test objective: The POST method is NOT cancelling an ongoing VNF lifecycle operation due to the fact that the VNF instance resource is not in STARTING, PROCESSING or ROLLING_BACK state
     ...    Pre-conditions: operation is not in STARTING, PROCESSING or ROLLING_BACK state
-    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -40,7 +40,7 @@ POST Cancel operation task Not Found
     ...    Test title: POST Cancel operation task Not Found
     ...    Test objective: The objective is to test that POST method cannot cancel a VNF lifecycle operation because the resource is not found
     ...    Pre-conditions: 
-    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -52,7 +52,7 @@ GET Cancel operation task - Method not implemented
     ...    Test title: GET Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.17.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.17.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -64,7 +64,7 @@ PUT Cancel operation task - Method not implemented
     ...    Test title: PUT Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.17.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.17.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -76,7 +76,7 @@ PATCH Cancel operation task - Method not implemented
     ...    Test title: PATCH Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.17.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.17.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -88,7 +88,7 @@ DELETE Cancel operation task - Method not implemented
     ...    Test title: DELETE Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.17.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.17.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot
index b3a52eb84..aa7455d28 100644
--- a/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot
@@ -20,7 +20,7 @@ Cancel a VNF LCM Operation - STARTING
     ...    Test title: Cancel a VNF LCM Operation - STARTING
     ...    Test objective: The objective is to test the workflow for Cancelling a VNF LCM Operation being in the STARTING state
     ...    Pre-conditions: The VNF lifecycle management operation occurrence is in STARTING state. NFVO is subscribed to VNF LCM Operation Occurrence notifications (Test ID 5.4.20.1)
-    ...    Reference: Clause 5.4.17 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.17 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM
     ...    Post-Conditions: The VNF lifecycle management operation occurrence is in ROLLED_BACK state
@@ -36,7 +36,7 @@ Cancel a VNF LCM Operation - PROCESSING - ROLLING_BACK
     ...    Test title: Cancel a VNF LCM Operation - PROCESSING - ROLLING_BACK
     ...    Test objective: The objective is to test the workflow for Cancelling a VNF LCM Operation being either in the PROCESSIONG or ROLLING_BACK state
     ...    Pre-conditions: The VNF lifecycle management operation occurrence is in PROCESSING or ROLLING_BACK state. NFVO is subscribed to VNF LCM Operation Occurrence notifications
-    ...    Reference: Clause 5.3.10 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.3.10 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM
     ...    Post-Conditions: The VNF lifecycle management operation occurrence is in FAILED_TEMP state
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
index be2f16094..e2a527820 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
@@ -13,7 +13,7 @@ POST Change external VNF connectivity
     ...    Test title: POST Change external VNF connectivity
     ...    Test objective: The objective is to test that POST method trigger a change in VNF external connectivity
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.11.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null         
@@ -26,7 +26,7 @@ GET Change external VNF connectivity - Method not implemented
     ...    Test title: GET Change external VNF connectivity - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.11.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -38,7 +38,7 @@ PUT Change external VNF connectivity - Method not implemented
     ...    Test title: PUT Change external VNF connectivity - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.11.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -50,7 +50,7 @@ PATCH Change external VNF connectivity - Method not implemented
     ...    Test title: PATCH Change external VNF connectivity - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.11.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -62,7 +62,7 @@ DELETE Change external VNF connectivity - Method not implemented
     ...    Test title: DELETE Change external VNF connectivity - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.11.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityWorkflow.robot
index 5db4c928f..d5c9beabe 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityWorkflow.robot
@@ -20,7 +20,7 @@ Change external connectivity of VNF Workflow
     ...    Test title: Change external connectivity of VNF Workflow
     ...    Test objective: The objective is to change the external connectivity of a VNF instance.
     ...    Pre-conditions: VNF instance in INSTANTIATED state 
-    ...    Reference: Clause 5.4.11 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.11 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM. The VNFD supports the external connectivity change
     ...    Post-Conditions: VNF instance still in INSTANTIATED state and external connectivity of the VNF is changed
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
index 8ebf82909..630e70279 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
@@ -13,7 +13,7 @@ POST Change deployment flavour of a vnfInstance
     ...    Test title: POST Change deployment flavour of a vnfInstance
     ...    Test objective: The objective is to test that POST method trigger a change in VNF deployment flavour
     ...    Pre-conditions: VNF instance resource is not in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null  
@@ -26,7 +26,7 @@ POST Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
     ...    Test title: POST Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to test that POST method cannot trigger a change in VNF deployment flavour because of a conflict with the state of the VNF instance resource. (VNF instance resource is not in NOT-INSTANTIATED state)
     ...    Pre-conditions: VNF instance resource is in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -40,7 +40,7 @@ POST Change deployment flavour of a vnfInstance Not Found
     ...    Test title: POST Change deployment flavour of a vnfInstance Not Found
     ...    Test objective: The objective is to test that POST method cannot trigger a change in VNF deployment flavour because the VNF instance resource is not found. 
     ...    Pre-conditions: the VNF instance resource is not existing
-    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -53,7 +53,7 @@ GET Change deployment flavour VNFInstance - Method not implemented
     ...    Test title: GET Change deployment flavour VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.7.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -65,7 +65,7 @@ PUT Change deployment flavour VNFInstance - Method not implemented
     ...    Test title: PUT Change deployment flavour VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.7.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -77,7 +77,7 @@ PATCH Change deployment flavour VNFInstance - Method not implemented
     ...    Test title: PATCH Change deployment flavour VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.7.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -89,7 +89,7 @@ DELETE Change deployment flavour VNFInstance - Method not implemented
     ...    Test title: DELETE Change deployment flavour VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.7.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourWorkflow.robot
index 7d9d96b68..b2d6e3ebd 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourWorkflow.robot
@@ -20,7 +20,7 @@ Change VNF Flavour Workflow
     ...    Test title: Change VNF Flavour Workflow
     ...    Test objective: The objective is to test the workflow for a change flavour of an existing VNF instance
     ...    Pre-conditions: VNF instance in INSTANTIATED state . NFVO is subscribed to VNF LCM Operation Occurrence notifications 
-    ...    Reference: Clause 5.4.7 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.7 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: Multiple flavours are supported for the VNF (as capability in the VNFD). NFVO is able to receive notifications from VNFM
     ...    Post-Conditions: VNF instance still in INSTANTIATED state and the flavour is changed
diff --git a/SOL003/VNFLifecycleManagement-API/CreateVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/CreateVNFWorkflow.robot
index e5e3012df..36f53d1a7 100644
--- a/SOL003/VNFLifecycleManagement-API/CreateVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/CreateVNFWorkflow.robot
@@ -20,7 +20,7 @@ Create VNF Instance Resource
     ...    Test title: Create VNF Instance workflow
     ...    Test objective: The objective is to test the workflow for the creation of a new VNF instance resource.
     ...    Pre-conditions: NFVO is subscribed to VNF Identifier Creation notifications 
-    ...    Reference: Clause 5.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM
     ...    Post-Conditions: The VNF instance resource has been created in "NOT_INSTANTIATED" state.
diff --git a/SOL003/VNFLifecycleManagement-API/DeleteVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/DeleteVNFWorkflow.robot
index cf7d52867..3b1c6a1c0 100644
--- a/SOL003/VNFLifecycleManagement-API/DeleteVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/DeleteVNFWorkflow.robot
@@ -20,7 +20,7 @@ Delete VNF Instance Resource
     ...    Test title: Delete VNF Instance workflow
     ...    Test objective: The objective is to test the workflow for the deleteion of an existing VNF instance resource
     ...    Pre-conditions: The VNF Instance resource is in NOT_INSTANTIATED state. NFVO is subscribed to VNF Identifier Creation notifications 
-    ...    Reference: Clause 5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM
     ...    Post-Conditions: The VNF instance resource is deleted on the VNFM.
diff --git a/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot b/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
index a5db3b48d..2ff77eb5f 100644
--- a/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
@@ -13,7 +13,7 @@ POST Fail operation task
     ...    Test title: POST Fail operation task
     ...    Test objective: The objective is to test that POST method mark as "finally failed" a VNF lifecycle operation 
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: VNF resource state is FINALLY_FAILED
@@ -28,7 +28,7 @@ Post Fail operation task Conflict (Not-FAILED_TEMP)
     ...    Test title: Post Fail operation task Conflict (Not-FAILED_TEMP)
     ...    Test objective: The objective is to test that POST method cannot mark as "finally failed" a VNF lifecycle operation 
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none     
@@ -42,7 +42,7 @@ Post Fail operation task Not Found
     ...    Test title: Post Fail operation task Not Found 
     ...    Test objective: The objective is to test that POST method cannot mark as "finally failed" a VNF lifecycle operation because the operation is not supported
     ...    Pre-conditions: 
-    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -54,7 +54,7 @@ GET Fail operation task - Method not implemented
     ...    Test title: GET Fail operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.16.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.16.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -66,7 +66,7 @@ PUT Fail operation task - Method not implemented
     ...    Test title: PUT Fail operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.16.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.16.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -78,7 +78,7 @@ PATCH Fail operation task - Method not implemented
     ...    Test title: PATCH Fail operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.16.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.16.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -90,7 +90,7 @@ DELETE Fail operation task - Method not implemented
     ...    Test title: DELETE Fail operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.16.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.16.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
diff --git a/SOL003/VNFLifecycleManagement-API/FailOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/FailOperationWorkflow.robot
index be9b602e0..5ef0573ea 100644
--- a/SOL003/VNFLifecycleManagement-API/FailOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/FailOperationWorkflow.robot
@@ -20,7 +20,7 @@ Fail a VNF LCM Operation Workflow
     ...    Test title: Fail a VNF LCM Operation Workflow
     ...    Test objective: The objective is to test the workflow for a Fail VNF LCM Operation
     ...    Pre-conditions: The VNF lifecycle management operation occurrence is in FAILED_TEMP state. NFVO is subscribed to VNF LCM Operation Occurrence notifications 
-    ...    Reference: Clause 5.4.16 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.16 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM
     ...    Post-Conditions: The VNF lifecycle management operation occurrence is in FAILED state
diff --git a/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot b/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
index c30791d82..1bc6354d1 100644
--- a/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
@@ -13,7 +13,7 @@ POST Heal a vnfInstance
     ...    Test title: POST Heal a vnfInstance
     ...    Test objective: The objective is to test that POST method heal a VNF instance
     ...    Pre-conditions: the VNF instance resource is not in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ POST Heal a vnfInstance Conflict (Not-Instantiated)
     ...    Test title: POST Heal a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
     ...    Pre-conditions: the VNF instance resource is in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -42,7 +42,7 @@ POST Heal a vnfInstance Not Found
     ...    Test title: POST Heal a vnfInstance Not Found
     ...    Test objective: The objective is to test that the operation cannot be executed because the VNF instance resource is not found. 
     ...    Pre-conditions: the VNF instance resource is not existing
-    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -56,7 +56,7 @@ GET Heal VNFInstance - Method not implemented
     ...    Test title: GET Heal a vnfInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.9.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -68,7 +68,7 @@ PUT Heal VNFInstance - Method not implemented
     ...    Test title: PUT Heal a vnfInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.9.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -80,7 +80,7 @@ PATCH Heal VNFInstance - Method not implemented
     ...    Test title: PATCH Heal a vnfInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.9.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -92,7 +92,7 @@ DELETE Heal VNFInstance - Method not implemented
     ...    Test title: DELETE Heal a vnfInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.9.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL003/VNFLifecycleManagement-API/HealVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/HealVNFWorkflow.robot
index 854f1aed9..e7f4775aa 100644
--- a/SOL003/VNFLifecycleManagement-API/HealVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/HealVNFWorkflow.robot
@@ -20,7 +20,7 @@ Heal a VNF Instance
     ...    Test title: Heal a VNF Instance
     ...    Test objective: The objective is to heal a VNF instance.
     ...    Pre-conditions: VNF instance in INSTANTIATED state 
-    ...    Reference: Clause 5.4.9 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.9 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM. Heal a VNF instance is supported for the VNF (as capability in the VNFD)
     ...    Post-Conditions: VNF instance still in INSTANTIATED state 
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot b/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot
index 9d00ce943..051cb878a 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot
@@ -12,7 +12,7 @@ POST Individual Subscription - Method not implemented
     ...    Test title: POST Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.19.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.19.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -24,7 +24,7 @@ GET Individual Subscription
     ...    Test title: GET Individual Subscription
     ...    Test objective: The objective is to test the Get individual subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.19.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.19.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -37,7 +37,7 @@ PUT an individual subscription - Method not implemented
     ...    Test title: PUT an individual subscription - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.19.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.19.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -49,7 +49,7 @@ PATCH an individual subscription - Method not implemented
     ...    Test title: PATCH an individual subscription - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.19.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.19.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -61,7 +61,7 @@ DELETE an individual subscription
     ...    Test title: DELETE an individual subscription
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.19.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.19.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: subscription deleted from VNFM
@@ -73,7 +73,7 @@ GET Individual Subscription - Not Found
     ...    Test title: GET Individual Subscription - Not Found
     ...    Test objective: The objective is to test the retrieval of individual subscription fails when subscription is not present
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.19.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.19.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index c1fd08129..8dd6e9662 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
@@ -18,7 +18,7 @@ Post Individual VNFInstance - Method not implemented
     ...    Test title: Post Individual VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.3.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -30,7 +30,7 @@ Get Information about an individual VNF Instance
     ...    Test title: Get Information about an individual VNF Instance
     ...    Test objective: The objective is to create a new VNF instance resource
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -43,7 +43,7 @@ PUT Individual VNFInstance - Method not implemented
     ...    Test title: PUT Individual VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -55,7 +55,7 @@ PATCH Individual VNFInstance
     ...    Test title: PATCH Individual VNFInstance
     ...    Test objective: This method modifies an individual VNF instance resource
     ...    Pre-conditions: an existing VNF instance resource
-    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: VNFInstance modified
@@ -68,7 +68,7 @@ PATCH Individual VNFInstance Precondition failed
     ...    Test title: PATCH Individual VNFInstance Precondition failed
     ...    Test objective: The objective is to create a new VNF instance resource
     ...    Pre-conditions:  ETag mismatch
-    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: VNFInstance not modified
@@ -81,7 +81,7 @@ PATCH Individual VNFInstance Conflict
     ...    Test title: PATCH Individual VNFInstance Conflict
     ...    Test objective: The objective is to test the conflict while modifying a VNF instance resource
     ...    Pre-conditions: another LCM operation is ongoing
-    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: VNFInstance not modified
@@ -94,7 +94,7 @@ DELETE Individual VNFInstance
     ...    Test title: DELETE Individual VNFInstance
     ...    Test objective: The objective is to delete a VNF instance
     ...    Pre-conditions: the VNF instance resource is existing
-    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: VNFInstance deleted
@@ -106,7 +106,7 @@ DELETE Individual VNFInstance Conflict
     ...    Test title: DELETE Individual VNFInstance Conflict
     ...    Test objective: The objective is to verify that the deletion cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
     ...    Pre-conditions: VNF instance resource is in INSTANTIATED state
-    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: Resources are not deleted
@@ -120,7 +120,7 @@ Get Information about an individual VNF Instance - Not Found
     ...    Test title: Get Information about an individual VNF Instance - Not Found
     ...    Test objective: The objective is to test that the retrieval of an individual VNF Instance fails when instance is not present.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot b/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
index 6dce74a23..2a61f566c 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
@@ -12,7 +12,7 @@ Post Individual VNF LCM Operation occurrences - Method not implemented
     ...    Test title: Post Individual VNF LCM Operation occurrences - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.13.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -24,7 +24,7 @@ Get Individual VNF LCM Operation occurrences
     ...    Test title: Get Individual VNF LCM Operation occurrences
     ...    Test objective: The objective is to test that this method retrieve information about a VNF lifecycle management operation occurrence 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -37,7 +37,7 @@ PUT Individual VNF LCM Operation occurrences - Method not implemented
     ...    Test title: PUT Individual VNF LCM Operation occurrences - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.13.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -49,7 +49,7 @@ PATCH Individual VNF LCM Operation occurrences - Method not implemented
     ...    Test title: PATCH Individual VNF LCM Operation occurrences - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.13.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none      
@@ -61,7 +61,7 @@ PATCH Individual VNF LCM Operation occurrences - Method not implemented
     ...    Test title: DELETE Individual VNF LCM Operation occurrences - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.13.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -73,7 +73,7 @@ Get Individual VNF LCM Operation occurrences - Not Found
     ...    Test title: Get Individual VNF LCM Operation occurrences - Not Found
     ...    Test objective: The objective is to test that the retrieval of VNF lifecycle management operation occurrence fails when instance is not present. 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
index 87d127b99..843138eca 100644
--- a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
@@ -15,7 +15,7 @@ Instantiate a vnfInstance
     ...    Test title: Post Instantiate Individual VNFInstance 
     ...    Test objective: The objective is to instantiate a VNF instance
     ...    Pre-conditions: VNF instance resource is in NOT INSTANTIATED state
-    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -29,7 +29,7 @@ Instantiate a vnfInstance Conflict
     ...    Test title: Post Instantiate Individual VNFInstance 
     ...    Test objective: The objective is to verify that the instantiation of the vnf cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
     ...    Pre-conditions: VNF instance resource is in INSTANTIATED state
-    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -42,7 +42,7 @@ GET Instantiate VNFInstance - Method not implemented
     ...    Test title: GET Instantiate Individual VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none  
-    ...    Reference: Clause 5.4.4.3.2  - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.4.3.2  - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -54,7 +54,7 @@ PUT Instantiate VNFInstance - Method not implemented
     ...    Test title: PUT Instantiate Individual VNFInstance  - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.4.3.3  - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.4.3.3  - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -66,7 +66,7 @@ PATCH Instantiate VNFInstance - Method not implemented
     ...    Test title: PATCH Instantiate Individual VNFInstance  - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.4.3.4  - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.4.3.4  - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -78,7 +78,7 @@ DELETE Instantiate VNFInstance - Method not implemented
     ...    Test title: DELETE Instantiate Individual VNFInstance  - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none  
-    ...    Reference: Clause 5.4.4.3.5  - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.4.3.5  - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot
index 839d28a97..3945ebd84 100644
--- a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot
@@ -22,7 +22,7 @@ VNF Instantiation
     ...    Test title: VNF Instantiation workflow
     ...    Test objective: The objective is to test the workflow for the instantiation of a VNF instance
     ...    Pre-conditions: VNF instance resources is already created. NFVO is subscribed to VNF LCM Operation Occurrence notifications 
-    ...    Reference: Clause 5.4.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  NFVO is able to receive notifications from VNFM
     ...    Post-Conditions: VNF instance in INSTANTIATED state
diff --git a/SOL003/VNFLifecycleManagement-API/ModifyVNFInformationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ModifyVNFInformationWorkflow.robot
index 74cf83d73..a38a7f520 100644
--- a/SOL003/VNFLifecycleManagement-API/ModifyVNFInformationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ModifyVNFInformationWorkflow.robot
@@ -20,7 +20,7 @@ Modify info of a VNF Instance
     ...    Test title: Update information about a VNF instance
     ...    Test objective: The objective is to update information about a VNF instance.
     ...    Pre-conditions: VNF instance is created 
-    ...    Reference: Clause 5.3.6 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.3.6 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM. Update information of a VNF instance is supported for the VNF (as capability in the VNFD)
     ...    Post-Conditions: VNF instance info is updated
diff --git a/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot b/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot
index 271e2c094..b956fd49b 100644
--- a/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot
+++ b/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot
@@ -13,7 +13,7 @@ VNF LCM Operation Occurrence Start Notification
     ...    Test title: VNF LCM Operation Occurrence Start Notification
     ...    Test objective: The objective is to test the dispatch of VNF LCM Operation Occurrence Start Notification when a new VNF LCM operation is started in the VNFM, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A subscription for VNF LCM Operation Occurrence notifications is available in the VNFM.
-    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -27,7 +27,7 @@ VNF LCM Operation Occurrence Result Notification
     ...    Test title: VNF LCM Operation Occurrence Result Notification
     ...    Test objective: The objective is to test the dispatch of VNF LCM Operation Occurrence Result Notification when a VNF LCM operation is completed in the VNFM, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: An VNF LCM operation is in progress, and a subscription for VNF LCM Operation Occurrence notifications is available in the VNFM.
-    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -41,7 +41,7 @@ VNF Identifier Creation Notification
     ...    Test title: VNF Identifier Creation Notification
     ...    Test objective: The objective is to test the dispatch of VNF Identifier Creation Notification when a new VNF instance resource is created in the VNFM, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A subscription for VNF identifier creation notifications is available in the VNFM.
-    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -54,7 +54,7 @@ VNF Identifier Deletion Notification
     ...    Test title: VNF Identifier Deletion Notification
     ...    Test objective: The objective is to test the dispatch of VNF Identifier Deletion Notification when a VNF instance resource is deleted in the VNFM, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF instance resource is created, and a subscription for VNF identifier creation notifications is available in the VNFM.
-    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
index d7d01667b..e585852b2 100644
--- a/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
@@ -15,7 +15,7 @@ POST Operate a vnfInstance
     ...    Test title: POST Operate a vnfInstance
     ...    Test objective: The objective is to test that POST method operate a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -28,7 +28,7 @@ POST Operate a vnfInstance Conflict (Not-Instantiated)
     ...    Test title: POST Operate a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
     ...    Pre-conditions: the VNF instance resource is in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ POST Operate a vnfInstance Not Found
     ...    Test title: POST Operate a vnfInstance Not Found
     ...    Test objective: The objective is to test that the operation cannot be executed currently, because the resource is not existing
     ...    Pre-conditions: the VNF instance resource is in  not existing
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -54,7 +54,7 @@ GET Operate VNFInstance - Method not implemented
     ...    Test title: GET Operate a vnfInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.10.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.10.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -66,7 +66,7 @@ PUT Operate VNFInstance - Method not implemented
     ...    Test title: PUT Operate a vnfInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.10.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.10.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -78,7 +78,7 @@ PATCH Operate VNFInstance - Method not implemented
     ...    Test title: PATCH Operate a vnfInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.10.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.10.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -90,7 +90,7 @@ DELETE Operate VNFInstance - Method not implemented
     ...    Test title: DELETE Operate a vnfInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.10.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.10.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot
index c6812d3f2..422748ad2 100644
--- a/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot
@@ -20,7 +20,7 @@ Operate a VNF Instance
     ...    Test title: Operate a VNF Instance
     ...    Test objective: The objective is to test the workflow of operational change of a VNF instance.
     ...    Pre-conditions: VNF instance in INSTANTIATED state 
-    ...    Reference: Clause 5.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: change the operational state of a VNF instance is supported for the VNF (as capability in the VNFD)
     ...    Post-Conditions: VNF instance still in INSTANTIATED state and the operational state is changed
diff --git a/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot b/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
index eb8d440e9..c937f06ec 100644
--- a/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
@@ -16,7 +16,7 @@ Post Retry operation task
     ...    Test title: Post Retry operation task
     ...    Test objective: The objective is to test that POST method The POST method initiates retrying a VNF lifecycle operation if the operation is in FAILED_TEMP state
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -29,7 +29,7 @@ Post Retry operation task Conflict (Not-FAILED_TEMP)
     ...    Test title: Post Retry operation task Conflict (Not-FAILED_TEMP)
     ...    Test objective: The objective is to test that the retry operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. (i.e. the VNF instance resource is not in FAILED_TEMP state)
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -42,7 +42,7 @@ Post Retry operation task Not Found
     ...    Test title: Post Retry operation task Not Found
     ...    Test objective: The objective is to test that the retry operation cannot be executed because the operation is not supported
     ...    Pre-conditions: 
-    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -54,7 +54,7 @@ GET Retry operation task - Method not implemented
     ...    Test title: GET Retry operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.14.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.14.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -66,7 +66,7 @@ PUT Retry operation task - Method not implemented
     ...    Test title: PUT Retry operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.14.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.14.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -78,7 +78,7 @@ PATCH Retry operation task - Method not implemented
     ...    Test title: PATCH Retry operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.14.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.14.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -90,7 +90,7 @@ DELETE Retry operation task - Method not implemented
     ...    Test title: DELETE Retry operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.14.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.14.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
diff --git a/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
index f9858ebea..dc216358e 100644
--- a/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
@@ -18,7 +18,7 @@ Retry VNF LCM Operation - Successful
     ...    Test title: Retry VNF LCM Operation - Successful
     ...    Test objective: The objective is to test the workflow for a successful Retry VNF LCM Operation and the status notifications
     ...    Pre-conditions: The VNF lifecycle management operation occurrence is in FAILED_TEMP state. NFVO is subscribed to VNF LCM Operation Occurrence notifications 
-    ...    Reference: Clause 5.3.10 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.3.10 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM
     ...    Post-Conditions: The VNF lifecycle management operation occurrence is in COMPLETED state
@@ -35,7 +35,7 @@ Retry VNF LCM Operation - Unsuccessful
     ...    Test title: Retry VNF LCM Operation - Unsuccessful
     ...    Test objective: The objective is to test the workflow for an unsuccesful Retry VNF LCM Operation and the status notifications
     ...    Pre-conditions: The VNF lifecycle management operation occurrence is in FAILED_TEMP state. NFVO is subscribed to VNF LCM Operation Occurrence notifications 
-    ...    Reference: Clause 5.3.10 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.3.10 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM
     ...    Post-Conditions: The VNF lifecycle management operation occurrence is in FAILED_TEMP state
diff --git a/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
index 92734b6f9..1c3d4b935 100644
--- a/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
@@ -20,7 +20,7 @@ Rollback a VNF LCM Operation - Successful
     ...    Test title: Rollback VNF LCM Operation - Successful
     ...    Test objective: The objective is to test the workflow for a Rolling Back a VNF LCM Operation and the operation is successful
     ...    Pre-conditions: The VNF lifecycle management operation occurrence is in FAILED_TEMP state. NFVO is subscribed to VNF LCM Operation Occurrence notifications 
-    ...    Reference: Clause 5.3.11 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.3.11 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM
     ...    Post-Conditions: The VNF lifecycle management operation occurrence is in ROLLED_BACK state
@@ -37,7 +37,7 @@ Rollback VNF LCM Operation - Unsuccessful
     ...    Test title: Rollback VNF LCM Operation - Unsuccessful
     ...    Test objective: The objective is to test the workflow for a Rollback VNF LCM Operation and the operation is not successful
     ...    Pre-conditions: The VNF lifecycle management operation occurrence is in FAILED_TEMP state. NFVO is subscribed to VNF LCM Operation Occurrence notifications 
-    ...    Reference: Clause 5.3.10 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.3.10 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM
     ...    Post-Conditions: The VNF lifecycle management operation occurrence is in FAILED_TEMP state
diff --git a/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot b/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
index dcc5f288b..b68a10519 100644
--- a/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
@@ -15,7 +15,7 @@ Post Rollback operation task
     ...    Test title: Post Rollback operation task
     ...    Test objective: The objective is to test that POST method initiates rollback on a VNF lifecycle operation
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -29,7 +29,7 @@ POST Rollback operation task Conflict (Not-FAILED_TEMP)
     ...    Test title: POST Rollback operation task Conflict (Not-FAILED_TEMP)
     ...    Test objective: The objective is to test that POST method initiates a rollback on a VNF lifecycle operation 
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -42,7 +42,7 @@ POST Rollback operation task Not Found
     ...    Test title: POST Rollback operation task Not Found
     ...    Test objective: The objective is to test that the retry operation cannot be executed because the operation is not supported
     ...    Pre-conditions: 
-    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -54,7 +54,7 @@ GET Rollback operation task - Method not implemented
     ...    Test title: GET Rollback operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.15.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.15.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -66,7 +66,7 @@ PUT Rollback operation task - Method not implemented
     ...    Test title: PUT Rollback operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.15.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.15.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -78,7 +78,7 @@ PATCH Rollback operation task - Method not implemented
     ...    Test title: PATCH Rollback operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.15.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.15.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -90,7 +90,7 @@ DELETE Rollback operation task - Method not implemented
     ...    Test title: DELETE Rollback operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.15.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.15.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
index b8caee904..815b95445 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
@@ -14,7 +14,7 @@ POST Scale a vnfInstance
     ...    Test title: POST Scale a vnfInstance
     ...    Test objective: The objective is to scale a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -28,7 +28,7 @@ POST Scale a vnfInstance Conflict (Not-Instantiated)
     ...    Test title: POST Scale a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to verify that the scale operation cannot be executed 
     ...    Pre-conditions:  VNF instance resource is in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -42,7 +42,7 @@ POST Scale a vnfInstance Not Found
     ...    Test title: POST Scale a vnfInstance Not Found
     ...    Test objective: The objective is to verify that the operation cannot be executed currently, because the VNF instance resource is not found. 
     ...    Pre-conditions: none  
-    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -55,7 +55,7 @@ GET Scale VNFInstance - Method not implemented
     ...    Test title: GET Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -67,7 +67,7 @@ PUT Scale VNFInstance - Method not implemented
     ...    Test title: PUT Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions: none  
-    ...    Reference: Clause 5.4.5.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.5.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -79,7 +79,7 @@ PATCH Scale VNFInstance - Method not implemented
     ...    Test title: PATCH Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions: none 
-    ...    Reference: Clause 5.4.5.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.5.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -91,7 +91,7 @@ DELETE Scale VNFInstance - Method not implemented
     ...    Test title: DELETE Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions: none  
-    ...    Reference: Clause 5.4.5.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.5.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: Resource are not deleted
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
index 6706ed342..a746bbaa9 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
@@ -13,7 +13,7 @@ POST Scale a vnfInstance to level
     ...    Test title: POST Scale a vnfInstance to level
     ...    Test objective: The objective is to scale a VNF instance to a target level.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ POST Scale a vnfInstance to level Conflict (Not-Instantiated)
     ...    Test title: POST Scale a vnfInstance to level Conflict (Not-Instantiated)
     ...    Test objective: The objective is to verify that the scale operation cannot be executed because the resource is not instantiated
     ...    Pre-conditions: VNF instance resource is in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -42,7 +42,7 @@ Scale a vnfInstance Not Found
     ...    Test title: Scale a vnfInstance Not Found
     ...    Test objective: The objective is to verify that the operation cannot be executed , because the VNF instance resource cannot be found.
     ...    Pre-conditions: VNF instance resource is in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -56,7 +56,7 @@ GET Scale to level VNFInstance - Method not implemented
     ...    Test title: GET Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -68,7 +68,7 @@ PUT Scale to level VNFInstance - Method not implemented
     ...    Test title: PUT Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions: none  
-    ...    Reference: Clause 5.4.6.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.6.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -80,7 +80,7 @@ PATCH Scale to level VNFInstance - Method not implemented
     ...    Test title: PATCH Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -92,7 +92,7 @@ DELETE Scale to level VNFInstance - Method not implemented
     ...    Test title: DELETE Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: Resources are not deleted
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot
index 9b67474be..d4e8ac9b6 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot
@@ -18,7 +18,7 @@ VNF Instance Scale To Level
     ...    Test title: VNF Instance Scale To Level workflow
     ...    Test objective: The objective is to test the workflow for the scale to level of a VNF instance
     ...    Pre-conditions: VNF instance in INSTANTIATED state . NFVO is subscribed to VNF LCM Operation Occurrence notifications 
-    ...    Reference: Clause 5.4.6 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.6 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  NFVO is able to receive notifications from VNFM. Scale operation is supported for the VNF (as capability in the VNFD)
     ...    Post-Conditions: VNF instance still in INSTANTIATED state and VNF is scaled to the new level
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFWorkflow.robot
index 12ec5afef..30d813c84 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFWorkflow.robot
@@ -18,7 +18,7 @@ VNF Instance Scale Out
     ...    Test title: VNF Instance Scale Out workflow
     ...    Test objective: The objective is to test the workflow for the scaling out a VNF instance
     ...    Pre-conditions: VNF instance in INSTANTIATED state (Test ID 5.4.4.1). NFVO is subscribed to VNF LCM Operation Occurrence notifications (Test ID 5.4.20.1)
-    ...    Reference: Clause 5.4.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  NFVO is able to receive notifications from VNFM. Scale operation is supported for the VNF (as capability in the VNFD)
     ...    Post-Conditions: VNF instance still in INSTANTIATED state and VNF is scaled out
diff --git a/SOL003/VNFLifecycleManagement-API/Subscriptions.robot b/SOL003/VNFLifecycleManagement-API/Subscriptions.robot
index 84cc91dbe..043af19b9 100644
--- a/SOL003/VNFLifecycleManagement-API/Subscriptions.robot
+++ b/SOL003/VNFLifecycleManagement-API/Subscriptions.robot
@@ -14,7 +14,7 @@ POST Create a new subscription
     ...    Test title: POST Create a new subscription
     ...    Test objective: The POST method creates a new subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null
@@ -27,7 +27,7 @@ Create a new Subscription - DUPLICATION
     ...    Test title: POST Create a new subscription - DUPLICATION
     ...    Test objective: The objective is to test request to create a duplicate (same cakkbackurl and filter) subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: duplication is supported by SUT
     ...    Post-Conditions: in response header Location shall not be null
@@ -40,7 +40,7 @@ Create a new Subscription - NO-DUPLICATION
     ...    Test title: POST Create a new subscription - NO-DUPLICATION
     ...    Test objective: The objective is to test the request that does not create a duplicate (same callbackurl and filter) subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: duplication is not supported by SUT
     ...    Post-Conditions: in response header Location shall not be null
@@ -53,7 +53,7 @@ GET Subscriptions
     ...    Test title: GET Subscriptions
     ...    Test objective: The objective is Get the list of active subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -66,7 +66,7 @@ GET Subscription - Filter
     ...    Test title: GET Subscriptions - Filter
     ...    Test objective: The objective is Get the list of active subscriptions using a filter
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -80,7 +80,7 @@ GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test title: GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is Get the list of active subscriptions using an invalid filter
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -93,7 +93,7 @@ GET subscriptions with all_fields attribute selector
     ...    Test title: GET subscriptions with all_fields attribute selector
     ...    Test objective: The objective is Get the list of active subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -106,7 +106,7 @@ GET subscriptions with exclude_default attribute selector
     ...    Test title: GET subscriptions with exclude_default attribute selector
     ...    Test objective: The objective is Get the list of active subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -119,7 +119,7 @@ GET subscriptions with fields attribute selector
     ...    Test title: GET subscriptions with fields attribute selector
     ...    Test objective: The objective is Get the list of active subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -132,7 +132,7 @@ GET subscriptions with exclude_fields attribute selector
     ...    Test title: GET subscriptions with exclude_fields attribute selector
     ...    Test objective: The objective is Get the list of active subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -145,7 +145,7 @@ PUT subscriptions - Method not implemented
     ...    Test title: PUT subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.18.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -157,7 +157,7 @@ PATCH subscriptions - Method not implemented
     ...    Test title: PATCH subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.18.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: subscription not modified
@@ -169,7 +169,7 @@ DELETE subscriptions - Method not implemented
     ...    Test title: DELETE subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.18.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: subscription not deleted
@@ -181,7 +181,7 @@ GET Subscriptions as a Paged Response
     ...    Test title: GET Subscriptions as a Paged Response
     ...    Test objective: The objective is Get the list of active subscriptions as a Paged Response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -194,7 +194,7 @@ GET subscriptions - Bad Request Response too Big
     ...    Test title: GET subscriptions - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of the list of active subscriptions fails because response is too big. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -207,7 +207,7 @@ POST Create a new Subscription - Unprocessable Entity
     ...    Test title: POST Create a new Subscription - Unprocessable Entity
     ...    Test objective: The objective is to test that content type of the payload body is supported and the payload body of a request contains syntactically correct data but the data cannot be processed.
     ...    re-conditions: none
-    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
index 928f931a8..8246953b2 100644
--- a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
@@ -14,7 +14,7 @@ POST Terminate a vnfInstance
     ...    Test title: POST Terminate a vnfInstance
     ...    Test objective: The objective is to test that POST method terminate a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ POST Terminate a vnfInstance Conflict (Not-Instantiated)
     ...    Test title: POST Terminate a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to test that the vnf Instance cannot be terminated 
     ...    Pre-conditions:  VNF instance resource is in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ GET Terminate VNFInstance - Method not implemented
     ...    Test title:  GET Terminate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -53,7 +53,7 @@ PUT Terminate VNFInstance - Method not implemented
     ...    Test title:  PUT Terminate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.8.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.8.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -65,7 +65,7 @@ PATCH Terminate VNFInstance - Method not implemented
     ...    Test title:  PATCH Terminate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.8.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.8.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -77,7 +77,7 @@ DELETE Terminate VNFInstance - Method not implemented
     ...    Test title:  DELETE Terminate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.8.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.8.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL003/VNFLifecycleManagement-API/TerminateVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/TerminateVNFWorkflow.robot
index e502115cb..8b93074e7 100644
--- a/SOL003/VNFLifecycleManagement-API/TerminateVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/TerminateVNFWorkflow.robot
@@ -18,7 +18,7 @@ Terminate a VNF Instance
     ...    Test title: Terminate a VNF Instance
     ...    Test objective: The objective is to terminate a VNF instance.
     ...    Pre-conditions: VNF instance in INSTANTIATED state 
-    ...    Reference: Clause 5.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM. 
     ...    Post-Conditions: VNF instance in NOT_INSTANTIATED state 
diff --git a/SOL003/VNFLifecycleManagement-API/VNFInstances.robot b/SOL003/VNFLifecycleManagement-API/VNFInstances.robot
index af57f75f0..6ce3b5eb4 100644
--- a/SOL003/VNFLifecycleManagement-API/VNFInstances.robot
+++ b/SOL003/VNFLifecycleManagement-API/VNFInstances.robot
@@ -14,7 +14,7 @@ POST Create a new vnfInstance
     ...    Test title: POST Create a new vnfInstance
     ...    Test objective: The objective is to create a new VNF instance resource
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: VNF instance created
@@ -27,7 +27,7 @@ GET information about multiple VNF instances
     ...    Test title: GET information about multiple VNF instances
     ...    Test objective: The objective is to query information about multiple VNF instances
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,8 +39,8 @@ GET information about multiple VNF instances Bad Request Invalid attribute-based
     [Documentation]    Test ID: 7.3.1.1.3
     ...    Test title: GET information about multiple VNF instances Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to query information about multiple VNF instances with Invalid attribute-based filtering parameters
-    ...    Pre-conditions:  A VNF is instantiated,  a bad filter selector (filter selectors are listed in Table 5.4.2.3.2-1  - ETSI GS NFV-SOL 003 [1] v2.6.1).
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Pre-conditions:  A VNF is instantiated,  a bad filter selector (filter selectors are listed in Table 5.4.2.3.2-1  - ETSI GS NFV-SOL 003 [1] v2.7.1).
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -53,8 +53,8 @@ GET information about multiple VNF instances Bad Request Invalid attribute selec
     [Documentation]    Test ID: 7.3.1.1.4
     ...    Test title: GET information about multiple VNF instances Bad Request Invalid attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances with Invalid attribute selector
-    ...    Pre-conditions:  A VNF is instantiated,  a bad attribute selector (attribute selectors are listed in Table 5.4.2.3.2-1  - ETSI GS NFV-SOL 003 [1] v2.6.1).
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Pre-conditions:  A VNF is instantiated,  a bad attribute selector (attribute selectors are listed in Table 5.4.2.3.2-1  - ETSI GS NFV-SOL 003 [1] v2.7.1).
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -67,7 +67,7 @@ GET information about multiple VNF instances with "all_fields" attribute selecto
     ...    Test title: GET information about multiple VNF instances with "all_fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -80,7 +80,7 @@ GET information about multiple VNF instances with "exclude_default" attribute se
     ...    Test title: GET information about multiple VNF instances with "exclude_default" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -93,7 +93,7 @@ GET information about multiple VNF instances with "fields" attribute selector
     ...    Test title: GET information about multiple VNF instances with "fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances
     ...    Pre-conditions: none 
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -106,7 +106,7 @@ GET information about multiple VNF instances with "exclude_fields" attribute sel
     ...    Test title: GET information about multiple VNF instances with "exclude_fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -119,7 +119,7 @@ PUT multiples VNFInstances - Method not implemented
     ...    Test title: PUT multiples VNFInstances - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -131,7 +131,7 @@ PATCH multiples VNFInstances - Method not implemented
     ...    Test title: PATCH multiples VNFInstances - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -143,7 +143,7 @@ DELETE VNFInstances - Method not implemented
     ...    Test title: DELETE multiples VNFInstances - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none 
-    ...    Reference: Clause 5.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: resources are not deleted
@@ -155,7 +155,7 @@ GET information about multiple VNF instances to get Paged Response
     ...    Test title: GET information about multiple VNF instances to get Paged Response
     ...    Test objective: The objective is to query information about multiple VNF instances to get Paged Response.
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -167,8 +167,8 @@ GET information about multiple VNF instances - Bad Request Response too Big
     [Documentation]    Test ID: 7.3.1.1.13
     ...    Test title: GET information about multiple VNF instances - Bad Request Response too Big
     ...    Test objective: The objective is to query information about multiple VNF instances fails because response is too big. The test also checks the JSON schema of the unsuccessful operation HTTP response.
-    ...    Pre-conditions:  A VNF is instantiated,  a bad attribute selector (attribute selectors are listed in Table 5.4.2.3.2-1  - ETSI GS NFV-SOL 003 [1] v2.6.1).
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Pre-conditions:  A VNF is instantiated,  a bad attribute selector (attribute selectors are listed in Table 5.4.2.3.2-1  - ETSI GS NFV-SOL 003 [1] v2.7.1).
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -181,7 +181,7 @@ GET information about multiple VNF instances with "exclude_default" and "fields"
     ...    Test title: GET information about multiple VNF instances with "exclude_default" and "fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances
     ...    Pre-conditions: none 
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
index 4566da857..225d814bb 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
@@ -12,7 +12,7 @@ POST VNF LCM Operation occurrences - Method not implemented
     ...    Test title: POST VNF LCM Operation occurrences - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.12.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -24,7 +24,7 @@ GET status information about multiple VNF LCM Operation OCC
     ...    Test title: GET status information about multiple VNF LCM Operation OCC
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -37,7 +37,7 @@ GET status information about multiple VNF LCM Operation OCC Bad Request Invalid
     ...    Test title: GET status information about multiple VNF LCM Operation OCC Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to test that GET method fail retrieving status information about multiple VNF lifecycle management operation occurrences because attribute is invalid.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -50,7 +50,7 @@ GET status information about multiple VNF LCM Operation OCC Bad Request Invalid
     ...    Test title: GET status information about multiple VNF LCM Operation OCC Bad Request Invalid attribute selector
     ...    Test objective: The objective is to test that GET method fail retrieving status information about multiple VNF lifecycle management operation occurrences because attribute is invalid.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -63,7 +63,7 @@ GET status information about multiple VNF LCM Operation OCC with "all_fields"
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "all_fields"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -76,7 +76,7 @@ GET status information about multiple VNF LCM Operation OCC with "exlude_default
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "exclude_default"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -89,7 +89,7 @@ GET status information about multiple VNF LCM Operation OCC with "fields"
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "fields"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -102,7 +102,7 @@ GET status information about multiple VNF LCM Operation OCC with "exclude_fields
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "exclude_fields"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -115,7 +115,7 @@ PUT status information about multiple VNF LCM Operation OCC - Method not impleme
     ...    Test title: PUT status information about multiple VNF LCM Operation OCC - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.12.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -127,7 +127,7 @@ PATCH status information about multiple VNF LCM Operation OCC - Method not imple
     ...    Test title: PATCH status information about multiple VNF LCM Operation OCC - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.12.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -139,7 +139,7 @@ DELETE status information about multiple VNF LCM Operation OCC - Method not impl
     ...    Test title: DELETE status information about multiple VNF LCM Operation OCC - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.12.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -151,7 +151,7 @@ GET status information about multiple VNF LCM Operation OCC to get Paged Respons
     ...    Test title: GET status information about multiple VNF LCM Operation OCC to get Paged Response
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences to get a Paged Response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -164,7 +164,7 @@ GET status information about multiple VNF LCM Operation OCC - Bad Request Respon
     ...    Test title: GET status information about multiple VNF LCM Operation OCC - Bad Request Response too Big
     ...    Test objective: The objective is to test that GET method fail retrieving status information about multiple VNF lifecycle management operation occurrences because response is too big. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -177,7 +177,7 @@ GET status information about multiple VNF LCM Operation OCC with "exclude_defaul
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "exclude_default" and "fields"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
-- 
GitLab


From b59fb74bd8c22537243392cd9a4209684cb411ce Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Wed, 21 Oct 2020 10:33:06 +0200
Subject: [PATCH 106/322] re-removed VNF PM subscriptions and updated index
 file

---
 .../IndividualSubscription.robot              |  98 ----------
 .../Subscriptions.robot                       | 175 ------------------
 2 files changed, 273 deletions(-)
 delete mode 100644 SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot
 delete mode 100644 SOL002/VNFPerformanceManagement-API/Subscriptions.robot

diff --git a/SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot b/SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot
deleted file mode 100644
index 1d9d2d429..000000000
--- a/SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot
+++ /dev/null
@@ -1,98 +0,0 @@
-*** Settings ***
-Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt    # Generic Parameters
-Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
-Library           OperatingSystem
-Library           JSONLibrary
-Resource          VNFPerformanceManagementKeywords.robot
-
-*** Test Cases ***
-GET Individual VNF Performance Subscription
-    [Documentation]    Test ID: 6.3.3.7.1
-    ...    Test title: GET Individual VNF Performance Subscription
-    ...    Test objective: The objective is to test the retrieval of individual VNF performance subscription and perform a JSON schema and content validation of the returned subscription data structure
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.8.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Individual VNF Performance Subscription
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is   PmSubscription
-    Check HTTP Response Body Subscription Identifier matches the requested Subscription
-
-GET Individual VNF Performance Subscription with invalid resource identifier
-    [Documentation]    Test ID: 6.3.3.7.2
-    ...    Test title: GET Individual VNF Performance Subscription with invalid resource identifier
-    ...    Test objective: The objective is to test that the retrieval of an individual VNF performance subscription fails when using an invalid resource identifier
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.8.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    GET individual VNF Performance Subscription with invalid resource identifier
-    Check HTTP Response Status Code Is    404
-
-DELETE Individual VNF Performance Subscription
-    [Documentation]    Test ID: 6.3.3.7.3
-    ...    Test title: DELETE Individual VNF Performance Subscription
-    ...    Test objective: The objective is to test the deletion of an individual VNF performance subscription
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.8.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: The VNF Performance Subscription is not available anymore in the VNFM    
-    Send Delete request for individual VNF Performance Subscription
-    Check HTTP Response Status Code Is    204
-    Check Postcondition VNF Performance Subscription is Deleted
-
-DELETE Individual VNF Performance Subscription with invalid resource identifier
-    [Documentation]    Test ID: 6.3.3.7.4
-    ...    Test title: DELETE Individual VNF Performance Subscription with invalid resource identifier
-    ...    Test objective: The objective is to test that the deletion of an individual VNF performance subscription fails when using an invalid resource identifier
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.8.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none   
-    Send Delete request for individual VNF Performance Subscription with invalid resource identifier
-    Check HTTP Response Status Code Is    404
-
-POST Individual VNF Performance Subscription - Method not implemented
-    [Documentation]    Test ID: 6.3.3.7.5
-    ...    Test title: POST Individual VNF Performance Subscription - Method not implemented
-    ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF Performance Subscription
-    ...    Pre-conditions: A VNF instance is instantiated
-    ...    Reference: Clause 6.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: The VNF Performance Subscription is not created on the VNFM
-    Send Post request for individual VNF Performance Subscription
-    Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Performance Subscription is not Created
-
-PUT Individual VNF Performance Subscription - Method not implemented
-    [Documentation]    Test ID: 6.3.3.7.6
-    ...    Test title: PUT Individual VNF Performance Subscription - Method not implemented
-    ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF Performance subscription
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.8.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: The VNF Performance subscription is not modified by the operation
-    Send Put request for individual VNF Performance Threshold
-    Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Performance Subscription is Unmodified (Implicit)
-
-PATCH Individual VNF Performance Subscription - Method not implemented
-    [Documentation]    Test ID: 6.3.3.7.7
-    ...    Test title: PATCH Individual VNF Performance Subscription - Method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing VNF Performance subscription
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.8.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: The VNF Performance subscription is not modified by the operation
-    Send Patch request for individual VNF Performance Threshold
-    Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Performance Subscription is Unmodified (Implicit)
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/Subscriptions.robot b/SOL002/VNFPerformanceManagement-API/Subscriptions.robot
deleted file mode 100644
index c9948009b..000000000
--- a/SOL002/VNFPerformanceManagement-API/Subscriptions.robot
+++ /dev/null
@@ -1,175 +0,0 @@
-*** Settings ***
-Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt    # Generic Parameters
-Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
-Library           OperatingSystem
-Library           JSONLibrary
-Resource          VNFPerformanceManagementKeywords.robot
-Library           MockServerLibrary
-Library           Process
-Suite Setup       Create Sessions
-Suite Teardown    Terminate All Processes    kill=true
-
-*** Test Cases ***
-GET all VNF Performance Subscriptions
-    [Documentation]    Test ID: 6.3.3.6.1
-    ...    Test title: GET all VNF Performance Subscriptions
-    ...    Test objective: The objective is to test the retrieval of all VNF performance subscriptions and perform a JSON schema validation of the returned subscriptions data structure
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    Get all VNF Performance Subscriptions
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    PmSubscriptions
-
-GET VNF Performance Subscriptions with attribute-based filter
-    [Documentation]    Test ID: 6.3.3.6.2
-    ...    Test title: GET VNF Performance Subscriptions with attribute-based filter
-    ...    Test objective: The objective is to test the retrieval of VNF performance subscriptions using attribute-based filter, perform a JSON schema validation of the collected indicators data structure, and verify that the retrieved information matches the issued attribute-based filters 
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get VNF Performance Subscriptions with attribute-based filters
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    PmSubscriptions
-    Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filter 
-
-GET VNF Performance Management Subscriptions with invalid attribute-based filter
-    [Documentation]    Test ID: 6.3.3.6.3
-    ...    Test title: GET VNF Performance Management Subscriptions with invalid attribute-based filter
-    ...    Test objective: The objective is to test that the retrieval of VNF performance subscriptions fails when using invalid attribute-based filters, and perform the JSON schema validation of the failed operation HTTP response. 
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get VNF Performance Subscriptions with invalid attribute-based filters
-    Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is   ProblemDetails 
-
-GET VNF Performance Subscriptions with invalid resource endpoint
-    [Documentation]    Test ID: 6.3.3.6.4
-    ...    Test title: GET VNF Performance Subscriptions with invalid resource endpoint
-    ...    Test objective: The objective is to test that the retrieval of all VNF performance subscriptions fails when using invalid resource endpoint.
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    Get VNF Performance Subscriptions with invalid resource endpoint
-    Check HTTP Response Status Code Is    404
-    
-Create new VNF Performance subscription
-    [Documentation]    Test ID: 6.3.3.6.5
-    ...    Test title: Create new VNF Performance subscription
-    ...    Test objective: The objective is to test the creation of a new VNF performance subscription and perform a JSON schema and content validation of the returned subscription data structure
-    ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: The VNF performance subscription is successfully set and it matches the issued subscription    
-    Send Post Request for VNF Performance Subscription
-    Check HTTP Response Status Code Is    201
-    Check HTTP Response Body Json Schema Is    PmSubscription
-    Check HTTP Response Body PmSubscription Attributes Values Match the Issued Subscription
-    Check Postcondition VNF Performance Subscription Is Set 
-
-
-Create duplicated VNF Performance subscription with VNFM not creating duplicated subscriptions
-    [Tags]    no-duplicated-subs
-    [Documentation]    Test ID: 6.3.3.6.6
-    ...    Test title: Create duplicated VNF Performance subscription with VNFM not creating duplicated subscriptions
-    ...    Test objective: The objective is to test the attempt of a creation of a duplicated VNF performance subscription and check that no new subscription is created by the VNFM and a link to the original subscription is returned
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: The VNFM does not support the creation of duplicated subscriptions
-    ...    Post-Conditions: The existing VNF performance subscription returned is available in the VNFM 
-    Send Post Request for Duplicated VNF Performance Subscription
-    Check HTTP Response Status Code Is    303
-    Check HTTP Response Body Is Empty
-    Check HTTP Response Header Contains    Location
-    Check Postcondition Subscription Resource Returned in Location Header Is Available
-
-Create duplicated VNF Performance subscription with VNFM creating duplicated subscriptions
-    [Tags]    duplicated-subs
-    [Documentation]    Test ID: 6.3.3.6.7
-    ...    Test title: Create duplicated VNF Performance subscription with VNFM creating duplicated subscriptions
-    ...    Test objective: The objective is to test the creation of a duplicated VNF performance subscription and perform a JSON schema and content validation of the returned duplicated subscription data structure
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: The VNFM supports the creation of duplicated subscriptions
-    ...    Post-Conditions: The duplicated VNF performance subscription is successfully set and it matches the issued subscription
-    Send Post Request for Duplicated VNF Performance Subscription
-    Check HTTP Response Status Code Is    201
-    Check HTTP Response Body Json Schema Is    PmSubscription
-    Check HTTP Response Body PmSubscription Attributes Values Match the Issued Subscription
-    Check Postcondition VNF Performance Subscription Is Set 
-
-PUT VNF Performance Subscriptions - Method not implemented
-    [Documentation]    Test ID: 6.3.3.6.8
-    ...    Test title: PUT VNF Performance Subscriptions - Method not implemented
-    ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF performance subscriptions
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send Put Request for VNF Performance Subscriptions
-    Check HTTP Response Status Code Is    405 
-    
-PATCH VNF Performance Subscriptions - Method not implemented
-    [Documentation]    Test ID: 6.3.3.6.9
-    ...    Test title: PATCH VNF Performance Subscriptions - Method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF performance subscriptions
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send Patch Request for VNF Performance Subscriptions
-    Check HTTP Response Status Code Is    405
-    
-DELETE VNF Performance Subscriptions - Method not implemented
-    [Documentation]    Test ID: 6.3.3.6.10
-    ...    Test title: DELETE VNF Performance Subscriptions - Method not implemented
-    ...    Test objective: The objective is to test that DELETE method is not allowed to delete VNF performance subscriptions
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: The VNF performance subscriptions are not deleted by the failed operation   
-    Send Delete Request for VNF Performance Subscriptions
-    Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Performance Subscriptions Exists
-    
-GET VNF Performance Subscriptions to get Paged Response
-    [Documentation]    Test ID: 6.3.3.6.11
-    ...    Test title: GET VNF Performance Subscriptions to get Paged Response
-    ...    Test objective: The objective is to test the retrieval of all VNF performance subscriptions to get Paged Response
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    Get all VNF Performance Subscriptions
-    Check HTTP Response Status Code Is    200
-    Check LINK in Header
-    
-GET VNF Performance Management Subscriptions for Bad Request Response too big
-    [Documentation]    Test ID: 6.3.3.6.12
-    ...    Test title: GET VNF Performance Management Subscriptions for Bad Request Response too big
-    ...    Test objective: The objective is to test that the retrieval of VNF performance subscriptions fails when response is too big, and perform the JSON schema validation of the failed operation HTTP response. 
-    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get VNF Performance Subscriptions with invalid attribute-based filters
-    Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is   ProblemDetails 
-- 
GitLab


From 5ceae56bce8adb7ae951d3c1c53251e12441dfb1 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Wed, 21 Oct 2020 11:16:32 +0200
Subject: [PATCH 107/322] updated index file

---
 indexes/sol_002_index.csv | 90 +++++++++++++++++++--------------------
 1 file changed, 44 insertions(+), 46 deletions(-)

diff --git a/indexes/sol_002_index.csv b/indexes/sol_002_index.csv
index 52042c494..746258166 100644
--- a/indexes/sol_002_index.csv
+++ b/indexes/sol_002_index.csv
@@ -1,51 +1,49 @@
-6,	Ve-Vnfm Reference Point, SOL002 
-6.3.1,	VNF Configuration Interface	, VNFConfiguration-API    
-6.3.1.1,	Configuration Resource Endpoint	, Configuration.robot
+"6,	Ve-Vnfm Reference Point, SOL002 "
+"6.3.1,	VNF Configuration Interface	, VNFConfiguration-API    "
+"6.3.1.1,	Configuration Resource Endpoint	, Configuration.robot"
 6.3.1.2,API Version Resource Endpoint, ApiVersion.robot
-6.3.2,	VNF Indicator Interface	, VNFIndicator-API
-6.3.2.1,	VNF Indicators Resource Endpoint	, VNFIndicators.robot
-6.3.2.2,	VNF Indicators related to a VNF Instance Resource Endpoint	, VnfIndicatorsInVnfInstanceId.robot 
-6.3.2.3,	Individual VNF Indicator Resource Endpoit,IndividualVNFindicator.robot
-6.3.2.4,	Subscriptions Resource Endpoint	, Subscriptions.robot
-6.3.2.5,	Individual Subscription Resource Endpoint	, IndividualSubscription.robot
-6.3.2.6,	Notification Endpoint	, ../VNFIndicatorNotification-API/VnfIndicatorNotification.robot
+"6.3.2,	VNF Indicator Interface	, VNFIndicator-API"
+"6.3.2.1,	VNF Indicators Resource Endpoint	, VNFIndicators.robot"
+"6.3.2.2,	VNF Indicators related to a VNF Instance Resource Endpoint	, VnfIndicatorsInVnfInstanceId.robot "
+"6.3.2.3,	Individual VNF Indicator Resource Endpoit,IndividualVNFindicator.robot"
+"6.3.2.4,	Subscriptions Resource Endpoint	, Subscriptions.robot"
+"6.3.2.5,	Individual Subscription Resource Endpoint	, IndividualSubscription.robot"
+"6.3.2.6,	Notification Endpoint	, ../VNFIndicatorNotification-API/VnfIndicatorNotification.robot"
 6.3.2.7,API Version Resource Endpoint, ApiVersion.robot
-6.3.3,	VNF Performance Management Interface	, VNFPerformanceManagement-API
-6.3.3.1,	PM Jobs Resource Endpoint	, PMJobs.robot   
-6.3.3.2,	Individual PM Job Resource Endpoint	, IndividualPmJob.robot 
-6.3.3.3,	Individual Performance Report Resource Endpoint	, IndividualReport.robot
-6.3.3.4,	Thresholds Resource Endpoint	, Thresholds.robot
-6.3.3.5,	Individual Threshold Resource Endpoint	, IndividualThreshold.robot  
-6.3.3.6,	Subscriptions Resource Endpoint	, Subscriptions.robot  
-6.3.3.7,	Individual Subscription Resource Endpoint	, IndividualSubscription.robot 
-6.3.3.8,	Notification Endpoint	, ../VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot    
+"6.3.3,	VNF Performance Management Interface	, VNFPerformanceManagement-API"
+"6.3.3.1,	PM Jobs Resource Endpoint	, PMJobs.robot   "
+"6.3.3.2,	Individual PM Job Resource Endpoint	, IndividualPmJob.robot "
+"6.3.3.3,	Individual Performance Report Resource Endpoint	, IndividualReport.robot"
+"6.3.3.4,	Thresholds Resource Endpoint	, Thresholds.robot"
+"6.3.3.5,	Individual Threshold Resource Endpoint	, IndividualThreshold.robot  "
+"6.3.3.8,	Notification Endpoint	, ../VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot    "
 6.3.3.9,API Version Resource Endpoint, ApiVersion.robot
-6.3.4,	VNF Fault Management interface	, VNFFaultManagement-API
-6.3.4.1,	Alarms	, Alarms.robot  
-6.3.4.2,	Individual Alarm	, IndividualAlarm.robot
-6.3.4.3,	Escalate the perceived severity	, EscalatePerceivedSeverityTask.robot
-6.3.4.4,	Subscriptions	, Subscriptions.robot
-6.3.4.5,	Individual Subscription	, IndividualSubscription.robot
-6.3.4.6,	Notification Endpoint	, NotificationEndpoint.robot
+"6.3.4,	VNF Fault Management interface	, VNFFaultManagement-API"
+"6.3.4.1,	Alarms	, Alarms.robot  "
+"6.3.4.2,	Individual Alarm	, IndividualAlarm.robot"
+"6.3.4.3,	Escalate the perceived severity	, EscalatePerceivedSeverityTask.robot"
+"6.3.4.4,	Subscriptions	, Subscriptions.robot"
+"6.3.4.5,	Individual Subscription	, IndividualSubscription.robot"
+"6.3.4.6,	Notification Endpoint	, NotificationEndpoint.robot"
 6.3.4.7,API Version Resource Endpoint, ApiVersion.robot
-6.3.5,	VNF Lifecycle Management interface	, VNFLifecycleManagement-API
-6.3.5.1,	VNF Instances	, VNFInstances.robot
-6.3.5.2,	Individual VNFInstance	, IndividualVNFInstance.robot 
-6.3.5.3,	Instantiate VNF Task	, InstantiateVNFTask.robot
-6.3.5.4,	Scale VNF Task	, ScaleVNFTask.robot  
-6.3.5.5,	Scale a VNF to level Task	, ScaleVNFToLevelTask.robot    
-6.3.5.6,	Change VNF deployment flavour Task	, ChangeVNFFlavourTask.robot 
-6.3.5.7,	Terminate VNF Task	, TerminateVNFTask.robot
-6.3.5.8,	Heal VNF Task	, HealVNFTask.robot 
-6.3.5.9,	Operate VNF Task	, OperateVNFTask.robot
-6.3.5.10,	Change external VNF connectivity	, ChangeExternalVNFConnectivityTask.robot  
-6.3.5.11,	VNF LCM OP occurrences	, VnfLcmOperationOccurences.robot
-6.3.5.12,	Individual VNF LCM OP occurrence	, IndividualVnfLcmOperationOccurence.robot  
-6.3.5.13,	Retry operation task	, RetryOperationTask.robot
-6.3.5.14,	Rollback operation task	, RollbackOperationTask.robot  
-6.3.5.15,	Fail operation task	, FailOperationTask.robot 
-6.3.5.16,	Cancel operation task	, CancelOperationTask.robot
-6.3.5.17,	Subscriptions	, Subscriptions.robot
-6.3.5.18,	Individual Subscription	, IndividualSubscription.robot
-6.3.5.19,	Notification Endpoint	, NotificationEndpoint.robot
+"6.3.5,	VNF Lifecycle Management interface	, VNFLifecycleManagement-API"
+"6.3.5.1,	VNF Instances	, VNFInstances.robot"
+"6.3.5.2,	Individual VNFInstance	, IndividualVNFInstance.robot "
+"6.3.5.3,	Instantiate VNF Task	, InstantiateVNFTask.robot"
+"6.3.5.4,	Scale VNF Task	, ScaleVNFTask.robot  "
+"6.3.5.5,	Scale a VNF to level Task	, ScaleVNFToLevelTask.robot    "
+"6.3.5.6,	Change VNF deployment flavour Task	, ChangeVNFFlavourTask.robot "
+"6.3.5.7,	Terminate VNF Task	, TerminateVNFTask.robot"
+"6.3.5.8,	Heal VNF Task	, HealVNFTask.robot "
+"6.3.5.9,	Operate VNF Task	, OperateVNFTask.robot"
+"6.3.5.10,	Change external VNF connectivity	, ChangeExternalVNFConnectivityTask.robot  "
+"6.3.5.11,	VNF LCM OP occurrences	, VnfLcmOperationOccurences.robot"
+"6.3.5.12,	Individual VNF LCM OP occurrence	, IndividualVnfLcmOperationOccurence.robot  "
+"6.3.5.13,	Retry operation task	, RetryOperationTask.robot"
+"6.3.5.14,	Rollback operation task	, RollbackOperationTask.robot  "
+"6.3.5.15,	Fail operation task	, FailOperationTask.robot "
+"6.3.5.16,	Cancel operation task	, CancelOperationTask.robot"
+"6.3.5.17,	Subscriptions	, Subscriptions.robot"
+"6.3.5.18,	Individual Subscription	, IndividualSubscription.robot"
+"6.3.5.19,	Notification Endpoint	, NotificationEndpoint.robot"
 6.3.5.20,API Version Resource Endpoint, ApiVersion.robot
-- 
GitLab


From ccb7df1ec468e02c96a8dd6fb6fc68224cb306f9 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Wed, 21 Oct 2020 11:23:12 +0200
Subject: [PATCH 108/322] fix for issue #121 in SOL003-VNFIndicator-API

---
 .../IndividualSubscription.robot              |  1 -
 .../IndividualVNFindicator.robot              |  1 -
 SOL003/VNFIndicator-API/Subscriptions.robot   |  1 -
 SOL003/VNFIndicator-API/VNFIndicators.robot   |  1 -
 .../VNFIndicatorsKeywords.robot               |  5 ----
 .../VnfIndicatorsInVnfInstanceId.robot        |  1 -
 .../environment/individualSubscription.txt    |  7 -----
 .../environment/individualVnfIndicator.txt    |  7 -----
 .../environment/subscriptions.txt             |  7 -----
 .../environment/variables.txt                 | 27 ++++++++++++++++++-
 .../environment/vnfIndicatorinVnfInstance.txt |  5 ----
 .../environment/vnfIndicators.txt             |  5 ----
 12 files changed, 26 insertions(+), 42 deletions(-)
 delete mode 100644 SOL003/VNFIndicator-API/environment/individualSubscription.txt
 delete mode 100644 SOL003/VNFIndicator-API/environment/individualVnfIndicator.txt
 delete mode 100644 SOL003/VNFIndicator-API/environment/subscriptions.txt
 delete mode 100644 SOL003/VNFIndicator-API/environment/vnfIndicatorinVnfInstance.txt
 delete mode 100644 SOL003/VNFIndicator-API/environment/vnfIndicators.txt

diff --git a/SOL003/VNFIndicator-API/IndividualSubscription.robot b/SOL003/VNFIndicator-API/IndividualSubscription.robot
index 839ed3e9c..cf162f22b 100644
--- a/SOL003/VNFIndicator-API/IndividualSubscription.robot
+++ b/SOL003/VNFIndicator-API/IndividualSubscription.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/individualSubscription.txt
 Resource          VNFIndicatorsKeywords.robot
 Library           OperatingSystem
 Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
diff --git a/SOL003/VNFIndicator-API/IndividualVNFindicator.robot b/SOL003/VNFIndicator-API/IndividualVNFindicator.robot
index 52b04e414..916331fbb 100644
--- a/SOL003/VNFIndicator-API/IndividualVNFindicator.robot
+++ b/SOL003/VNFIndicator-API/IndividualVNFindicator.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/individualVnfIndicator.txt
 Resource          VNFIndicatorsKeywords.robot
 Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 
diff --git a/SOL003/VNFIndicator-API/Subscriptions.robot b/SOL003/VNFIndicator-API/Subscriptions.robot
index 18cda29a4..f20c0f888 100644
--- a/SOL003/VNFIndicator-API/Subscriptions.robot
+++ b/SOL003/VNFIndicator-API/Subscriptions.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/subscriptions.txt
 Resource          VNFIndicatorsKeywords.robot
 Library           OperatingSystem
 Library           JSONLibrary
diff --git a/SOL003/VNFIndicator-API/VNFIndicators.robot b/SOL003/VNFIndicator-API/VNFIndicators.robot
index 5eb2cf7b7..66a032edf 100644
--- a/SOL003/VNFIndicator-API/VNFIndicators.robot
+++ b/SOL003/VNFIndicator-API/VNFIndicators.robot
@@ -2,7 +2,6 @@
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
 Library           JSONLibrary
-Resource          environment/vnfIndicators.txt
 Resource          VNFIndicatorsKeywords.robot
 Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 
diff --git a/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot b/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
index d39f925d5..1623f460c 100644
--- a/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
+++ b/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
@@ -1,10 +1,5 @@
 *** Settings ***
 Resource    environment/variables.txt
-Resource    environment/subscriptions.txt
-Resource    environment/vnfIndicators.txt
-Resource    environment/vnfIndicatorinVnfInstance.txt
-Resource    environment/individualVnfIndicator.txt
-Resource    environment/individualSubscription.txt
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 Library    MockServerLibrary 
 Library    OperatingSystem
diff --git a/SOL003/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot b/SOL003/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
index c2e54e5dd..0c8b3fffb 100644
--- a/SOL003/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
+++ b/SOL003/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/vnfIndicatorinVnfInstance.txt
 Resource          VNFIndicatorsKeywords.robot
 Library           JSONLibrary
 Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
diff --git a/SOL003/VNFIndicator-API/environment/individualSubscription.txt b/SOL003/VNFIndicator-API/environment/individualSubscription.txt
deleted file mode 100644
index a85388af9..000000000
--- a/SOL003/VNFIndicator-API/environment/individualSubscription.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-*** Variables ***
-${subscriptionId}    17563e75-0e14-4bd7-94b4-6bbb869c79aa
-${erroneousSubscriptionId}    erroneousSubscriptionId
-${newSubscriptionId}    newSubsciptionId
-${response}    httpresponse
-${origResponse}    httpresponse
-
diff --git a/SOL003/VNFIndicator-API/environment/individualVnfIndicator.txt b/SOL003/VNFIndicator-API/environment/individualVnfIndicator.txt
deleted file mode 100644
index 010a634eb..000000000
--- a/SOL003/VNFIndicator-API/environment/individualVnfIndicator.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-*** Variables ***
-${vnfInstanceId}    80b0deba-c398-445b-bef0-ac0fe733e3d0
-${indicatorId}    34e70855-a9d3-4fef-aece-76a3cd266ec8
-${notAllowedIndicatorId}    notAllowedId
-${erroneousIndicatorId}    erroneousIndicatorId
-${response}=    httpresponse
-
diff --git a/SOL003/VNFIndicator-API/environment/subscriptions.txt b/SOL003/VNFIndicator-API/environment/subscriptions.txt
deleted file mode 100644
index 5dea0892b..000000000
--- a/SOL003/VNFIndicator-API/environment/subscriptions.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-*** Variables ***
-${filter_ok}      callbackUri=${callbackUri}
-${filter_ko}      erroneousFilter=erroneous
-${callbackUri}    http://172.22.1.7:9091/vnfind/subscriptions
-${total_polling_time}   2 min
-${polling_interval}     10 sec
-
diff --git a/SOL003/VNFIndicator-API/environment/variables.txt b/SOL003/VNFIndicator-API/environment/variables.txt
index 6cc6ab92c..9fb63250b 100644
--- a/SOL003/VNFIndicator-API/environment/variables.txt
+++ b/SOL003/VNFIndicator-API/environment/variables.txt
@@ -35,4 +35,29 @@ ${notification_response}    []
 ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
 
 ${callback}    http://172.22.1.7:${callback_port}
-${callback_subscribe}    /vnfind/subscribes
\ No newline at end of file
+${callback_subscribe}    /vnfind/subscribes
+
+
+${subscriptionId}    17563e75-0e14-4bd7-94b4-6bbb869c79aa
+${erroneousSubscriptionId}    erroneousSubscriptionId
+${newSubscriptionId}    newSubsciptionId
+${origResponse}    httpresponse
+
+
+${vnfInstanceId}    80b0deba-c398-445b-bef0-ac0fe733e3d0
+${indicatorId}    34e70855-a9d3-4fef-aece-76a3cd266ec8
+${notAllowedIndicatorId}    notAllowedId
+${erroneousIndicatorId}    erroneousIndicatorId
+
+
+${filter_ok}      callbackUri=${callbackUri}
+${filter_ko}      erroneousFilter=erroneous
+
+
+${erroneousVnfInstanceId}    erroneousVnfInstanceId
+${POS_FIELDS}     name=vnfIndicator
+${NEG_FIELDS}     wrongName=any_value
+
+
+${SEPERATOR}      =
+${VAR_SEPERATOR}    &
\ No newline at end of file
diff --git a/SOL003/VNFIndicator-API/environment/vnfIndicatorinVnfInstance.txt b/SOL003/VNFIndicator-API/environment/vnfIndicatorinVnfInstance.txt
deleted file mode 100644
index 13ef83d69..000000000
--- a/SOL003/VNFIndicator-API/environment/vnfIndicatorinVnfInstance.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-*** Variables ***
-${vnfInstanceId}    80b0deba-c398-445b-bef0-ac0fe733e3d0
-${erroneousVnfInstanceId}    erroneousVnfInstanceId
-${POS_FIELDS}     name=vnfIndicator
-${NEG_FIELDS}     wrongName=any_value
diff --git a/SOL003/VNFIndicator-API/environment/vnfIndicators.txt b/SOL003/VNFIndicator-API/environment/vnfIndicators.txt
deleted file mode 100644
index b4ca7ceaa..000000000
--- a/SOL003/VNFIndicator-API/environment/vnfIndicators.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-*** Variables ***
-${POS_FIELDS}     name=vnfIndicator&vnfInstanceId=80b0deba-c398-445b-bef0-ac0fe733e3d0
-${NEG_FIELDS}     wrongName=wrongValue
-${SEPERATOR}      =
-${VAR_SEPERATOR}    &
\ No newline at end of file
-- 
GitLab


From 914a5823a26ffe725442aa36de72e18782771fd8 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 21 Oct 2020 15:05:49 +0500
Subject: [PATCH 109/322] bugs fix added and redundant keywords removed

---
 .../CancelOperationTask.robot                 | 26 +-----------
 .../CancelOperationWorkflow.robot             |  8 +---
 .../ChangeExternalVNFConnectivityTask.robot   | 18 +-------
 ...hangeExternalVNFConnectivityWorkflow.robot | 11 +----
 .../ChangeVNFFlavourTask.robot                | 40 +-----------------
 .../ChangeVNFFlavourWorkflow.robot            | 14 +------
 .../CreateVNFWorkflow.robot                   |  4 +-
 .../DeleteVNFWorkflow.robot                   |  1 -
 .../FailOperationTask.robot                   | 23 +----------
 .../FailOperationWorkflow.robot               | 13 +-----
 .../HealVNFTask.robot                         | 36 +---------------
 .../HealVNFWorkflow.robot                     | 11 +----
 .../IndividualSubscription.robot              |  9 +---
 .../IndividualVNFInstance.robot               | 22 +---------
 .../IndividualVnfLcmOperationOccurence.robot  |  3 +-
 .../InstantiateVNFTask.robot                  | 19 +--------
 .../InstantiateVNFTaskWorkflow.robot          |  1 -
 .../ModifyVNFInformationWorkflow.robot        | 14 +------
 .../OperateVNFTask.robot                      | 26 +-----------
 .../OperateVNFWorkflow.robot                  | 10 +----
 .../RetryOperationTask.robot                  | 22 +++-------
 .../RetryOperationWorkflow.robot              | 12 +-----
 .../RollBackOperationWorkflow.robot           |  9 +---
 .../RollbackOperationTask.robot               | 23 +++--------
 .../ScaleVNFTask.robot                        | 29 +------------
 .../ScaleVNFToLevelTask.robot                 | 41 ++-----------------
 .../ScaleVNFToLevelWorkflow.robot             | 16 +-------
 .../ScaleVNFWorkflow.robot                    | 17 +-------
 .../Subscriptions.robot                       |  6 +--
 .../TerminateVNFTask.robot                    | 24 +----------
 .../TerminateVNFWorkflow.robot                | 15 +------
 .../VNFInstances.robot                        |  4 +-
 .../VnfLcmMntOperationKeywords.robot          |  3 +-
 .../VnfLcmOperationOccurences.robot           |  2 +-
 34 files changed, 56 insertions(+), 476 deletions(-)

diff --git a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
index cd2102c59..e85b9a2e6 100644
--- a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
@@ -35,7 +35,6 @@ POST Cancel operation task Conflict
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
 POST Cancel operation task Not Found
-    # TODO: Need to create a vnfInstance which's instantiatedVnfInfo.scaleStatus is absent
      [Documentation]    Test ID: 7.3.1.16.3
     ...    Test title: POST Cancel operation task Not Found
     ...    Test objective: The objective is to test that POST method cannot cancel a VNF lifecycle operation because the resource is not found
@@ -46,6 +45,7 @@ POST Cancel operation task Not Found
     ...    Post-Conditions: none
     POST Cancel operation task
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
     
 GET Cancel operation task - Method not implemented
     [Documentation]    Test ID: 7.3.1.16.4
@@ -93,26 +93,4 @@ DELETE Cancel operation task - Method not implemented
     ...    Applicability: none
     ...    Post-Conditions: none 
     DELETE Cancel operation task
-	Check HTTP Response Status Code Is    405
-
-*** Keywords ***
-Check resource existence
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
-    Integer    response status    200
-
-Launch another error handling action
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry
-    Integer    response status    202
-    
-Check Fail not supported
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
-    # how to check if Fail is not supported?
-
-Check resource FAILED_TEMP
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
-    String    response body operationState    FAILED_TEMP
\ No newline at end of file
+	Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot
index aa7455d28..bcf53de2d 100644
--- a/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot
@@ -58,11 +58,6 @@ Precondition Checks - STARTING
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body operationState    STARTING
 
-Precondition Checks - PROCESSING - ROLLING_BACK
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
-    String    response body operationState    PROCESSING 
-
 Check Postcondition VNF Cancel - STARTING
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
@@ -75,5 +70,4 @@ Check Postcondition VNF Cancel - PROCESSING - ROLLING_BACK
  
 Check Operation Notification For Cancel 
     [Arguments]    ${status}
-    Check Operation Notification    VnfLcmOperationOccurrenceNotification   ${status}
-    
\ No newline at end of file
+    Check Operation Notification    VnfLcmOperationOccurrenceNotification   ${status}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
index e2a527820..6262d1130 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
@@ -67,20 +67,4 @@ DELETE Change external VNF connectivity - Method not implemented
     ...    Applicability: none
     ...    Post-Conditions: none 
     DELETE Change External VNF Connectivity
-    Check HTTP Response Status Code Is    405
-
-*** Keywords ***
-Check resource existence
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
-    Integer    response status    200
-
-Launch another LCM operation
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/scaleVnfRequest.json
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
-    Integer    response status    202
\ No newline at end of file
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityWorkflow.robot
index d5c9beabe..2da0b56e2 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityWorkflow.robot
@@ -13,7 +13,6 @@ Library    Process
 Suite Setup    Initialize System
 Suite Teardown    Terminate All Processes    kill=true
 
-
 *** Test Cases ***
 Change external connectivity of VNF Workflow
     [Documentation]    Test ID: 7.3.1.20.1
@@ -39,19 +38,11 @@ Initialize System
     ${body}=    Get File    jsons/changeExtVnfConnectivityRequest.json
     ${changeVnfExtConnectivityRequest}=    evaluate    json.loads('''${body}''')    json    
     
-Precondition Checks
-    Check resource instantiated
-    ${LccnSubscriptions}=    Check subscriptions about one VNFInstance and operation type    ${vnfInstanceId}    VnfLcmOperationOccurrenceNotification    operationType=SCALE
-
 Check Postcondition VNF Change Ext Connectivity
     Check resource instantiated
     ${extVLId}=    Get Vnf Ext Link Id    ${vnfInstanceId}
     Should be Equal    ${changeVnfExtConnectivityRequest["extVirtualLinks"][0]["id"]}    ${extVLId}
     
-Create a new Grant - Sync - OPERATE
-    Create a new Grant - Synchronous mode        ${vnfInstanceId}    ${vnfLcmOpOccId}    OPERATE
-    
 Check Operation Notification For Change Ext Connectivity 
     [Arguments]    ${status}
-    Check Operation Notification    VnfLcmOperationOccurrenceNotification   ${status}
-    
\ No newline at end of file
+    Check Operation Notification    VnfLcmOperationOccurrenceNotification   ${status}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
index 630e70279..dab045065 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
@@ -35,7 +35,6 @@ POST Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
     Check HTTP Response Body Json Schema Is    ProblemDetails
   
 POST Change deployment flavour of a vnfInstance Not Found
-    # TODO: Need to create a vnfInstance which's instantiatedVnfInfo.scaleStatus is absent
     [Documentation]    Test ID: 7.3.1.6.3
     ...    Test title: POST Change deployment flavour of a vnfInstance Not Found
     ...    Test objective: The objective is to test that POST method cannot trigger a change in VNF deployment flavour because the VNF instance resource is not found. 
@@ -94,41 +93,4 @@ DELETE Change deployment flavour VNFInstance - Method not implemented
     ...    Applicability: none
     ...    Post-Conditions: none 
     DELETE Change VNF deployment flavour   
-    Check HTTP Response Status Code Is    405
-
-*** Keywords ***
-Check resource existence
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
-    Integer    response status    200
-
-Check resource not instantiated
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
-    String    response body instantiationState    NOT_INSTANTIATED
-
-Check resource instantiated
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
-    String    response body instantiationState    INSTANTIATED    
-
-Check change flavour not supported
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
-    # how to check if change floavour is not supported? "flavourId" doesn't exist?
-
-Launch another LCM operation
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/scaleVnfRequest.json
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
-    Integer    response status    202
\ No newline at end of file
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourWorkflow.robot
index b2d6e3ebd..bccd69dca 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourWorkflow.robot
@@ -13,7 +13,6 @@ Library    Process
 Suite Setup    Initialize System
 Suite Teardown    Terminate All Processes    kill=true
 
-
 *** Test Cases ***
 Change VNF Flavour Workflow
     [Documentation]    Test ID: 7.3.1.21.1
@@ -42,21 +41,12 @@ Initialize System
     ${body}=    Get File    jsons/changeVnfFlavourRequest.json
     ${changeVnfFlavourRequest}=    evaluate    json.loads('''${body}''')    json
     ${requestedFlavour}=    Get Value From Json    ${changeVnfFlavourRequest}    $..newFlavourId
-    
-Precondition Checks
-    Check resource instantiated
-    ${LccnSubscriptions}=    Check subscriptions about one VNFInstance and operation type    ${vnfInstanceId}    VnfLcmOperationOccurrenceNotification    operationType=SCALE
-    ${scaleInfo}=    Get Vnf Scale Info        ${vnfInstanceId}
 
 Check Postcondition VNF Flavor Changed
     Check resource instantiated
     ${newFlavour}=    Get Vnf Flavour Info    ${vnfInstanceId}
     Should be Equal    ${requestedFlavour}    ${newFlavour}
-    
-Create a new Grant - Sync - CHANGE_FLAVOUR
-    Create a new Grant - Synchronous mode        ${vnfInstanceId}    ${vnfLcmOpOccId}    CHANGE_FLAVOUR
-    
+       
 Check Operation Notification For Change Flavour 
     [Arguments]    ${status}
-    Check Operation Notification    VnfLcmOperationOccurrenceNotification   ${status}
-    
\ No newline at end of file
+    Check Operation Notification    VnfLcmOperationOccurrenceNotification   ${status}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/CreateVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/CreateVNFWorkflow.robot
index 36f53d1a7..5adab1398 100644
--- a/SOL003/VNFLifecycleManagement-API/CreateVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/CreateVNFWorkflow.robot
@@ -13,7 +13,6 @@ Library    Process
 Suite Setup    Initialize System
 Suite Teardown    Terminate All Processes    kill=true
 
-
 *** Test Cases ***
 Create VNF Instance Resource
     [Documentation]    Test ID: 7.3.1.22.1
@@ -42,5 +41,4 @@ Check Postcondition VNF Instance Created status is
     Check VNF Status    ${response['body']['instantiationState']}  ${status}  
      
 Check Operation Notification For VNF Instance Creation
-    Check VNF Instance Operation Notification    VnfIdentifierCreationNotification   ${vnfInstanceId}
-    
\ No newline at end of file
+    Check VNF Instance Operation Notification    VnfIdentifierCreationNotification   ${vnfInstanceId}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/DeleteVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/DeleteVNFWorkflow.robot
index 3b1c6a1c0..1322e1cb3 100644
--- a/SOL003/VNFLifecycleManagement-API/DeleteVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/DeleteVNFWorkflow.robot
@@ -13,7 +13,6 @@ Library    Process
 Suite Setup    Initialize System
 Suite Teardown    Terminate All Processes    kill=true
 
-
 *** Test Cases ***
 Delete VNF Instance Resource
     [Documentation]    Test ID: 7.3.1.23.1
diff --git a/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot b/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
index 2ff77eb5f..116bea793 100644
--- a/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
@@ -23,7 +23,6 @@ POST Fail operation task
     Check operation resource state is FINALLY_FAILED
 
 Post Fail operation task Conflict (Not-FAILED_TEMP)
-    # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
     [Documentation]    Test ID: 7.3.1.15.2
     ...    Test title: Post Fail operation task Conflict (Not-FAILED_TEMP)
     ...    Test objective: The objective is to test that POST method cannot mark as "finally failed" a VNF lifecycle operation 
@@ -37,17 +36,17 @@ Post Fail operation task Conflict (Not-FAILED_TEMP)
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
 Post Fail operation task Not Found
-    # TODO: Need to create a vnfInstance which's instantiatedVnfInfo.scaleStatus is absent
     [Documentation]    Test ID: 7.3.1.15.3
     ...    Test title: Post Fail operation task Not Found 
     ...    Test objective: The objective is to test that POST method cannot mark as "finally failed" a VNF lifecycle operation because the operation is not supported
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none  
     Post Fail operation
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
 
 GET Fail operation task - Method not implemented
      [Documentation]    Test ID: 7.3.1.15.4
@@ -96,21 +95,3 @@ DELETE Fail operation task - Method not implemented
     ...    Post-Conditions: 
     Delete Fail operation
     Check HTTP Response Status Code Is    405
-
-*** Keywords ***
-Check resource existence
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
-    Integer    response status    200
-
-Launch another error handling action
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry
-    Integer    response status    202
-    
-Check Fail not supported
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
-    # how to check if Fail is not supported?
-
diff --git a/SOL003/VNFLifecycleManagement-API/FailOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/FailOperationWorkflow.robot
index 5ef0573ea..2f63dc674 100644
--- a/SOL003/VNFLifecycleManagement-API/FailOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/FailOperationWorkflow.robot
@@ -13,7 +13,6 @@ Library    Process
 Suite Setup    Initialize System
 Suite Teardown    Terminate All Processes    kill=true
 
-
 *** Test Cases ***
 Fail a VNF LCM Operation Workflow
     [Documentation]    Test ID: 7.3.1.24.1
@@ -26,18 +25,12 @@ Fail a VNF LCM Operation Workflow
     ...    Post-Conditions: The VNF lifecycle management operation occurrence is in FAILED state
     Send Fail Operation Request
     Check Operation Notification For Fail    FAILED
-    Check HTTP Response Status Code Is    200   #the order of notification and the response code is not defined. How to implement this?
+    Check HTTP Response Status Code Is    200
     Check Postcondition VNF Fail 
 
-
 *** Keywords ***
 Initialize System
     Create Sessions
-    
-Precondition Checks
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
-    String    response body operationState    FAILED_TEMP
 
 Check Postcondition VNF Fail
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
@@ -46,6 +39,4 @@ Check Postcondition VNF Fail
  
 Check Operation Notification For Fail 
     [Arguments]    ${status}
-    Check Operation Notification    VnfLcmOperationOccurrenceNotification   ${status}
-    
-    
\ No newline at end of file
+    Check Operation Notification    VnfLcmOperationOccurrenceNotification   ${status}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot b/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
index 1bc6354d1..6c485bd86 100644
--- a/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
@@ -22,7 +22,6 @@ POST Heal a vnfInstance
     Check Operation Occurrence Id existence
 
 POST Heal a vnfInstance Conflict (Not-Instantiated)
-    # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
      [Documentation]    Test ID: 7.3.1.8.2
     ...    Test title: POST Heal a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
@@ -34,8 +33,6 @@ POST Heal a vnfInstance Conflict (Not-Instantiated)
     POST Heal VNF
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
-
-
     
 POST Heal a vnfInstance Not Found
     [Documentation]    Test ID: 7.3.1.8.3
@@ -50,7 +47,6 @@ POST Heal a vnfInstance Not Found
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails 
     
-   
 GET Heal VNFInstance - Method not implemented
     [Documentation]    Test ID: 7.3.1.8.4
     ...    Test title: GET Heal a vnfInstance - Method not implemented
@@ -97,34 +93,4 @@ DELETE Heal VNFInstance - Method not implemented
     ...    Applicability: none
     ...    Post-Conditions: none
     DELETE Heal VNF  
-    Check HTTP Response Status Code Is    405
-
-*** Keywords ***
-Check resource existence
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
-    Integer    response status    200
-
-Check resource not instantiated
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
-    String    response body instantiationState    NOT_INSTANTIATED
-
-Check heal not supported
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
-    # how to check if heal is not supported? "flavourId" doesn't exist?
-
-Launch another LCM operation
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/scaleVnfRequest.json
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
-    Integer    response status    202
\ No newline at end of file
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/HealVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/HealVNFWorkflow.robot
index e7f4775aa..79b84a89a 100644
--- a/SOL003/VNFLifecycleManagement-API/HealVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/HealVNFWorkflow.robot
@@ -13,7 +13,6 @@ Library    Process
 Suite Setup    Initialize System
 Suite Teardown    Terminate All Processes    kill=true
 
-
 *** Test Cases ***
 Heal a VNF Instance
     [Documentation]    Test ID: 7.3.1.25.1
@@ -38,17 +37,9 @@ Heal a VNF Instance
 Initialize System
     Create Sessions
     
-Precondition Checks
-    Check resource instantiated
-    ${LccnSubscriptions}=    Check subscriptions about one VNFInstance and operation type    ${vnfInstanceId}    VnfLcmOperationOccurrenceNotification    operationType=SCALE
-
 Check Postcondition VNF Heal
     Check resource Instantiated
 
-Create a new Grant - Sync - OPERATE
-    Create a new Grant - Synchronous mode        ${vnfInstanceId}    ${vnfLcmOpOccId}    OPERATE
-    
 Check Operation Notification For Heal 
     [Arguments]    ${status}
-    Check Operation Notification    VnfLcmOperationOccurrenceNotification   ${status}
-    
\ No newline at end of file
+    Check Operation Notification    VnfLcmOperationOccurrenceNotification   ${status}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot b/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot
index 051cb878a..1d2450c71 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot
@@ -79,11 +79,4 @@ GET Individual Subscription - Not Found
     ...    Post-Conditions: none 
     Get Individual Subscription
     Check HTTP Response Status Code Is    404
-
-*** Keywords ***
-Check resource existence
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
-    Integer    response status    200
\ No newline at end of file
+    Check HTTP Response Body Json Schema Is    ProblemDetails
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index 8dd6e9662..5b2aa5f12 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
@@ -1,6 +1,5 @@
 *** Settings ***
 Resource    environment/configuration.txt
-# Suite setup     Expect spec    SOL003-VNFLifecycleManagement-API.yaml
 Resource    environment/variables.txt 
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}      ssl_verify=false
 Resource    VnfLcmMntOperationKeywords.robot
@@ -126,6 +125,7 @@ Get Information about an individual VNF Instance - Not Found
     ...    Post-Conditions: none
     GET individual vnfInstance
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
     
 *** Keywords ***
 Check resource existence
@@ -133,22 +133,4 @@ Check resource existence
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
-    Integer    response status    200
-
-Check resource instantiated
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
-    String    response body instantiationState    INSTANTIATED
-
-Launch another LCM operation
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/scaleVnfToLevelRequest.json
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
-    Integer    response status    202
-SET etag
-    ${etag}    Output    response headers ETag
-    Set Suite Variable    ${original_etag}    ${etag}    
+    Integer    response status    200    
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot b/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
index 2a61f566c..a9c88fac1 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
@@ -78,4 +78,5 @@ Get Individual VNF LCM Operation occurrences - Not Found
     ...    Applicability: none
     ...    Post-Conditions: none 
     Get Individual VNF LCM Operation occurrences
-    Check HTTP Response Status Code Is    404 
\ No newline at end of file
+    Check HTTP Response Status Code Is    404 
+    Check HTTP Response Body Json Schema Is    ProblemDetails
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
index 843138eca..9527fce9d 100644
--- a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
@@ -8,7 +8,6 @@ Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 Resource    VnfLcmMntOperationKeywords.robot
 
-
 *** Test Cases ***
 Instantiate a vnfInstance
     [Documentation]    Test ID: 7.3.1.3.1
@@ -24,7 +23,6 @@ Instantiate a vnfInstance
     Check Operation Occurrence Id existence
 
 Instantiate a vnfInstance Conflict
-    # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
     [Documentation]    Test ID: 7.3.1.3.2
     ...    Test title: Post Instantiate Individual VNFInstance 
     ...    Test objective: The objective is to verify that the instantiation of the vnf cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
@@ -83,19 +81,4 @@ DELETE Instantiate VNFInstance - Method not implemented
     ...    Applicability: none
     ...    Post-Conditions: none
     DELETE instantiate individual vnfInstance   
-    Check HTTP Response Status Code Is    405
-
-*** Keywords ***
-Check resource existence
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
-    Integer    response status    200
-
-Check resource instantiated
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
-    String    response body instantiationState    INSTANTIATED
\ No newline at end of file
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot
index 3945ebd84..51565ab17 100644
--- a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot
@@ -15,7 +15,6 @@ Library    JSONSchemaLibrary    schemas/
 Library    JSONLibrary
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 
-
 *** Test Cases ***
 VNF Instantiation
     [Documentation]    Test ID: 7.3.1.26.1
diff --git a/SOL003/VNFLifecycleManagement-API/ModifyVNFInformationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ModifyVNFInformationWorkflow.robot
index a38a7f520..c92809306 100644
--- a/SOL003/VNFLifecycleManagement-API/ModifyVNFInformationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ModifyVNFInformationWorkflow.robot
@@ -13,7 +13,6 @@ Library    Process
 Suite Setup    Initialize System
 Suite Teardown    Terminate All Processes    kill=true
 
-
 *** Test Cases ***
 Modify info of a VNF Instance
     [Documentation]    Test ID: 7.3.1.27.1
@@ -39,19 +38,10 @@ Initialize System
     ${body}=    Get File    jsons/patchBodyRequest.json
     ${patchBodyRequest}=    evaluate    json.loads('''${body}''')    json    
     
-Precondition Checks
-    Check resource instantiated
-    ${LccnSubscriptions}=    Check subscriptions about one VNFInstance and operation type    ${vnfInstanceId}    VnfLcmOperationOccurrenceNotification    operationType=SCALE
-
 Check Postcondition VNF Modify Info
     Check VNF Instance    ${vnfInstanceId}
     Check HTTP Response Status Code Is    200
-    #do we need to compare the modified info in the updated VNF instance with the values in the request?
-    
-Create a new Grant - Sync - OPERATE
-    Create a new Grant - Synchronous mode        ${vnfInstanceId}    ${vnfLcmOpOccId}    OPERATE
-    
+        
 Check Operation Notification For Modify Info 
     [Arguments]    ${status}
-    Check Operation Notification    VnfLcmOperationOccurrenceNotification   ${status}
-    
\ No newline at end of file
+    Check Operation Notification    VnfLcmOperationOccurrenceNotification   ${status}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
index e585852b2..4c62df07c 100644
--- a/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
@@ -46,7 +46,7 @@ POST Operate a vnfInstance Not Found
     ...    Applicability: none
     ...    Post-Conditions: none
     POST Operate VNF
-    Check HTTP Response Status Code Is    409
+    Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails
    
 GET Operate VNFInstance - Method not implemented
@@ -96,7 +96,7 @@ DELETE Operate VNFInstance - Method not implemented
     ...    Post-Conditions: none
     DELETE Operate VNF
     Check HTTP Response Status Code Is    405
-
+    
 *** Keywords ***
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
@@ -104,25 +104,3 @@ Check resource existence
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
-
-Check resource not instantiated
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
-    String    response body instantiationState    NOT_INSTANTIATED
-
-Check operate not supported
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
-    # how to check if operate is not supported? "flavourId" doesn't exist?
-
-Launch another LCM operation
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/scaleVnfRequest.json
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
-    Integer    response status    202
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot
index 422748ad2..e8eb5628d 100644
--- a/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot
@@ -40,19 +40,11 @@ Initialize System
     ${changeVnfOperateRequest}=    evaluate    json.loads('''${body}''')    json
     ${requestedState}=    Get Value From Json    ${changeVnfOperateRequest}    $..changeStateTo 
     
-Precondition Checks
-    Check resource instantiated
-    ${LccnSubscriptions}=    Check subscriptions about one VNFInstance and operation type    ${vnfInstanceId}    VnfLcmOperationOccurrenceNotification    operationType=SCALE
-
 Check Postcondition VNF OPERATE
     Check resource instantiated
     ${newState}=    Get Vnf Operational State Info    ${vnfInstanceId}
     Should be Equal    ${requestedState}    ${newState}
     
-Create a new Grant - Sync - OPERATE
-    Create a new Grant - Synchronous mode        ${vnfInstanceId}    ${vnfLcmOpOccId}    OPERATE
-    
 Check Operation Notification For Operate 
     [Arguments]    ${status}
-    Check Operation Notification    VnfLcmOperationOccurrenceNotification   ${status}
-    
\ No newline at end of file
+    Check Operation Notification    VnfLcmOperationOccurrenceNotification   ${status}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot b/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
index c937f06ec..2d2843bc6 100644
--- a/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
@@ -48,6 +48,7 @@ Post Retry operation task Not Found
     ...    Post-Conditions: none 
     Post Retry operation
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
 
 GET Retry operation task - Method not implemented
     [Documentation]    Test ID: 7.3.1.13.4
@@ -57,7 +58,7 @@ GET Retry operation task - Method not implemented
     ...    Reference: Clause 5.4.14.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Get Retry operation
     Check HTTP Response Status Code Is    405
 
@@ -69,7 +70,7 @@ PUT Retry operation task - Method not implemented
     ...    Reference: Clause 5.4.14.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Put Retry operation
     Check HTTP Response Status Code Is    405
 
@@ -81,7 +82,7 @@ PATCH Retry operation task - Method not implemented
     ...    Reference: Clause 5.4.14.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Patch Retry operation
     Check HTTP Response Status Code Is    405
     
@@ -93,7 +94,7 @@ DELETE Retry operation task - Method not implemented
     ...    Reference: Clause 5.4.14.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Delete Retry operation
     Check HTTP Response Status Code Is    405
 
@@ -102,15 +103,4 @@ Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
-    Integer    response status    200
-
-Launch another error handling action
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback
-    Integer    response status    202
-    
-Check retry not supported
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
-    # how to check if retry is not supported?
-
+    Integer    response status    200
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
index dc216358e..2ca45a10c 100644
--- a/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
@@ -11,7 +11,6 @@ Library    Collections
 Library    JSONLibrary
 Library    Process
 
-
 *** Test Cases ***
 Retry VNF LCM Operation - Successful
     [Documentation]    Test ID: 7.3.1.29.1
@@ -48,14 +47,6 @@ Retry VNF LCM Operation - Unsuccessful
     Check Postcondition VNF Retry Unsuccessful
 
 *** Keywords ***
-Initialize System
-    Create Sessions
-    
-Precondition Checks
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
-    String    response body operationState    FAILED_TEMP
-
 Check Postcondition VNF Retry Successful
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
@@ -68,5 +59,4 @@ Check Postcondition VNF Retry Unsuccessful
     
 Check Operation Notification For Retry 
     [Arguments]    ${status}
-    Check Operation Notification    VnfLcmOperationOccurrenceNotification   ${status}
-    
\ No newline at end of file
+    Check Operation Notification    VnfLcmOperationOccurrenceNotification   ${status}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
index 1c3d4b935..611dd0707 100644
--- a/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
@@ -13,7 +13,6 @@ Library    Process
 Suite Setup    Initialize System
 Suite Teardown    Terminate All Processes    kill=true
 
-
 *** Test Cases ***
 Rollback a VNF LCM Operation - Successful
     [Documentation]    Test ID: 7.3.1.30.1
@@ -53,11 +52,6 @@ Rollback VNF LCM Operation - Unsuccessful
 
 Initialize System
     Create Sessions
-    
-Precondition Checks
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
-    String    response body operationState    FAILED_TEMP
 
 Check Postcondition VNF Roll Back Successful
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
@@ -71,5 +65,4 @@ Check Postcondition VNF Roll Back Unsuccessful
     
 Check Operation Notification For Roll Back 
     [Arguments]    ${status}
-    Check Operation Notification    VnfLcmOperationOccurrenceNotification   ${status}
-    
\ No newline at end of file
+    Check Operation Notification    VnfLcmOperationOccurrenceNotification   ${status}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot b/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
index b68a10519..c6cb4aecc 100644
--- a/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
@@ -24,7 +24,6 @@ Post Rollback operation task
     Check Operation Occurrence Id existence
 
 POST Rollback operation task Conflict (Not-FAILED_TEMP)
-    # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
     [Documentation]    Test ID: 7.3.1.14.2
     ...    Test title: POST Rollback operation task Conflict (Not-FAILED_TEMP)
     ...    Test objective: The objective is to test that POST method initiates a rollback on a VNF lifecycle operation 
@@ -48,6 +47,7 @@ POST Rollback operation task Not Found
     ...    Post-Conditions: none 
     Post Rollback operation
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
 
 GET Rollback operation task - Method not implemented
     [Documentation]    Test ID: 7.3.1.14.4
@@ -57,7 +57,7 @@ GET Rollback operation task - Method not implemented
     ...    Reference: Clause 5.4.15.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Get Rollback operation
     Check HTTP Response Status Code Is    405
     
@@ -69,7 +69,7 @@ PUT Rollback operation task - Method not implemented
     ...    Reference: Clause 5.4.15.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none 
     Put Rollback operation
     Check HTTP Response Status Code Is    405
 
@@ -81,7 +81,7 @@ PATCH Rollback operation task - Method not implemented
     ...    Reference: Clause 5.4.15.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Patch Rollback operation
     Check HTTP Response Status Code Is    405
     
@@ -93,7 +93,7 @@ DELETE Rollback operation task - Method not implemented
     ...    Reference: Clause 5.4.15.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Delete Rollback operation
     Check HTTP Response Status Code Is    405
 
@@ -102,15 +102,4 @@ Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
-    Integer    response status    200
-
-Launch another error handling action
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry
-    Integer    response status    202
-    
-Check Rollback not supported
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
-    # how to check if Rollback is not supported?
-    
+    Integer    response status    200
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
index 815b95445..cd9eca136 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
@@ -23,7 +23,6 @@ POST Scale a vnfInstance
     Check Operation Occurrence Id existence
 
 POST Scale a vnfInstance Conflict (Not-Instantiated)
-    # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
     [Documentation]    Test ID: 7.3.1.4.2
     ...    Test title: POST Scale a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to verify that the scale operation cannot be executed 
@@ -37,7 +36,6 @@ POST Scale a vnfInstance Conflict (Not-Instantiated)
     Check HTTP Response Body Json Schema Is    ProblemDetails 
     
 POST Scale a vnfInstance Not Found
-    # TODO: Need to create a vnfInstance which's instantiatedVnfInfo.scaleStatus is absent
      [Documentation]    Test ID: 7.3.1.4.3
     ...    Test title: POST Scale a vnfInstance Not Found
     ...    Test objective: The objective is to verify that the operation cannot be executed currently, because the VNF instance resource is not found. 
@@ -94,10 +92,9 @@ DELETE Scale VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.5.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: Resource are not deleted
+    ...    Post-Conditions: none
     DELETE Scale vnfInstance
     Check HTTP Response Status Code Is    405
-    Check resource existence
 
 *** Keywords ***
 Check resource existence
@@ -105,26 +102,4 @@ Check resource existence
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
-    Integer    response status    200
-
-Check resource not instantiated
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
-    String    response body instantiationState    NOT_INSTANTIATED
-
-Check scale not supported
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
-    Missing    response body instantiatedVnfInfo scaleStatus
-
-Launch another LCM operation
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/scaleVnfToLevelRequest.json
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
-    Integer    response status    202
\ No newline at end of file
+    Integer    response status    200
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
index a746bbaa9..7c4dd0996 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
@@ -22,7 +22,6 @@ POST Scale a vnfInstance to level
     Check Operation Occurrence Id existence
 
 POST Scale a vnfInstance to level Conflict (Not-Instantiated)
-    # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
     [Documentation]    Test ID: 7.3.1.5.2
     ...    Test title: POST Scale a vnfInstance to level Conflict (Not-Instantiated)
     ...    Test objective: The objective is to verify that the scale operation cannot be executed because the resource is not instantiated
@@ -35,9 +34,7 @@ POST Scale a vnfInstance to level Conflict (Not-Instantiated)
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
 
-    
 Scale a vnfInstance Not Found
-    # TODO: Need to create a vnfInstance which's instantiatedVnfInfo.scaleStatus is absent
     [Documentation]    Test ID: 7.3.1.5.3
     ...    Test title: Scale a vnfInstance Not Found
     ...    Test objective: The objective is to verify that the operation cannot be executed , because the VNF instance resource cannot be found.
@@ -47,10 +44,9 @@ Scale a vnfInstance Not Found
     ...    Applicability: none
     ...    Post-Conditions: none
     POST Scale vnfInstance to level    
-    Check HTTP Response Status Code Is    409
+    Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails 
    
-    
 GET Scale to level VNFInstance - Method not implemented
     [Documentation]    Test ID: 7.3.1.5.4
     ...    Test title: GET Scale to level VNFInstance - Method not implemented
@@ -95,37 +91,6 @@ DELETE Scale to level VNFInstance - Method not implemented
     ...    Reference: Clause 5.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: Resources are not deleted
+    ...    Post-Conditions: none
     DELETE Scale vnfInstance to level
-    Check HTTP Response Status Code Is    405
-    Check resource existence
-
-*** Keywords ***
-Check resource existence
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
-    Integer    response status    200
-
-Check resource not instantiated
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notInstantiatedVnfInstanceId} 
-    String    response body instantiationState    NOT_INSTANTIATED
-
- Check scale to level not supported
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
-    Missing    response body instantiatedVnfInfo scaleStatus
-
-Launch another LCM operation
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/scaleVnfRequest.json
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
-    Integer    response status    202
\ No newline at end of file
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot
index d4e8ac9b6..2ecbe5327 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot
@@ -11,7 +11,6 @@ Library    Collections
 Library    JSONLibrary
 Library    Process
 
-
 *** Test Cases ***
 VNF Instance Scale To Level
    [Documentation]    Test ID: 7.3.1.31.1
@@ -34,14 +33,6 @@ VNF Instance Scale To Level
 #Create a new Grant - Sync - Scale REMOVED
 
 *** Keywords ***
-
-Initialize System
-    Create Sessions
-    ${body}=    Get File    jsons/scaleVnfToLevelRequest.json
-    ${scaleVnfToLevelRequest}=    evaluate    json.loads('''${body}''')    json
-    ${instantiationLevelId}=    Get Value From Json    ${scaleVnfToLevelRequest}    $..instantiationLevelId    #How to use this info to get the instantiation scale level?
-    ${scaleInfo}=    Get Value From Json    ${scaleVnfToLevelRequest}    $..scaleInfo
-
 Check Postcondition VNF Scaled To New Level
     Check resource instantiated
     ${newScaleInfo}=    Get Vnf Scale Info    ${vnfInstanceId}
@@ -59,11 +50,6 @@ Compare ScaleInfos
     END
     Should be true    ${old_level_value}==${new_level_value}
     
-   
-Create a new Grant - Sync - ScaleToLevel
-    Create a new Grant - Synchronous mode        ${vnfInstanceId}    ${vnfLcmOpOccId}    SCALE_TO_LEVEL
-    
 Check Operation Notification For Scale
     [Arguments]    ${status}
-    Check Operation Notification    VnfLcmOperationOccurrenceNotification   ${status}
-    
\ No newline at end of file
+    Check Operation Notification    VnfLcmOperationOccurrenceNotification   ${status}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFWorkflow.robot
index 30d813c84..03bfe773c 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFWorkflow.robot
@@ -11,7 +11,6 @@ Library    Collections
 Library    JSONLibrary
 Library    Process
 
-
 *** Test Cases ***
 VNF Instance Scale Out
    [Documentation]    Test ID: 7.3.1.32.1
@@ -34,16 +33,6 @@ VNF Instance Scale Out
 #Create a new Grant - Sync - Scale REMOVED
 
 *** Keywords ***
-
-Initialize System
-    Create Sessions
-    ${scaleInfo}=    Get Vnf Scale Info    ${vnfInstanceId}
-    
-Precondition Checks
-    Check resource instantiated
-    ${LccnSubscriptions}=    Check subscriptions about one VNFInstance and operation type    ${vnfInstanceId}    VnfLcmOperationOccurrenceNotification    operationType=SCALE
-    ${scaleInfo}=    Get Vnf Scale Info        ${vnfInstanceId}
-
 Check Postcondition VNF
     [Arguments]    ${operation}
     Check resource instantiated
@@ -62,11 +51,7 @@ Compare ScaleInfos
     END
     Run Keyword If    ${type}==SCALE_OUT    Should Be True    ${old_level_value}<${new_level_value}
     ...    ELSE    Should Be True    ${old_level_value}<${new_level_value}
-   
-Create a new Grant - Sync - Scale
-    Create a new Grant - Synchronous mode        ${vnfInstanceId}    ${vnfLcmOpOccId}    SCALE
     
 Check Operation Notification For Scale
     [Arguments]    ${status}
-    Check Operation Notification    VnfLcmOperationOccurrenceNotification   ${status}
-    
\ No newline at end of file
+    Check Operation Notification    VnfLcmOperationOccurrenceNotification   ${status}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/Subscriptions.robot b/SOL003/VNFLifecycleManagement-API/Subscriptions.robot
index 043af19b9..5b211923b 100644
--- a/SOL003/VNFLifecycleManagement-API/Subscriptions.robot
+++ b/SOL003/VNFLifecycleManagement-API/Subscriptions.robot
@@ -160,7 +160,7 @@ PATCH subscriptions - Method not implemented
     ...    Reference: Clause 5.4.18.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: subscription not modified
+    ...    Post-Conditions: none
     PATCH subscriptions
 	Check HTTP Response Status Code Is    405
 
@@ -172,7 +172,7 @@ DELETE subscriptions - Method not implemented
     ...    Reference: Clause 5.4.18.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: subscription not deleted
+    ...    Post-Conditions: none
     DELETE subscriptions
 	Check HTTP Response Status Code Is    405
     
@@ -187,7 +187,7 @@ GET Subscriptions as a Paged Response
     ...    Post-Conditions: none 
     Get subscriptions
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contain Link
     
 GET subscriptions - Bad Request Response too Big
     [Documentation]    Test ID: 7.3.1.17.15
diff --git a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
index 8246953b2..01df5e9f6 100644
--- a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
@@ -90,26 +90,4 @@ Check resource existence
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
-    Integer    response status    200
-
-Check resource not instantiated
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
-    String    response body instantiationState    NOT_INSTANTIATED
-
-Check change flavour not supported
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
-    # how to check if change floavour is not supported? "flavourId" doesn't exist?
-
-Launch another LCM operation
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/scaleVnfRequest.json
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
-    Integer    response status    202
\ No newline at end of file
+    Integer    response status    200
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/TerminateVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/TerminateVNFWorkflow.robot
index 8b93074e7..02c04ac89 100644
--- a/SOL003/VNFLifecycleManagement-API/TerminateVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/TerminateVNFWorkflow.robot
@@ -11,7 +11,6 @@ Library    Collections
 Library    JSONLibrary
 Library    Process
 
-
 *** Test Cases ***
 Terminate a VNF Instance
     [Documentation]    Test ID: 7.3.1.33.1
@@ -32,21 +31,9 @@ Terminate a VNF Instance
     Check Postcondition VNF Terminate
 
 *** Keywords ***
-
-Initialize System
-    Create Sessions
-    
-Precondition Checks
-    Check resource instantiated
-    ${LccnSubscriptions}=    Check subscriptions about one VNFInstance and operation type    ${vnfInstanceId}    VnfLcmOperationOccurrenceNotification    operationType=SCALE
-
 Check Postcondition VNF Terminate
     Check resource not Instantiated
-
-Create a new Grant - Sync - OPERATE
-    Create a new Grant - Synchronous mode        ${vnfInstanceId}    ${vnfLcmOpOccId}    OPERATE
     
 Check Operation Notification For Terminate 
     [Arguments]    ${status}
-    Check Operation Notification    VnfLcmOperationOccurrenceNotification   ${status}
-    
\ No newline at end of file
+    Check Operation Notification    VnfLcmOperationOccurrenceNotification   ${status}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/VNFInstances.robot b/SOL003/VNFLifecycleManagement-API/VNFInstances.robot
index 6ce3b5eb4..195e790b5 100644
--- a/SOL003/VNFLifecycleManagement-API/VNFInstances.robot
+++ b/SOL003/VNFLifecycleManagement-API/VNFInstances.robot
@@ -146,7 +146,7 @@ DELETE VNFInstances - Method not implemented
     ...    Reference: Clause 5.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: resources are not deleted
+    ...    Post-Conditions: none
     DELETE VNFInstances
 	Check HTTP Response Status Code Is    405
 	
@@ -161,7 +161,7 @@ GET information about multiple VNF instances to get Paged Response
     ...    Post-Conditions: none
     GET multiple vnfInstances
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contain Link
     
 GET information about multiple VNF instances - Bad Request Response too Big
     [Documentation]    Test ID: 7.3.1.1.13
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index 723712d75..ba6f5f4c7 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -12,7 +12,6 @@ Library    Collections
 Library    JSONSchemaLibrary    schemas/
 
 *** Keywords ***
-
 Get Vnf Instance 
     [Arguments]    ${vnfInstanceId}
     Set Headers    {"Accept":"${ACCEPT}"}  
@@ -1180,6 +1179,6 @@ GET test endpoint
     Verify Mock Expectation  ${req}
     Clear Requests  ${callback_endpoint}    	    	
     
-Check LINK in Header
+Check HTTP Response Header Contain Link
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
index 225d814bb..286bd75f9 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
@@ -157,7 +157,7 @@ GET status information about multiple VNF LCM Operation OCC to get Paged Respons
     ...    Post-Conditions: none   
     GET VNF LCM Operation occurrences
     Check HTTP Response Status Code Is    202
-    Check LINK in Header
+    Check HTTP Response Header Contain Link
 
 GET status information about multiple VNF LCM Operation OCC - Bad Request Response too Big
     [Documentation]    Test ID: 7.3.1.11.13
-- 
GitLab


From 6c4068ff80200367243723aa5371f1e42c6510fb Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Wed, 21 Oct 2020 12:06:33 +0200
Subject: [PATCH 110/322] fix for issue #121 in SOL003-VNFLCM-API

---
 .../ApiVersion.robot                          |  1 -
 .../CancelOperationTask.robot                 |  1 -
 .../CancelOperationWorkflow.robot             |  2 -
 .../ChangeExternalVNFConnectivityTask.robot   |  1 -
 ...hangeExternalVNFConnectivityWorkflow.robot |  2 -
 .../ChangeVNFFlavourTask.robot                |  1 -
 .../ChangeVNFFlavourWorkflow.robot            |  2 -
 .../CreateVNFWorkflow.robot                   |  2 -
 .../DeleteVNFWorkflow.robot                   |  2 -
 .../FailOperationTask.robot                   |  3 +-
 .../FailOperationWorkflow.robot               |  2 -
 .../HealVNFTask.robot                         |  3 +-
 .../HealVNFWorkflow.robot                     |  2 -
 .../IndividualSubscription.robot              |  3 +-
 .../IndividualVNFInstance.robot               |  4 +-
 .../IndividualVnfLcmOperationOccurence.robot  |  3 +-
 .../InstantiateVNFTask.robot                  |  3 +-
 .../InstantiateVNFTaskWorkflow.robot          |  1 -
 .../ModifyVNFInformationWorkflow.robot        |  2 -
 .../OperateVNFTask.robot                      |  3 +-
 .../OperateVNFWorkflow.robot                  |  2 -
 .../RetryOperationTask.robot                  |  1 -
 .../RetryOperationWorkflow.robot              |  2 -
 .../RollBackOperationWorkflow.robot           |  2 -
 .../RollbackOperationTask.robot               |  3 +-
 .../ScaleVNFTask.robot                        |  3 +-
 .../ScaleVNFToLevelTask.robot                 |  3 +-
 .../ScaleVNFToLevelWorkflow.robot             |  2 -
 .../ScaleVNFWorkflow.robot                    |  2 -
 .../Subscriptions.robot                       |  3 +-
 .../TerminateVNFTask.robot                    |  3 +-
 .../TerminateVNFWorkflow.robot                |  2 -
 .../VNFInstances.robot                        |  3 +-
 .../VnfLcmOperationOccurences.robot           |  3 +-
 .../environment/configuration.txt             | 39 ----------------
 .../environment/scaleVariables.txt            |  6 ---
 .../environment/variables.txt                 | 44 ++++++++++++++++++-
 37 files changed, 57 insertions(+), 109 deletions(-)
 delete mode 100644 SOL003/VNFLifecycleManagement-API/environment/configuration.txt
 delete mode 100644 SOL003/VNFLifecycleManagement-API/environment/scaleVariables.txt

diff --git a/SOL003/VNFLifecycleManagement-API/ApiVersion.robot b/SOL003/VNFLifecycleManagement-API/ApiVersion.robot
index dd202cb4f..5c2816ed6 100644
--- a/SOL003/VNFLifecycleManagement-API/ApiVersion.robot
+++ b/SOL003/VNFLifecycleManagement-API/ApiVersion.robot
@@ -1,5 +1,4 @@
 *** Settings ***
-Resource    environment/configuration.txt
 Resource    environment/variables.txt
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
 Library    DependencyLibrary
diff --git a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
index cd2102c59..4a3e7202d 100644
--- a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
@@ -1,5 +1,4 @@
 *** Settings ***
-Resource    environment/configuration.txt
 Resource    environment/variables.txt
 Resource    VnfLcmMntOperationKeywords.robot
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
diff --git a/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot
index aa7455d28..2d1849cc9 100644
--- a/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot
@@ -1,7 +1,5 @@
 *** Settings ***
-Resource    environment/configuration.txt
 Resource    environment/variables.txt
-Resource    environment/scaleVariables.txt
 Resource    VnfLcmMntOperationKeywords.robot
 Resource    SubscriptionKeywords.robot
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}      ssl_verify=false  
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
index e2a527820..3252c6484 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
@@ -1,5 +1,4 @@
 *** Settings ***
-Resource    environment/configuration.txt
 Resource    environment/variables.txt 
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
 Resource    VnfLcmMntOperationKeywords.robot
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityWorkflow.robot
index d5c9beabe..6025d66e9 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityWorkflow.robot
@@ -1,7 +1,5 @@
 *** Settings ***
-Resource    environment/configuration.txt
 Resource    environment/variables.txt
-Resource    environment/scaleVariables.txt
 Resource    VnfLcmMntOperationKeywords.robot
 Resource    SubscriptionKeywords.robot
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}       ssl_verify=false 
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
index 630e70279..abb59aa3f 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
@@ -1,5 +1,4 @@
 *** Settings ***
-Resource    environment/configuration.txt
 Resource    environment/variables.txt 
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
 Resource    VnfLcmMntOperationKeywords.robot
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourWorkflow.robot
index b2d6e3ebd..db0cb476a 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourWorkflow.robot
@@ -1,7 +1,5 @@
 *** Settings ***
-Resource    environment/configuration.txt
 Resource    environment/variables.txt
-Resource    environment/scaleVariables.txt
 Resource    VnfLcmMntOperationKeywords.robot
 Resource    SubscriptionKeywords.robot
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}        ssl_verify=false
diff --git a/SOL003/VNFLifecycleManagement-API/CreateVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/CreateVNFWorkflow.robot
index 36f53d1a7..cbf8f1dfd 100644
--- a/SOL003/VNFLifecycleManagement-API/CreateVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/CreateVNFWorkflow.robot
@@ -1,7 +1,5 @@
 *** Settings ***
-Resource    environment/configuration.txt
 Resource    environment/variables.txt
-Resource    environment/scaleVariables.txt
 Resource    VnfLcmMntOperationKeywords.robot
 Resource    SubscriptionKeywords.robot
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}        ssl_verify=false
diff --git a/SOL003/VNFLifecycleManagement-API/DeleteVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/DeleteVNFWorkflow.robot
index 3b1c6a1c0..c75d4d55c 100644
--- a/SOL003/VNFLifecycleManagement-API/DeleteVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/DeleteVNFWorkflow.robot
@@ -1,7 +1,5 @@
 *** Settings ***
-Resource    environment/configuration.txt
 Resource    environment/variables.txt
-Resource    environment/scaleVariables.txt
 Resource    VnfLcmMntOperationKeywords.robot
 Resource    SubscriptionKeywords.robot
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}      ssl_verify=false  
diff --git a/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot b/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
index 2ff77eb5f..e3df8f3b8 100644
--- a/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
@@ -1,6 +1,5 @@
 *** Settings ***
-Resource    environment/configuration.txt
-Resource    environment/variables.txt 
+Resource    environment/variables.txt
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
 Library    DependencyLibrary
 Library    JSONLibrary
diff --git a/SOL003/VNFLifecycleManagement-API/FailOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/FailOperationWorkflow.robot
index 5ef0573ea..271e9f070 100644
--- a/SOL003/VNFLifecycleManagement-API/FailOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/FailOperationWorkflow.robot
@@ -1,7 +1,5 @@
 *** Settings ***
-Resource    environment/configuration.txt
 Resource    environment/variables.txt
-Resource    environment/scaleVariables.txt
 Resource    VnfLcmMntOperationKeywords.robot
 Resource    SubscriptionKeywords.robot
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
diff --git a/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot b/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
index 1bc6354d1..50126d5c5 100644
--- a/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
@@ -1,6 +1,5 @@
 *** Settings ***
-Resource    environment/configuration.txt
-Resource    environment/variables.txt 
+Resource    environment/variables.txt
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
 Library     OperatingSystem
 Library    JSONLibrary
diff --git a/SOL003/VNFLifecycleManagement-API/HealVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/HealVNFWorkflow.robot
index e7f4775aa..89091e1fc 100644
--- a/SOL003/VNFLifecycleManagement-API/HealVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/HealVNFWorkflow.robot
@@ -1,7 +1,5 @@
 *** Settings ***
-Resource    environment/configuration.txt
 Resource    environment/variables.txt
-Resource    environment/scaleVariables.txt
 Resource    VnfLcmMntOperationKeywords.robot
 Resource    SubscriptionKeywords.robot
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}       ssl_verify=false 
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot b/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot
index 051cb878a..67978fc04 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot
@@ -1,6 +1,5 @@
 *** Settings ***
-Resource    environment/configuration.txt
-Resource    environment/variables.txt 
+Resource    environment/variables.txt
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}        ssl_verify=false
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index 8dd6e9662..9d7cdba70 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
@@ -1,7 +1,5 @@
 *** Settings ***
-Resource    environment/configuration.txt
-# Suite setup     Expect spec    SOL003-VNFLifecycleManagement-API.yaml
-Resource    environment/variables.txt 
+Resource    environment/variables.txt
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}      ssl_verify=false
 Resource    VnfLcmMntOperationKeywords.robot
 Library    OperatingSystem
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot b/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
index 2a61f566c..4a4be4b8f 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
@@ -1,6 +1,5 @@
 *** Settings ***
-Resource    environment/configuration.txt
-Resource    environment/variables.txt 
+Resource    environment/variables.txt
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}        ssl_verify=false
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
diff --git a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
index 843138eca..9c9d3eedb 100644
--- a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
@@ -1,6 +1,5 @@
 *** Settings ***
-Resource    environment/configuration.txt
-Resource    environment/variables.txt 
+Resource    environment/variables.txt
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
 Library    DependencyLibrary
 Library    OperatingSystem
diff --git a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot
index 3945ebd84..3a0aa1c13 100644
--- a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot
@@ -1,7 +1,6 @@
 *** Setting ***
 Suite Setup       Initialize System
 Suite Teardown    Terminate All Processes    kill=true
-Resource    environment/configuration.txt
 Resource    environment/variables.txt
 Resource    VnfLcmMntOperationKeywords.robot
 Resource    SubscriptionKeywords.robot
diff --git a/SOL003/VNFLifecycleManagement-API/ModifyVNFInformationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ModifyVNFInformationWorkflow.robot
index a38a7f520..d105e6032 100644
--- a/SOL003/VNFLifecycleManagement-API/ModifyVNFInformationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ModifyVNFInformationWorkflow.robot
@@ -1,7 +1,5 @@
 *** Settings ***
-Resource    environment/configuration.txt
 Resource    environment/variables.txt
-Resource    environment/scaleVariables.txt
 Resource    VnfLcmMntOperationKeywords.robot
 Resource    SubscriptionKeywords.robot
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}        ssl_verify=false
diff --git a/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
index e585852b2..aa9b32b80 100644
--- a/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
@@ -1,6 +1,5 @@
 *** Settings ***
-Resource    environment/configuration.txt
-Resource    environment/variables.txt 
+Resource    environment/variables.txt
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
 Library     OperatingSystem
 Library    JSONLibrary
diff --git a/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot
index 422748ad2..ccd2069ce 100644
--- a/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot
@@ -1,7 +1,5 @@
 *** Settings ***
-Resource    environment/configuration.txt
 Resource    environment/variables.txt
-Resource    environment/scaleVariables.txt
 Resource    VnfLcmMntOperationKeywords.robot
 Resource    SubscriptionKeywords.robot
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}        ssl_verify=false
diff --git a/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot b/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
index c937f06ec..6b629e78f 100644
--- a/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
@@ -1,5 +1,4 @@
 *** Settings ***
-Resource    environment/configuration.txt
 Resource    environment/variables.txt 
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
 Library    DependencyLibrary
diff --git a/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
index dc216358e..264e6bd32 100644
--- a/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
@@ -1,7 +1,5 @@
 *** Settings ***
-Resource    environment/configuration.txt
 Resource    environment/variables.txt
-Resource    environment/scaleVariables.txt
 Resource    VnfLcmMntOperationKeywords.robot
 Resource    SubscriptionKeywords.robot
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}        ssl_verify=false
diff --git a/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
index 1c3d4b935..b9f0ad26f 100644
--- a/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
@@ -1,7 +1,5 @@
 *** Settings ***
-Resource    environment/configuration.txt
 Resource    environment/variables.txt
-Resource    environment/scaleVariables.txt
 Resource    VnfLcmMntOperationKeywords.robot
 Resource    SubscriptionKeywords.robot
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
diff --git a/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot b/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
index b68a10519..59321c145 100644
--- a/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
@@ -1,6 +1,5 @@
 *** Settings ***
-Resource    environment/configuration.txt
-Resource    environment/variables.txt 
+Resource    environment/variables.txt
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
 Library    DependencyLibrary
 Library    JSONLibrary
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
index 815b95445..fe9baf3a5 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
@@ -1,6 +1,5 @@
 *** Settings ***
-Resource    environment/configuration.txt
-Resource    environment/variables.txt 
+Resource    environment/variables.txt
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
 Library    OperatingSystem
 Library    JSONLibrary
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
index a746bbaa9..fb0f479b2 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
@@ -1,6 +1,5 @@
 *** Settings ***
-Resource    environment/configuration.txt
-Resource    environment/variables.txt 
+Resource    environment/variables.txt
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
 Library    OperatingSystem
 Library    JSONLibrary
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot
index d4e8ac9b6..0fafb57ce 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot
@@ -1,7 +1,5 @@
 *** Settings ***
-Resource    environment/configuration.txt
 Resource    environment/variables.txt
-Resource    environment/scaleVariables.txt
 Resource    VnfLcmMntOperationKeywords.robot
 Resource    SubscriptionKeywords.robot
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFWorkflow.robot
index 30d813c84..849fcfe84 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFWorkflow.robot
@@ -1,7 +1,5 @@
 *** Settings ***
-Resource    environment/configuration.txt
 Resource    environment/variables.txt
-Resource    environment/scaleVariables.txt
 Resource    VnfLcmMntOperationKeywords.robot
 Resource    SubscriptionKeywords.robot
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}      ssl_verify=false  
diff --git a/SOL003/VNFLifecycleManagement-API/Subscriptions.robot b/SOL003/VNFLifecycleManagement-API/Subscriptions.robot
index 043af19b9..bd8f8c780 100644
--- a/SOL003/VNFLifecycleManagement-API/Subscriptions.robot
+++ b/SOL003/VNFLifecycleManagement-API/Subscriptions.robot
@@ -1,6 +1,5 @@
 *** Settings ***
-Resource    environment/configuration.txt
-Resource    environment/variables.txt     
+Resource    environment/variables.txt    
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
 Library    OperatingSystem
 Library    JSONLibrary
diff --git a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
index 8246953b2..19f63180b 100644
--- a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
@@ -1,6 +1,5 @@
 *** Settings ***
-Resource    environment/configuration.txt
-Resource    environment/variables.txt 
+Resource    environment/variables.txt
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
 Resource    VnfLcmMntOperationKeywords.robot
 Library    OperatingSystem
diff --git a/SOL003/VNFLifecycleManagement-API/TerminateVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/TerminateVNFWorkflow.robot
index 8b93074e7..af73db5e8 100644
--- a/SOL003/VNFLifecycleManagement-API/TerminateVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/TerminateVNFWorkflow.robot
@@ -1,7 +1,5 @@
 *** Settings ***
-Resource    environment/configuration.txt
 Resource    environment/variables.txt
-Resource    environment/scaleVariables.txt
 Resource    VnfLcmMntOperationKeywords.robot
 Resource    SubscriptionKeywords.robot
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}        ssl_verify=false
diff --git a/SOL003/VNFLifecycleManagement-API/VNFInstances.robot b/SOL003/VNFLifecycleManagement-API/VNFInstances.robot
index 6ce3b5eb4..1f6e720d6 100644
--- a/SOL003/VNFLifecycleManagement-API/VNFInstances.robot
+++ b/SOL003/VNFLifecycleManagement-API/VNFInstances.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 # Suite setup     Expect spec    SOL003-VNFLifecycleManagement-API.yaml
-Resource    environment/configuration.txt
-Resource    environment/variables.txt 
+Resource    environment/variables.txt
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 Resource    VnfLcmMntOperationKeywords.robot
 Library    OperatingSystem
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
index 225d814bb..62c450e5a 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
@@ -1,6 +1,5 @@
 *** Settings ***
-Resource    environment/configuration.txt
-Resource    environment/variables.txt 
+Resource    environment/variables.txt
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
diff --git a/SOL003/VNFLifecycleManagement-API/environment/configuration.txt b/SOL003/VNFLifecycleManagement-API/environment/configuration.txt
deleted file mode 100644
index 91cc810be..000000000
--- a/SOL003/VNFLifecycleManagement-API/environment/configuration.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-*** Variables ***
-${VNFM_HOST}      localhost    # Hostname of the VNFM
-${VNFM_PORT}      8080    # Listening port of the VNFM
-${VNFM_SCHEMA}    https
-${ACCEPT}         application/json
-${ACCEPT_JSON}         application/json
-${CONTENT_TYPE}    application/json
-${AUTHORIZATION}    Bearer    QWxhZGRpbjpvcGVuIHNlc2FtZQ==
-${AUTH_USAGE}     1
-${CONTENT_TYPE_PATCH}    application/merge-patch+json
-
-${apiRoot}        /
-${apiName}        vnflcm
-${apiMajorVersion}     v1
-
-${CancelMode}    GRACEFUL
-${VNFM_DUPLICATION}    0
-
-
-
-
-
-${NFVO_HOST}      localhost    # Hostname of the NFVO
-${NFVO_PORT}      8081    # Listening port of the NFVO
-${NFVO_SCHEMA}    https
-${WRONG_AUTHORIZATION}    Bearer    XXXXXWRONGXXXXX
-${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
-${vnfLcmOpOccId}    6fc3539c-e602-4afa-8e13-962fb5a7d81d
-${SYNC_MODE}    0
-${sleep_interval}    20s
-${callback_uri}    http://localhost
-${callback_port}    9091
-${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/environment/scaleVariables.txt b/SOL003/VNFLifecycleManagement-API/environment/scaleVariables.txt
deleted file mode 100644
index d8e260b92..000000000
--- a/SOL003/VNFLifecycleManagement-API/environment/scaleVariables.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-*** variables ***
-${LccnSubscriptions}    
-${scaleInfo}
-${element}
-${aspectId}
-${scaleOutResponse}
diff --git a/SOL003/VNFLifecycleManagement-API/environment/variables.txt b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
index 2697018f6..446b1f496 100644
--- a/SOL003/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
@@ -1,4 +1,38 @@
 *** Variables ***
+${VNFM_HOST}      localhost    # Hostname of the VNFM
+${VNFM_PORT}      8080    # Listening port of the VNFM
+${VNFM_SCHEMA}    https
+${ACCEPT}         application/json
+${ACCEPT_JSON}         application/json
+${CONTENT_TYPE}    application/json
+${AUTHORIZATION}    Bearer    QWxhZGRpbjpvcGVuIHNlc2FtZQ==
+${AUTH_USAGE}     1
+${CONTENT_TYPE_PATCH}    application/merge-patch+json
+
+${apiRoot}        /
+${apiName}        vnflcm
+${apiMajorVersion}     v1
+
+${CancelMode}    GRACEFUL
+${VNFM_DUPLICATION}    0
+
+
+
+
+
+${NFVO_HOST}      localhost    # Hostname of the NFVO
+${NFVO_PORT}      8081    # Listening port of the NFVO
+${NFVO_SCHEMA}    https
+${WRONG_AUTHORIZATION}    Bearer    XXXXXWRONGXXXXX
+${SINGLE_FILE_VNFD}    1    # If VNFD is PLAIN TEXT
+${ACCEPT_PLAIN}    text/plain
+${ACCEPT_ZIP}     application/zip
+${ARTIFACT_TYPE}    application/octet-stream
+${ARTIFACT_ID}    artifactId
+${WRONG_ACCEPT}    application/json
+${SYNC_MODE}    0
+
+
 ${vnfInstanceId}       6fc3539c-e602-4afa-8e13-962fb5a7d81f
 ${subscriptionId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
 ${vnfLcmOpOccId}    6fc3539c-e602-4afa-8e13-962fb5a7d81d
@@ -58,4 +92,12 @@ ${healingCause}    a new cause
 ${changeStateTo}    STOPPED
 ${stopType}    FORCEFUL
 
-${terminationType}    GRACEFUL
\ No newline at end of file
+${terminationType}    GRACEFUL
+
+
+${LccnSubscriptions}    
+${scaleInfo}
+${element}
+${aspectId}
+${scaleOutResponse}
+
-- 
GitLab


From 7af7b21b8203f18f721ba3e22b7b3627d06965a2 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Wed, 21 Oct 2020 12:21:58 +0200
Subject: [PATCH 111/322] fix

---
 .../VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot | 2 --
 1 file changed, 2 deletions(-)

diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index ba6f5f4c7..f01d3b2d9 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -1,8 +1,6 @@
 *** Settings ***
 Library    String
-Resource    environment/configuration.txt
 Resource    environment/variables.txt
-Resource    environment/scaleVariables.txt
 Library    MockServerLibrary
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 Library    OperatingSystem
-- 
GitLab


From 651981b76d085cba69c86b880754c660b71dc2af Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Wed, 21 Oct 2020 12:48:05 +0200
Subject: [PATCH 112/322] fix for issue #121 in SOL003-VNFPckMgmt-API

---
 .../IndividualSubscription.robot              |  1 -
 .../IndividualVNFPackage.robot                |  1 -
 .../IndividualVNFPackageArtifacts.robot       |  1 -
 .../Subscriptions.robot                       |  1 -
 .../VNFDInIndividualVNFPackage.robot          |  1 -
 .../VNFPackageContent.robot                   |  1 -
 .../VNFPackageManagementKeywords.robot        |  7 ---
 .../VNFPackages.robot                         |  1 -
 .../environment/individualSubscription.txt    |  6 ---
 .../environment/individualVnfPackage.txt      |  3 --
 .../environment/subscriptions.txt             |  7 ---
 .../environment/variables.txt                 | 48 ++++++++++++++++++-
 .../environment/vnfPackageArtifacts.txt       | 10 ----
 .../environment/vnfPackageContent.txt         |  8 ----
 .../environment/vnfPackages.txt               |  7 ---
 .../vnfdInIndividualVnfPackage.txt            |  9 ----
 16 files changed, 46 insertions(+), 66 deletions(-)
 delete mode 100644 SOL003/VNFPackageManagement-API/environment/individualSubscription.txt
 delete mode 100644 SOL003/VNFPackageManagement-API/environment/individualVnfPackage.txt
 delete mode 100644 SOL003/VNFPackageManagement-API/environment/subscriptions.txt
 delete mode 100644 SOL003/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt
 delete mode 100644 SOL003/VNFPackageManagement-API/environment/vnfPackageContent.txt
 delete mode 100644 SOL003/VNFPackageManagement-API/environment/vnfPackages.txt
 delete mode 100644 SOL003/VNFPackageManagement-API/environment/vnfdInIndividualVnfPackage.txt

diff --git a/SOL003/VNFPackageManagement-API/IndividualSubscription.robot b/SOL003/VNFPackageManagement-API/IndividualSubscription.robot
index 495e972ec..346b954dc 100644
--- a/SOL003/VNFPackageManagement-API/IndividualSubscription.robot
+++ b/SOL003/VNFPackageManagement-API/IndividualSubscription.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/individualSubscription.txt
 Resource          VNFPackageManagementKeywords.robot
 Library           OperatingSystem
 Library           JSONLibrary
diff --git a/SOL003/VNFPackageManagement-API/IndividualVNFPackage.robot b/SOL003/VNFPackageManagement-API/IndividualVNFPackage.robot
index a5409db81..6732e9cb8 100644
--- a/SOL003/VNFPackageManagement-API/IndividualVNFPackage.robot
+++ b/SOL003/VNFPackageManagement-API/IndividualVNFPackage.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/individualVnfPackage.txt
 Resource          VNFPackageManagementKeywords.robot  
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
diff --git a/SOL003/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot b/SOL003/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot
index ae798271a..cab10266e 100644
--- a/SOL003/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot
+++ b/SOL003/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/vnfPackageArtifacts.txt
 Resource          VNFPackageManagementKeywords.robot 
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
diff --git a/SOL003/VNFPackageManagement-API/Subscriptions.robot b/SOL003/VNFPackageManagement-API/Subscriptions.robot
index 174ab56d4..534beaa72 100644
--- a/SOL003/VNFPackageManagement-API/Subscriptions.robot
+++ b/SOL003/VNFPackageManagement-API/Subscriptions.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/subscriptions.txt
 Resource          VNFPackageManagementKeywords.robot
 Library           OperatingSystem
 Library           JSONLibrary
diff --git a/SOL003/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot b/SOL003/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
index dce75ae61..ecac9cb58 100644
--- a/SOL003/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
+++ b/SOL003/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/vnfdInIndividualVnfPackage.txt
 Resource          VNFPackageManagementKeywords.robot 
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageContent.robot b/SOL003/VNFPackageManagement-API/VNFPackageContent.robot
index 8a9d9c332..dc8a2c3b7 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageContent.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageContent.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/vnfPackageContent.txt
 Resource          VNFPackageManagementKeywords.robot  
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 1cbc4b7a7..dc0f8ccf4 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -1,12 +1,5 @@
 *** Settings ***
 Resource    environment/variables.txt
-Resource    environment/subscriptions.txt
-Resource    environment/individualSubscription.txt
-Resource    environment/vnfPackages.txt
-Resource    environment/individualVnfPackage.txt
-Resource    environment/vnfPackageContent.txt
-Resource    environment/vnfPackageArtifacts.txt
-Resource    environment/vnfdInIndividualVnfPackage.txt
 Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
 Library    MockServerLibrary 
 Library    OperatingSystem
diff --git a/SOL003/VNFPackageManagement-API/VNFPackages.robot b/SOL003/VNFPackageManagement-API/VNFPackages.robot
index 982c0eef9..77773430d 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackages.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackages.robot
@@ -1,5 +1,4 @@
 *** Settings ***
-Resource          environment/vnfPackages.txt    # VNF Packages specific parameters
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
 Resource          VNFPackageManagementKeywords.robot    
diff --git a/SOL003/VNFPackageManagement-API/environment/individualSubscription.txt b/SOL003/VNFPackageManagement-API/environment/individualSubscription.txt
deleted file mode 100644
index caf1c582e..000000000
--- a/SOL003/VNFPackageManagement-API/environment/individualSubscription.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-*** Variables ***
-${subscriptionId}    f3ae6df7-07e1-47c9-8924-9ebe10343586
-${erroneousSubscriptionId}    442e3ee5-0499-4849-9b31-eb91ce1638f1    # Not existing ID on the subscriptions
-${newSubscriptionId}    newSubsciptionId
-${response}    httpresponse
-${origResponse}    httpresponse
diff --git a/SOL003/VNFPackageManagement-API/environment/individualVnfPackage.txt b/SOL003/VNFPackageManagement-API/environment/individualVnfPackage.txt
deleted file mode 100644
index 43f793bdd..000000000
--- a/SOL003/VNFPackageManagement-API/environment/individualVnfPackage.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-*** Variables ***
-${erroneousVnfPackageId}    erroneousVnfPackageId    # Given ID for vnfPkg not present in database
-${erroneousVnfdId}    erroneousVnfdId 
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/environment/subscriptions.txt b/SOL003/VNFPackageManagement-API/environment/subscriptions.txt
deleted file mode 100644
index ca34ee831..000000000
--- a/SOL003/VNFPackageManagement-API/environment/subscriptions.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-*** Variables ***
-${filter_ok}      callbackUri=http://172.22.1.7:9091/vnfpkgm/subscriptions
-${filter_ko}      nfvId=f9f130e4-05eb-4082-a676-4c97d13a883d    # Not existant filter attribute-based
-${callbackUri}    http://172.22.1.7:9091/vnfpkgm/subscriptions
-${total_polling_time}   2 min
-${polling_interval}     10 sec
-${SEPERATOR}      =
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/environment/variables.txt b/SOL003/VNFPackageManagement-API/environment/variables.txt
index 2639b8457..659a3e8e3 100644
--- a/SOL003/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL003/VNFPackageManagement-API/environment/variables.txt
@@ -22,7 +22,7 @@ ${NFVO_CHECKS_NOTIF_ENDPOINT}    1        ## If true, during subscription, the F
 
 ${NFVO_ALLOWS_DUPLICATE_SUBS}    1
 
-${response}
+${response}    httpresponse
 
 ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
 
@@ -40,4 +40,48 @@ ${notification_request}    []
 ${notification_response}    []
 
 ${NFVO_non-MANO_OK}    1    # If 1 means that non-MANO artifacts are supported by the NFVO
-${non_mano_artifact_sets}    
\ No newline at end of file
+${non_mano_artifact_sets}    
+
+
+${subscriptionId}    f3ae6df7-07e1-47c9-8924-9ebe10343586
+${erroneousSubscriptionId}    442e3ee5-0499-4849-9b31-eb91ce1638f1    # Not existing ID on the subscriptions
+${newSubscriptionId}    newSubsciptionId
+
+${origResponse}    httpresponse
+
+
+${erroneousVnfPackageId}    erroneousVnfPackageId    # Given ID for vnfPkg not present in database
+${erroneousVnfdId}    erroneousVnfdId 
+
+
+${filter_ok}      callbackUri=http://172.22.1.7:9091/vnfpkgm/subscriptions
+${filter_ko}      nfvId=f9f130e4-05eb-4082-a676-4c97d13a883d    # Not existant filter attribute-based
+${SEPERATOR}      =
+
+
+${ACCEPT_PLAIN}    text/plain
+${CONTENT_TYPE_PLAIN}    text/plain
+${vnfPkgPlainVNFD}    c26ad7fb-072b-48c4-a663-7d71646d9e98    # The VNF Pakcage contains a VNFD which is a Single Plain File
+${ACCEPT_ZIP}     application/zip
+${CONTENT_TYPE_ZIP}    application/zip
+${vnfPkgZipVNFD}    f5b220d4-6177-4ebb-a554-a43311e16075    # The VNF Package contains a VNFD composed by multiple files
+${erroneousVnfPkgId}    erroneousVnfPackageId    # Given ID for vnfPkg not present in database
+${vndIdZipVnfd}       f5b220d4-6177-4ebb-a554-a43311e16075 
+
+
+${artifactPath}    artifactPath
+${CONTENT_TYPE_OCTET}    application/octet-stream
+${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
+${range}          bytes=0-1023
+${erroneousRange}    bytes=10000000-1000000000    # Requesting a out of range number of bytes
+${vnfPackageOctetStreamId}    octetStreamPkgId
+${vnfdOctetStreamId}    octetStreamVnfdId
+${vndEncryptedArtifactID}    encryptedId
+
+
+${length}          1024
+
+${POS_FILTER}     vnfdId=41fdd38a-3d4c-465c-83e0-f80e014425f8 ,vnfProvider=NXW    # Positive case, suing compiant fields name for filtering get request
+${NEG_FILTER}     nfvId=41fdd38a-3d4c-465c-83e0-f80e014425f8    # Negative case, using wrong name of field
+${fields}         softwareImages,additionalArtifacts
+${VAR_SEPERATOR}    &
diff --git a/SOL003/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt b/SOL003/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt
deleted file mode 100644
index 9560a81a2..000000000
--- a/SOL003/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-*** Variables ***
-${artifactPath}    artifactPath
-${CONTENT_TYPE_OCTET}    application/octet-stream
-${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
-${range}          bytes=0-1023
-${erroneousRange}    bytes=10000000-1000000000    # Requesting a out of range number of bytes
-${erroneousVnfPkgId}    erroneousPkgId
-${vnfPackageOctetStreamId}    octetStreamPkgId
-${vnfdOctetStreamId}    octetStreamVnfdId
-${vndEncryptedArtifactID}    encryptedId
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/environment/vnfPackageContent.txt b/SOL003/VNFPackageManagement-API/environment/vnfPackageContent.txt
deleted file mode 100644
index a79a251ee..000000000
--- a/SOL003/VNFPackageManagement-API/environment/vnfPackageContent.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-*** Variables ***
-${ACCEPT_ZIP}     application/zip
-${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
-${range}          bytes=0-1023
-${length}          1024
-${erroneousRange}    bytes=10000000-1000000000    # Requesting a out of range number of bytes
-${erroneousVnfPkgId}    erroneousPkgId
-${CONTENT_TYPE_ZIP}    application/zip
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/environment/vnfPackages.txt b/SOL003/VNFPackageManagement-API/environment/vnfPackages.txt
deleted file mode 100644
index ff87485e0..000000000
--- a/SOL003/VNFPackageManagement-API/environment/vnfPackages.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-*** Variables ***
-${POS_FILTER}     vnfdId=41fdd38a-3d4c-465c-83e0-f80e014425f8 ,vnfProvider=NXW    # Positive case, suing compiant fields name for filtering get request
-${NEG_FILTER}     nfvId=41fdd38a-3d4c-465c-83e0-f80e014425f8    # Negative case, using wrong name of field
-${fields}         softwareImages,additionalArtifacts
-${response}       httpresponse   
-${SEPERATOR}      =
-${VAR_SEPERATOR}    &
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/environment/vnfdInIndividualVnfPackage.txt b/SOL003/VNFPackageManagement-API/environment/vnfdInIndividualVnfPackage.txt
deleted file mode 100644
index b1100153b..000000000
--- a/SOL003/VNFPackageManagement-API/environment/vnfdInIndividualVnfPackage.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-*** Variables ***
-${ACCEPT_PLAIN}    text/plain
-${CONTENT_TYPE_PLAIN}    text/plain
-${vnfPkgPlainVNFD}    c26ad7fb-072b-48c4-a663-7d71646d9e98    # The VNF Pakcage contains a VNFD which is a Single Plain File
-${ACCEPT_ZIP}     application/zip
-${CONTENT_TYPE_ZIP}    application/zip
-${vnfPkgZipVNFD}    f5b220d4-6177-4ebb-a554-a43311e16075    # The VNF Package contains a VNFD composed by multiple files
-${erroneousVnfPkgId}    erroneousVnfPackageId    # Given ID for vnfPkg not present in database
-${vndIdZipVnfd}       f5b220d4-6177-4ebb-a554-a43311e16075 
-- 
GitLab


From 74037e12d468a515b404b27f8e753ee8de1453bd Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Wed, 21 Oct 2020 13:09:26 +0200
Subject: [PATCH 113/322] fix for issue #121 in SOL003-VNFPM-API

---
 .../IndividualPmJob.robot                     |  1 -
 .../IndividualReport.robot                    |  1 -
 .../IndividualThreshold.robot                 |  1 -
 .../VNFPerformanceManagement-API/PMJobs.robot |  1 -
 .../PerformanceManagementNotification.robot   |  1 -
 .../Thresholds.robot                          |  1 -
 .../environment/IndividualPmJob.txt           |  6 ----
 .../environment/individualThresholds.txt      |  6 ----
 .../environment/notifications.txt             | 12 -------
 .../environment/pmJobs.txt                    |  8 -----
 .../environment/reports.txt                   |  7 ----
 .../environment/thresholds.txt                |  6 ----
 .../environment/variables.txt                 | 35 +++++++++++++++++--
 13 files changed, 33 insertions(+), 53 deletions(-)
 delete mode 100644 SOL003/VNFPerformanceManagement-API/environment/IndividualPmJob.txt
 delete mode 100644 SOL003/VNFPerformanceManagement-API/environment/individualThresholds.txt
 delete mode 100644 SOL003/VNFPerformanceManagement-API/environment/notifications.txt
 delete mode 100644 SOL003/VNFPerformanceManagement-API/environment/pmJobs.txt
 delete mode 100644 SOL003/VNFPerformanceManagement-API/environment/reports.txt
 delete mode 100644 SOL003/VNFPerformanceManagement-API/environment/thresholds.txt

diff --git a/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
index f93eae424..d8324e537 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
@@ -3,7 +3,6 @@ Library           OperatingSystem
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
 Library           JSONLibrary
-Resource          environment/IndividualPmJob.txt
 Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 
 *** Test Cases ***
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualReport.robot b/SOL003/VNFPerformanceManagement-API/IndividualReport.robot
index 4a4837916..62be3b6fc 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualReport.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualReport.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/reports.txt
 Library           JSONLibrary
 Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
index a1372c72d..b34edb3a9 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -4,7 +4,6 @@ Resource          environment/variables.txt    # Generic Parameters
 Library           JSONLibrary
 Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 Library           OperatingSystem
-Resource          environment/individualThresholds.txt
 
 *** Test Cases ***
 GET Individual Threshold
diff --git a/SOL003/VNFPerformanceManagement-API/PMJobs.robot b/SOL003/VNFPerformanceManagement-API/PMJobs.robot
index 978e21542..5ef0d5a24 100644
--- a/SOL003/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL003/VNFPerformanceManagement-API/PMJobs.robot
@@ -4,7 +4,6 @@ Resource          environment/variables.txt    # Generic Parameters
 Library           JSONLibrary
 Library           OperatingSystem
 Library           String
-Resource          environment/pmJobs.txt
 Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 Library           MockServerLibrary
 
diff --git a/SOL003/VNFPerformanceManagement-API/PerformanceManagementNotification.robot b/SOL003/VNFPerformanceManagement-API/PerformanceManagementNotification.robot
index a2e02a858..fc6f7035b 100644
--- a/SOL003/VNFPerformanceManagement-API/PerformanceManagementNotification.robot
+++ b/SOL003/VNFPerformanceManagement-API/PerformanceManagementNotification.robot
@@ -1,5 +1,4 @@
 *** Setting ***
-Resource	environment/notifications.txt
 Resource	environment/variables.txt
 Suite Setup    Create Sessions
 Suite Teardown    Terminate All Processes    kill=true
diff --git a/SOL003/VNFPerformanceManagement-API/Thresholds.robot b/SOL003/VNFPerformanceManagement-API/Thresholds.robot
index 945547029..d60f477cb 100644
--- a/SOL003/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL003/VNFPerformanceManagement-API/Thresholds.robot
@@ -4,7 +4,6 @@ Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
 Library           JSONLibrary
 Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
-Resource          environment/thresholds.txt
 Library           OperatingSystem
 
 *** Test Cases ***
diff --git a/SOL003/VNFPerformanceManagement-API/environment/IndividualPmJob.txt b/SOL003/VNFPerformanceManagement-API/environment/IndividualPmJob.txt
deleted file mode 100644
index b3616b30f..000000000
--- a/SOL003/VNFPerformanceManagement-API/environment/IndividualPmJob.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-*** Variables ***
-${pmJobId}        29f4ff6a-be91-4ec8-856e-fcf1e2479e4e
-${erroneousPmJobId}    erroneousPmJobId
-${newPmJobId}    newPmJobId
-${response}=    httpresponse
-${OrigResponse}=    httpresponse
\ No newline at end of file
diff --git a/SOL003/VNFPerformanceManagement-API/environment/individualThresholds.txt b/SOL003/VNFPerformanceManagement-API/environment/individualThresholds.txt
deleted file mode 100644
index 1efba79c6..000000000
--- a/SOL003/VNFPerformanceManagement-API/environment/individualThresholds.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-*** Variables ***
-${thresholdId}    1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
-${erroneousThresholdId}    erroneousThresholdId
-${newThresholdId}    newThresholdId
-${response}=    httpresponse
-${origResponse}=    httpresponse
\ No newline at end of file
diff --git a/SOL003/VNFPerformanceManagement-API/environment/notifications.txt b/SOL003/VNFPerformanceManagement-API/environment/notifications.txt
deleted file mode 100644
index cd1193ae5..000000000
--- a/SOL003/VNFPerformanceManagement-API/environment/notifications.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-*** Variables ***
-${callback_uri}    http://localhost
-${callback_port}    9091
-${callback_endpoint}    /endpoint
-${callback_endpoint_fwd}    /endpoint/check
-${callback_endpoint_error}    /endpoint_404
-${sleep_interval}    20s
-${total_polling_time}   2 min
-${polling_interval}     10 sec
-
-${notification_request}    []
-${notification_response}    []
\ No newline at end of file
diff --git a/SOL003/VNFPerformanceManagement-API/environment/pmJobs.txt b/SOL003/VNFPerformanceManagement-API/environment/pmJobs.txt
deleted file mode 100644
index bccab232a..000000000
--- a/SOL003/VNFPerformanceManagement-API/environment/pmJobs.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-*** Settings ***
-Resource          variables.txt
-*** Variables ***
-${POS_FILTER}     objectInstanceIds=${objectInstanceIds}
-${NEG_FILTER}     criteriaPmJob=erroneousAttributeName
-${fields}         criteria,objectInstanceIds
-${response}       httpresponse         
-${SEPERATOR}      =
\ No newline at end of file
diff --git a/SOL003/VNFPerformanceManagement-API/environment/reports.txt b/SOL003/VNFPerformanceManagement-API/environment/reports.txt
deleted file mode 100644
index 6ac5f7c0b..000000000
--- a/SOL003/VNFPerformanceManagement-API/environment/reports.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-*** Variables ***
-${pmJobId}        1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
-${reportId}       0fb4c875-e07f-46ca-a9dd-13907667a568
-${erroneousReportId}    erroneousReportId
-${newReportId}    newReportId
-${response}=    httpresponse
-${OrigResponse}=    httpresponse
diff --git a/SOL003/VNFPerformanceManagement-API/environment/thresholds.txt b/SOL003/VNFPerformanceManagement-API/environment/thresholds.txt
deleted file mode 100644
index 18b3f32f4..000000000
--- a/SOL003/VNFPerformanceManagement-API/environment/thresholds.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-*** Settings ***
-Resource          variables.txt
-*** Variables ***
-${FILTER_OK}      objectInstanceId=${objectInstanceIds}
-${FILTER_KO}      criterias=erroneousFilter
-${response}=    httpresponse
\ No newline at end of file
diff --git a/SOL003/VNFPerformanceManagement-API/environment/variables.txt b/SOL003/VNFPerformanceManagement-API/environment/variables.txt
index 348ad4738..6eaca448f 100644
--- a/SOL003/VNFPerformanceManagement-API/environment/variables.txt
+++ b/SOL003/VNFPerformanceManagement-API/environment/variables.txt
@@ -30,6 +30,37 @@ ${polling_interval}     10 sec
 
 ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
 
-${response}
+${objectInstanceIds}    1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
 
-${objectInstanceIds}    1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
\ No newline at end of file
+
+${pmJobId}        29f4ff6a-be91-4ec8-856e-fcf1e2479e4e
+${erroneousPmJobId}    erroneousPmJobId
+${newPmJobId}    newPmJobId
+${response}=    httpresponse
+${OrigResponse}=    httpresponse
+
+
+${thresholdId}    1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
+${erroneousThresholdId}    erroneousThresholdId
+${newThresholdId}    newThresholdId
+
+
+${callback_endpoint_fwd}    /endpoint/check
+
+
+${notification_request}    []
+${notification_response}    []
+
+
+${POS_FILTER}     objectInstanceIds=${objectInstanceIds}
+${NEG_FILTER}     criteriaPmJob=erroneousAttributeName
+${fields}         criteria,objectInstanceIds        
+${SEPERATOR}      =
+
+
+${reportId}       0fb4c875-e07f-46ca-a9dd-13907667a568
+${erroneousReportId}    erroneousReportId
+${newReportId}    newReportId
+
+${FILTER_OK}      objectInstanceId=${objectInstanceIds}
+${FILTER_KO}      criterias=erroneousFilter
\ No newline at end of file
-- 
GitLab


From 139875a3de52da3d18f1fce6821fe5c465a064b5 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Wed, 21 Oct 2020 14:21:45 +0200
Subject: [PATCH 114/322] updated index file

---
 indexes/sol_003_index.csv | 2 --
 1 file changed, 2 deletions(-)

diff --git a/indexes/sol_003_index.csv b/indexes/sol_003_index.csv
index 922ac9509..b862493eb 100644
--- a/indexes/sol_003_index.csv
+++ b/indexes/sol_003_index.csv
@@ -55,8 +55,6 @@
 7.3.4.3,Individual Performance Report Resource Endpoint, IndividualReport.robot
 7.3.4.4,Thresholds Resource Endpoint, Thresholds.robot
 7.3.4.5,Individual Threshold Resource Endpoint, IndividualThreshold.robot
-7.3.4.6,Subscriptions, Subscriptions.robot
-7.3.4.7,Individual Subscription Resource Endpoint, IndividualSubscription.robot
 7.3.4.8,Notification Endpoint,  PerformanceManagementNotification.robot 
 7.3.4.9,API Version Resource Endpoint, ApiVersion.robot
 7.3.5,VNF Fault Management interface, VNFFaultManagement-API
-- 
GitLab


From dbca055d53a69440c59d8516e24e5cc8fb0c7b60 Mon Sep 17 00:00:00 2001
From: Sana Zulfiqar <sana.zulfiqar@xflowresearch.com>
Date: Thu, 22 Oct 2020 12:46:14 +0200
Subject: [PATCH 115/322] Updated post-condition.robot

---
 SOL003/VNFFaultManagement-API/IndividualSubscription.robot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SOL003/VNFFaultManagement-API/IndividualSubscription.robot b/SOL003/VNFFaultManagement-API/IndividualSubscription.robot
index 6ff137758..f69237167 100644
--- a/SOL003/VNFFaultManagement-API/IndividualSubscription.robot
+++ b/SOL003/VNFFaultManagement-API/IndividualSubscription.robot
@@ -63,7 +63,7 @@ DELETE an individual subscription
     ...    Reference: Clause 7.4.5.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
-    ...    Post-Conditions:  subscription is not deleted
+    ...    Post-Conditions:  subscription is deleted
     DELETE Individual Subscription
     Check HTTP Response Status Code Is    204
     Check Individual Subscription deleted
-- 
GitLab


From 286e6fbb3d7d2ca62ba93cbc3a455495875e44ff Mon Sep 17 00:00:00 2001
From: Sana Zulfiqar <sana.zulfiqar@xflowresearch.com>
Date: Thu, 22 Oct 2020 12:51:53 +0200
Subject: [PATCH 116/322] minor fixes.robot

---
 SOL003/VNFFaultManagement-API/IndividualAlarm.robot | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/SOL003/VNFFaultManagement-API/IndividualAlarm.robot b/SOL003/VNFFaultManagement-API/IndividualAlarm.robot
index bb3b81d10..a958e5e31 100644
--- a/SOL003/VNFFaultManagement-API/IndividualAlarm.robot
+++ b/SOL003/VNFFaultManagement-API/IndividualAlarm.robot
@@ -1,5 +1,5 @@
 *** Settings ***
-# Suite setup     Expect spec    SOL003-VNFLifecycleManagement-API.yaml
+
 Resource    environment/variables.txt 
 Resource    FaultManagement-APIKeyword.robot
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
@@ -37,8 +37,8 @@ Get information about an fault management individual alarm
 PUT Alarm - Method not implemented
     [Documentation]    Test ID: 7.3.5.2.3
     ...    Test title: PUT Alarm - Method not implemented
-    ...    Test objective: he objective is to test that PUT method is not allowed to for Fault management individual alarm on VNF 
-    ...    Pre-conditions: The related alarm exists
+    ...    Test objective: The objective is to test that PUT method is not allowed to for Fault management individual alarm on VNF 
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
@@ -93,7 +93,7 @@ DELETE Alarm - Method not implemented
      [Documentation]    Test ID: 7.3.5.2.7
     ...    Test title: DELETE Alarm - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to for Fault management individual alarm on VNF 
-    ...    Pre-conditions: nona
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-- 
GitLab


From 9a6bea2abbb1429bf38e699c10217853973ef9c7 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 27 Oct 2020 11:51:16 +0500
Subject: [PATCH 117/322] added majorApiVersion

---
 SOL005/NSDManagement-API/ApiVersion.robot     |  10 +-
 .../NSDManagementKeywords.robot               | 252 +++++++++---------
 .../environment/variables.txt                 |   7 +-
 3 files changed, 133 insertions(+), 136 deletions(-)

diff --git a/SOL005/NSDManagement-API/ApiVersion.robot b/SOL005/NSDManagement-API/ApiVersion.robot
index ed10f38f5..40a46a3a5 100644
--- a/SOL005/NSDManagement-API/ApiVersion.robot
+++ b/SOL005/NSDManagement-API/ApiVersion.robot
@@ -169,35 +169,35 @@ DELETE API Version
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/v1/api_version
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/v1/api_version
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/v1/api_version
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/v1/api_version
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/v1/api_version
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index 245cac747..f179e961a 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -19,7 +19,7 @@ GET all Network Service Descriptors Information
     Log    The GET method queries multiple NS descriptors
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -27,7 +27,7 @@ GET Network Service Descriptors Information with attribute-based filter
     Log    The GET method queries multiple NS descriptors using Attribute-based filtering parameters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors?${NSD_NAME}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?${NSD_NAME}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -40,7 +40,7 @@ GET Network Service Descriptors Information with invalid attribute-based filter
     Log    The GET method queries multiple NS descriptors using Attribute-based filtering parameters. Negative case, with erroneous attribute name
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors?${NEG_FIELDS}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?${NEG_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -50,7 +50,7 @@ Get all Network Service Descriptors Information with malformed authorization tok
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Authorization": "${BAD_AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -59,7 +59,7 @@ Get all Network Service Descriptors Information without authorization token
     Log    The GET method queries omitting token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -69,7 +69,7 @@ Get all Network Service Descriptors Information with expired or revoked authoriz
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Authorization": "${NEG_AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -77,7 +77,7 @@ GET all Network Service Descriptors Information with all_fields attribute select
     Log    The GET method queries multiple NS descriptors using Attribute-based filtering parameters "all_fields"
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors?all_fields
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?all_fields
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -91,7 +91,7 @@ GET all Network Service Descriptors Information with exclude_default attribute s
     Log    Trying to get all NSDs present in the NFVO Catalogue, using exclude_default filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -106,7 +106,7 @@ GET all Network Service Descriptors Information with fields attribute selector
     Log    Trying to get all NSDs present in the NFVO Catalogue, using fields filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors?fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
 
@@ -121,7 +121,7 @@ GET all Network Service Descriptors Information with exclude_fields attribute se
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use exclude_fields option
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors?exclude_fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
 
@@ -137,7 +137,7 @@ Send Post Request to create new Network Service Descriptor Resource
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${body}=    Get File    jsons/createNsdInfoRequest.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors    ${body}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -145,7 +145,7 @@ Check Postcondition NsdInfo Exists
     Log    Checking that nsd info exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${response['body']['id']}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
@@ -156,7 +156,7 @@ Send PUT Request for all Network Service Descriptors
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -165,7 +165,7 @@ Send PATCH Request for all Network Service Descriptors
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -174,7 +174,7 @@ Send DELETE Request for all Network Service Descriptors
     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": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -186,7 +186,7 @@ GET Individual Network Service Descriptor Information
     Log    The GET method reads information about an individual NS descriptor
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -199,7 +199,7 @@ GET Individual Network Service Descriptor Information with invalid resource iden
     Log    Trying to perform a GET on an erroneous nsDescriptorInfoId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${erroneous_nsdInfoId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${erroneous_nsdInfoId}
     Integer    response status    404
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -212,7 +212,7 @@ Send PATCH to disable Individual Network Service Descriptor
     Set Headers    {"If-Match": "${original_etag}"}
     ${body}=    Get File    jsons/NsdInfoModificationDisable.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoId}    ${body}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -232,7 +232,7 @@ Send PATCH to enable Individual Network Service Descriptor
     Set Headers    {"If-Match": "${original_etag}"}
     ${body}=    Get File    jsons/NsdInfoModificationEnable.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoId}    ${body}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -243,7 +243,7 @@ Send PATCH to enable Individual Network Service Descriptor in onboarding state d
     Set Headers    {"If-Match": "${original_etag}"}
     ${body}=    Get File    jsons/NsdInfoModificationEnable.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${notOnboardedNsdInfoId}    ${body}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -254,7 +254,7 @@ Send PATCH to enable Individual Network Service Descriptor in onboarding state d
     Set Headers    {"If-Match": "${wrong_etag}"}
     ${body}=    Get File    jsons/NsdInfoModificationEnable.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoId}    ${body}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -262,21 +262,21 @@ Send DELETE Request for Individual Network Service Descriptor
     Log    Trying to perform a DELETE nsdInfo. The nsdInfo should be in "NOT_USED" usageState and in "DISABLED" operationalState.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${disabledNsdInfoId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${disabledNsdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Check Postcondition Network Service Descriptor is Deleted
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${disabledNsdInfoId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${disabledNsdInfoId}
     Integer    response status    404
 
 Send DELETE Request for Individual Network Service Descriptor in operational state ENABLED
     Log    Trying to perform a DELETE nsdInfo in ENABLED operational state
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -288,7 +288,7 @@ Send POST Request for Individual Network Service Descriptor
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -297,7 +297,7 @@ Send PUT Request for Individual Network Service Descriptor
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -325,7 +325,7 @@ Get NSD Content in Zip Format
     Log    Trying to get a NSD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -333,7 +333,7 @@ Get NSD Content with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${erroneous_nsdInfoId}/nsd_content
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${erroneous_nsdInfoId}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -341,7 +341,7 @@ Get NSD Content with conflict due to onboarding state
     Log    Trying to get a VNFD from a given NSD Management present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${notOnboardedNsdInfoId}/nsd_content
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -351,7 +351,7 @@ GET NSD Content with Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -361,7 +361,7 @@ GET NSD Content with invalid Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -370,7 +370,7 @@ Send PUT Request to upload NSD Content as zip file in asynchronous mode
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${body}=  Get File  ${contentZipFile}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content    ${body}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content    ${body}
     ${response}=    Output    response body
     Should Be Empty    ${response}
     ${output}=    Output    response
@@ -381,7 +381,7 @@ Send PUT Request to upload NSD Content as zip file in synchronous mode
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${body}=  Get File  ${contentZipFile}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content    ${body}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content    ${body}
     ${response}=    Output    response body
     Should Be Empty    ${response} 
     ${output}=    Output    response
@@ -408,7 +408,7 @@ Send PUT Request to upload NSD Content with conflict due to onboarding state
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${body}=  Get Binary File  ${contentZipFile}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${creatingNsdInfoId}/nsd_content    ${body}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${creatingNsdInfoId}/nsd_content    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -416,7 +416,7 @@ Send POST Request for NSD Content
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a POST. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -424,7 +424,7 @@ Send PATCH Request for NSD Content
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -432,7 +432,7 @@ Send DELETE Request for NSD Content
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -440,7 +440,7 @@ GET all PNF Descriptors Information
     Log    The GET method queries multiple PNF descriptors
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -448,7 +448,7 @@ GET PNF Descriptors Information with attribute-based filter
     Log    The GET method queries multiple PNF descriptors using Attribute-based filtering parameters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors?${PNFD_NAME}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?${PNFD_NAME}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -461,7 +461,7 @@ GET PNF Descriptors Information with invalid attribute-based filter
     Log    The GET method queries multiple PNF descriptors using Attribute-based filtering parameters. Negative case, with erroneous attribute name
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors?${NEG_FIELDS}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?${NEG_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -469,7 +469,7 @@ GET all PNF Descriptors Information with all_fields attribute selector
     Log    The GET method queries multiple PNF descriptors using Attribute-based filtering parameters "all_fields"
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors?all_fields
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?all_fields
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -483,7 +483,7 @@ GET all PNF Descriptors Information with exclude_default attribute selector
     Log    Trying to get all PNFDs present in the NFVO Catalogue, using exclude_default filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -498,7 +498,7 @@ GET all PNF Descriptors Information with fields attribute selector
     Log    Trying to get all PNFDs present in the NFVO Catalogue, using fields filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors?fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
 
@@ -513,7 +513,7 @@ GET all PNF Descriptors Information with exclude_fields attribute selector
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use exclude_fields option
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors?exclude_fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
 
@@ -529,7 +529,7 @@ Send Post Request to create new PNF Descriptor Resource
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${body}=    Get File    jsons/createPnfdInfoRequest.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors    ${body}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -537,7 +537,7 @@ Check Postcondition PnfdInfo Exists
     Log    Checking that nsd info exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${response['body']['id']}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
@@ -548,7 +548,7 @@ Send PUT Request for all PNF Descriptors
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -557,7 +557,7 @@ Send PATCH Request for all PNF Descriptors
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -566,7 +566,7 @@ Send DELETE Request for all PNF Descriptors
     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": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -578,7 +578,7 @@ GET Individual PNF Descriptor Information
     Log    The GET method reads information about an individual PNF descriptor
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -591,7 +591,7 @@ GET Individual PNF Descriptor Information with invalid resource identifier
     Log    Trying to perform a GET on an erroneous nsDescriptorInfoId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${erroneous_pnfdInfoId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${erroneous_pnfdInfoId}
     Integer    response status    404
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -603,7 +603,7 @@ Send PATCH to update Individual PNF Descriptor
     Set Headers    {"If-Match": "${original_etag}"}
     ${body}=    Get File    jsons/PnfdInfoModification.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoId}    ${body}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Set Suite Variable    ${body["userDefinedData"]}    ${userDefinedDataSet}
@@ -619,7 +619,7 @@ Send PATCH to update Individual PNF Descriptor with HTTP Etag precondition failu
     Set Headers    {"If-Match": "${wrong_etag}"}
     ${body}=    Get File    jsons/PnfdInfoModification.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoId}    ${body}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -627,14 +627,14 @@ Send DELETE Request for Individual PNF Descriptor
     Log    Trying to perform a DELETE pnfdInfo.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Check Postcondition PNF Descriptor is Deleted
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
     Integer    response status    404
 
 Send POST Request for Individual PNF Descriptor
@@ -642,7 +642,7 @@ Send POST Request for Individual PNF Descriptor
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -651,7 +651,7 @@ Send PUT Request for Individual PNF Descriptor
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -659,7 +659,7 @@ Get PNFD Content
     Log    Trying to get a NSD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -668,7 +668,7 @@ Get PNFD Content with Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -677,7 +677,7 @@ Get PNFD Content with invalid Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -685,7 +685,7 @@ Get PNFD Content with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${erroneous_pnfdInfoId}/pnfd_content
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${erroneous_pnfdInfoId}/pnfd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -693,7 +693,7 @@ Get PNFD Content with conflict due to onboarding state
     Log    Trying to get a PNFD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${onboardingStatePnfdId}/pnfd_content
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${onboardingStatePnfdId}/pnfd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -702,7 +702,7 @@ Send PUT Request to upload PNFD Content as zip file
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${body}=  Get File  ${contentFilePnfd}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content    ${body}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content    ${body}
     ${response}=    Output    response body
     Should Be Empty    ${response}
     ${output}=    Output    response
@@ -713,7 +713,7 @@ Send PUT Request to upload PNFD Content with conflict due to onboarding state
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${body}=  Get Binary File  ${contentFilePnfd}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${creatingNsdInfoId}/pnfd_content    ${body}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${creatingNsdInfoId}/pnfd_content    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -721,7 +721,7 @@ Send POST Request for PNFD Content
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a POST. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoId}/nsd_content
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -729,7 +729,7 @@ Send PATCH Request for PNFD Content
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoId}/nsd_content
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -737,7 +737,7 @@ Send DELETE Request for PNFD Content
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoId}/nsd_content
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -750,7 +750,7 @@ Get all NSD Management Subscriptions
     Log    Trying to get the list of subscriptions
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -758,7 +758,7 @@ Get NSD Management Subscriptions with attribute-based filters
     Log    Trying to get the list of subscriptions using filters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ok}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ok}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -767,7 +767,7 @@ Get NSD Management Subscriptions with invalid attribute-based filters
     Log    Trying to get the list of subscriptions using filters with wrong attribute name
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ko}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ko}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -776,7 +776,7 @@ Get NSD Management Subscriptions with invalid resource endpoint
     Log    Trying to perform a request on a Uri which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscription
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}    
 
@@ -789,7 +789,7 @@ Send Post Request for NSD Management Subscription
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${body}=    Get File    jsons/subscriptions.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1
@@ -802,7 +802,7 @@ Send Post Request for Duplicated NSD Management Subscription
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${body}=    Get File    jsons/subscriptions.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1
@@ -815,7 +815,7 @@ Send Put Request for NSD Management Subscriptions
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -825,7 +825,7 @@ Send Patch Request for NSD Management Subscriptions
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -834,7 +834,7 @@ Send Delete Request for NSD Management Subscriptions
     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": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -876,7 +876,7 @@ Check Postcondition NSD Management Subscription Is Set
     Log    Trying to get the subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${response['body']['id']}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
@@ -902,7 +902,7 @@ Get Individual NSD Management Subscription
     Log    Trying to get a single subscription identified by subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -910,7 +910,7 @@ GET individual NSD Management Subscription with invalid resource identifier
     Log    Trying to perform a request on a subscriptionID which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -918,7 +918,7 @@ Send Delete request for individual NSD Management Subscription
     Log    Trying to perform a DELETE on a subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -931,31 +931,31 @@ Send Delete request for individual NSD Management Subscription with invalid reso
     Log    Trying to perform a DELETE on a subscriptionId which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual NSD Management Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${newSubscriptionId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for individual NSD Management Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Send Patch request for individual NSD Management Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
    
@@ -971,7 +971,7 @@ Check Postcondition NSD Management Subscription is not Created
     Log    Trying to get a new subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${newSubscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    404
@@ -1011,7 +1011,7 @@ Check LINK in Header
 Check PostCondition GET Individual Network Service Descriptor Information
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
     Should Be Equal As Strings     ${response['status']}    200
     
 Wait for individual grant successful notification
@@ -1021,7 +1021,7 @@ Get single file NSD in Plain Format
     Log    Trying to get a NSD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1029,7 +1029,7 @@ Get NSD in Zip Format
     Log    Trying to get a NSD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1038,7 +1038,7 @@ Get single file NSD in Plain or Zip Format
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1047,7 +1047,7 @@ Get multi file NSD in Plain or Zip Format
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1055,7 +1055,7 @@ Get multi file NSD in Plain Format
     Log    Trying to get a negative case performing a get on a NSD present in the NFVO Catalogue. Accept will be text/plain but NSD is composed my multiple files.
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1064,7 +1064,7 @@ Get NSD with invalid resource identifier
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${erroneous_nsdInfoId}/nsd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${erroneous_nsdInfoId}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1073,7 +1073,7 @@ Get NSD with conflict due to onboarding state
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${notOnboardedNsdInfoId}/nsd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -1081,7 +1081,7 @@ Send POST Request for NSD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a POST. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1089,7 +1089,7 @@ Send PUT Request for NSD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1097,7 +1097,7 @@ Send PATCH Request for NSD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1105,7 +1105,7 @@ Send DELETE Request for NSD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -1113,14 +1113,14 @@ Get NSD with security information
     Log    Trying to get a NSD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd/include_signatures
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Get NSD Archive Manifest
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdPlain}/manifest
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdPlain}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1128,7 +1128,7 @@ Get NSD Archive Manifest with security information
     Log    Trying to get a NSD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/manifest/include_signatures
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1137,7 +1137,7 @@ Get NSD Archive Manifest with conflict due to onboarding state
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${notOnboardedNsdInfoId}/manifest
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1145,7 +1145,7 @@ Send POST Request for NSD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a POST. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1153,7 +1153,7 @@ Send PUT Request for NSD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1161,7 +1161,7 @@ Send PATCH Request for NSD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1169,7 +1169,7 @@ Send DELETE Request for NSD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -1177,7 +1177,7 @@ Get single file PNFD in Plain Format
     Log    Trying to get a PNFD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1185,7 +1185,7 @@ Get PNFD in Zip Format
     Log    Trying to get a PNFD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1194,7 +1194,7 @@ Get single file PNFD in Plain or Zip Format
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1203,7 +1203,7 @@ Get multi file PNFD in Plain or Zip Format
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1211,7 +1211,7 @@ Get multi file PNFD in Plain Format
     Log    Trying to get a negative case performing a get on a PNFD present in the NFVO Catalogue. Accept will be text/plain but PNFD is composed my multiple files.
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1220,7 +1220,7 @@ Get PNFD with invalid resource identifier
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${erroneous_PNFDInfoId}/pnfd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${erroneous_PNFDInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1229,7 +1229,7 @@ Get PNFD with conflict due to onboarding state
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${onboardingStatePnfdId}/pnfd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${onboardingStatePnfdId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -1237,7 +1237,7 @@ Get PNFD with security information
     Log    Trying to get a PNFD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/pnfd/include_signatures
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1245,7 +1245,7 @@ Send POST Request for PNFD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a POST. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1253,7 +1253,7 @@ Send PUT Request for PNFD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1261,7 +1261,7 @@ Send PATCH Request for PNFD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1269,14 +1269,14 @@ Send DELETE Request for PNFD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
 Get PNFD Archive Manifest
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/manifest
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1284,7 +1284,7 @@ Get PNFD Archive Manifest with security information
     Log    Trying to get a PNFD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/manifest/include_signatures
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1293,7 +1293,7 @@ Get PNFD Archive Manifest with conflict due to onboarding state
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${notOnboardedNsdInfoId}/manifest
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1301,7 +1301,7 @@ Send POST Request for PNFD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a POST. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/manifest
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1309,7 +1309,7 @@ Send PUT Request for PNFD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/manifest
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1317,7 +1317,7 @@ Send PATCH Request for PNFD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/manifest
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1325,6 +1325,6 @@ Send DELETE Request for PNFD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${pnfdInfoId}/manifest
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/environment/variables.txt b/SOL005/NSDManagement-API/environment/variables.txt
index 9de189269..62609ee28 100644
--- a/SOL005/NSDManagement-API/environment/variables.txt
+++ b/SOL005/NSDManagement-API/environment/variables.txt
@@ -8,7 +8,7 @@ ${ACCEPT_JSON}    application/json
 ${apiRoot}        /
 ${AUTH_USAGE}     1
 ${NEG_AUTHORIZATION}    Bearer negativetoken
-${apiVersion}     v1
+${apiMajorVersion}     v1
 ${apiName}        nsd
 ${FIELD_USAGE}    1
 ${NFVO_AUTHENTICATION}    Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9
@@ -21,10 +21,7 @@ ${callback_uri}    http://172.22.1.7:${callback_port}
 ${callback_endpoint}    /nsd/subscriptions
 ${callback_endpoint_error}    /subs_404
 ${callback_endpoint_fwd}    /endpoint/check
-${callback_endpoint_error}    /endpoint_404
 ${sleep_interval}    20s
-${total_polling_time}   2 min
-${polling_interval}     10 sec
 
 ${notification_request}    []
 ${notification_response}    []
@@ -36,6 +33,6 @@ ${NFVO_CHECKS_NOTIF_ENDPOINT}    1        ## If true, during subscription, the F
 ${NFVO_ALLOWS_DUPLICATE_SUBS}    1
 ${total_polling_time}   2 min
 ${polling_interval}     10 sec
-${response}
+${response}    {}
 ${retry}		5x
 ${interval}		5 sec
\ No newline at end of file
-- 
GitLab


From 9ed17d9908932e505de34231875f77ccf0111280 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 27 Oct 2020 12:56:56 +0500
Subject: [PATCH 118/322] minor bugs fixed and new testcases added

---
 .../IndividualNSDescriptor.robot              |  1 +
 .../IndividualPnfDescriptor.robot             |  4 +-
 .../IndividualSubscription.robot              | 12 +++--
 .../NSDManagementKeywords.robot               | 45 ++++++++-----------
 .../NSDManagementNotification.robot           |  1 -
 SOL005/NSDManagement-API/NSDescriptors.robot  | 18 +++++++-
 SOL005/NSDManagement-API/PNFDescriptors.robot | 27 ++++++++---
 SOL005/NSDManagement-API/Subscriptions.robot  |  2 +-
 .../jsons/subscriptions.json                  |  4 +-
 9 files changed, 66 insertions(+), 48 deletions(-)

diff --git a/SOL005/NSDManagement-API/IndividualNSDescriptor.robot b/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
index 97654d362..a40de6a1f 100644
--- a/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
+++ b/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
@@ -36,6 +36,7 @@ GET Individual Network Service Descriptor Information with invalid resource iden
     ...    Post-Conditions: none
     GET Individual Network Service Descriptor Information with invalid resource identifier
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
 
 Disable Individual Network Service Descriptor   
     [Documentation]    Test ID: 5.3.1.2.3
diff --git a/SOL005/NSDManagement-API/IndividualPnfDescriptor.robot b/SOL005/NSDManagement-API/IndividualPnfDescriptor.robot
index eb15a97c2..25e264186 100644
--- a/SOL005/NSDManagement-API/IndividualPnfDescriptor.robot
+++ b/SOL005/NSDManagement-API/IndividualPnfDescriptor.robot
@@ -35,6 +35,7 @@ GET Individual PNF Descriptor Information with invalid resource identifier
     ...    Post-Conditions: none
     GET Individual PNF Descriptor Information with invalid resource identifier
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    problemDetails
 
 Update Individual PNF Descriptor
     [Documentation]    Test ID: 5.3.1.5.3
@@ -50,7 +51,6 @@ Update Individual PNF Descriptor
     Check HTTP Response Body Json Schema Is   PnfdInfoModification
     Check Postcondition PNF Descriptor is modified according to the requested update  
 
-
 Update Individual PNF Descriptor with HTTP Etag precondition failure
     [Documentation]    Test ID: 5.3.1.5.4
     ...    Test title:  Update Individual PNF Descriptor with HTTP Etag precondition failure
@@ -79,7 +79,7 @@ PUT Individual PNF Descriptor - Method not implemented
     [Documentation]    Test ID: 5.3.1.5.6
     ...    Test title: PUT Individual PNF Descriptor - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a new PNF Descriptor
-    ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
+    ...    Pre-conditions: none
     ...    Reference: Clause 5.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
diff --git a/SOL005/NSDManagement-API/IndividualSubscription.robot b/SOL005/NSDManagement-API/IndividualSubscription.robot
index 655572bc8..2b3ef1c62 100644
--- a/SOL005/NSDManagement-API/IndividualSubscription.robot
+++ b/SOL005/NSDManagement-API/IndividualSubscription.robot
@@ -33,6 +33,7 @@ GET Individual NSD Management Subscription with invalid resource identifier
     ...    Post-Conditions: none
     GET individual NSD Management Subscription with invalid resource identifier
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
 
 DELETE Individual NSD Management Subscription with invalid resource identifier
     [Documentation]    Test ID: 5.3.1.8.3
@@ -54,23 +55,21 @@ POST Individual NSD Management Subscription - Method not implemented
     ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NSD Management Subscription is not created on the NFVO
+    ...    Post-Conditions: none
     Send Post request for individual NSD Management Subscription
     Check HTTP Response Status Code Is    405
-    Check Postcondition NSD Management Subscription is not Created
 
 PUT Individual NSD Management Subscription - Method not implemented
     [Documentation]    Test ID: 5.3.1.8.5
     ...    Test title: PUT Individual NSD Management Subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing NSD Management subscription
-    ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
+    ...    Pre-conditions: none
     ...    Reference: Clause 5.4.9.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NSD Management subscription is not modified by the operation
+    ...    Post-Conditions: none
     Send Put request for individual NSD Management Subscription
     Check HTTP Response Status Code Is    405
-    Check Postcondition NSD Management Subscription is Unmodified (Implicit)
 
 PATCH Individual NSD Management Subscription - Method not implemented
     [Documentation]    Test ID: 5.3.1.8.6
@@ -80,10 +79,9 @@ PATCH Individual NSD Management Subscription - Method not implemented
     ...    Reference: Clause 5.4.9.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NSD Management subscription is not modified by the operation
+    ...    Post-Conditions: none
     Send Patch request for individual NSD Management Subscription
     Check HTTP Response Status Code Is    405
-    Check Postcondition NSD Management Subscription is Unmodified (Implicit)
 
 DELETE Individual NSD Management Subscription
     [Documentation]    Test ID: 5.3.1.8.7
diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index a9cf9cb6d..2b73948e7 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -102,14 +102,21 @@ Check HTTP Response Body NsdInfos Matches the requested exclude_default selector
     Should Be Empty    ${user}
     Log    Reports element is empty as expected
 
-
 GET all Network Service Descriptors Information with fields attribute selector
     Log    Trying to get all NSDs present in the NFVO Catalogue, using fields filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?fields=${fields}
     ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}   
+    Set Suite Variable    ${response}    ${output} 
+    
+GET all Network Service Descriptors Information with exclude_default and fields attribute selector
+    Log    Trying to get all NSDs present in the NFVO Catalogue, using fields filter.
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?exclude_default&fields=${fields}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}  
 
 Check HTTP Response Body NsdInfos Matches the requested fields selector
     Log    Validating user defined data schema
@@ -487,14 +494,21 @@ Check HTTP Response Body PnfdInfos Matches the requested exclude_default selecto
     Should Be Empty    ${user}
     Log    Reports element is empty as expected
 
-
 GET all PNF Descriptors Information with fields attribute selector
     Log    Trying to get all PNFDs present in the NFVO Catalogue, using fields filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?fields=${fields}
     ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}   
+    Set Suite Variable    ${response}    ${output}  
+    
+GET all PNF Descriptors Information with exclude_default and fields attribute selector
+    Log    Trying to get all PNFDs present in the NFVO Catalogue, using fields filter.
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?exclude_default&fields=${fields}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}  
 
 Check HTTP Response Body PnfdInfos Matches the requested fields selector
     Log    Validating user defined data schema
@@ -564,10 +578,6 @@ Send DELETE Request for all PNF Descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
-Check Postcondition PNF Descriptors Exist
-    Log    Checking that PNFD still exists
-    GET all PNF Descriptors Information
-
 GET Individual PNF Descriptor Information
     Log    The GET method reads information about an individual PNF descriptor
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
@@ -954,23 +964,6 @@ Send Patch request for individual NSD Management Subscription
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
-   
-Check Postcondition NSD Management Subscription is Unmodified (Implicit)
-    Log    Check postconidtion subscription not modified
-    GET individual NSD Management Subscription
-    Log    Check Response matches original VNF Threshold
-    ${subscription}=    evaluate    json.loads('''${response['body']}''')    json
-    Should Be Equal    ${origResponse['body']['id']}    ${subscription.id}
-    Should Be Equal    ${origResponse['body']['callbackUri']}    ${subscription.callbackUri}
-
-Check Postcondition NSD Management Subscription is not Created
-    Log    Trying to get a new subscription
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    Check HTTP Response Status Code Is    404
 
 Check HTTP Response Body Subscription Identifier matches the requested Subscription
     Log    Trying to check response ID
@@ -1000,7 +993,7 @@ Check Notification Endpoint
     Wait Until Keyword Succeeds    ${total_polling_time}   ${polling_interval}   Verify Mock Expectation    ${notification_request}
     Clear Requests  ${callback_endpoint}
 
-Check LINK in Header
+Check HTTP Response Header Contain Link
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
 
diff --git a/SOL005/NSDManagement-API/NSDManagementNotification.robot b/SOL005/NSDManagement-API/NSDManagementNotification.robot
index 60dee5ab9..0648fb198 100644
--- a/SOL005/NSDManagement-API/NSDManagementNotification.robot
+++ b/SOL005/NSDManagement-API/NSDManagementNotification.robot
@@ -9,7 +9,6 @@ Library    BuiltIn
 Library    Collections
 Library    String
 
-
 *** Test Cases ***
 NSD Onboarding Notification
     [Documentation]    Test ID: 5.3.1.9.1
diff --git a/SOL005/NSDManagement-API/NSDescriptors.robot b/SOL005/NSDManagement-API/NSDescriptors.robot
index 4f0789aae..f0460c39b 100644
--- a/SOL005/NSDManagement-API/NSDescriptors.robot
+++ b/SOL005/NSDManagement-API/NSDescriptors.robot
@@ -204,7 +204,7 @@ GET all Network Service Descriptors Information as Paged Response
     ...    Post-Conditions: none
     GET all Network Service Descriptors Information
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contain Link
 
 Get all Network Service Descriptors Information - Bad Request Response too Big
     [Documentation]    Test ID: 5.3.1.1.16
@@ -217,4 +217,18 @@ Get all Network Service Descriptors Information - Bad Request Response too Big
     ...    Post-Conditions: none
     GET all Network Service Descriptors Information
     Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is   ProblemDetails
\ No newline at end of file
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+GET all Network Service Descriptors Information with "exclude_default" and "fields" attribute selector
+    [Documentation]    Test ID: 5.3.1.1.17
+    ...    Test title: GET all Network Service Descriptors Information with "exclude_default" and "fields" attribute selector
+    ...    Test objective: The objective is to test the retrieval of all Network Service Descriptors Information with "exclude_default" and "fields" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "exclude_default" and "fields" selector
+    ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NFVO supports the use of "exclude_default" and "fields" attribute selector
+    ...    Post-Conditions: none
+    GET all Network Service Descriptors Information with exclude_default and fields attribute selector
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is   NsdInfos
+    Check HTTP Response Body NsdInfos Matches the requested fields selector
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/PNFDescriptors.robot b/SOL005/NSDManagement-API/PNFDescriptors.robot
index 194c173fc..6d6b84239 100644
--- a/SOL005/NSDManagement-API/PNFDescriptors.robot
+++ b/SOL005/NSDManagement-API/PNFDescriptors.robot
@@ -124,7 +124,7 @@ PUT all PNF Descriptors - Method not implemented
     [Documentation]    Test ID: 5.3.1.4.9
     ...    Test title: PUT all PNF Descriptors Information - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify PNF Descriptors Information
-    ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
+    ...    Pre-conditions: none
     ...    Reference: Clause 5.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
@@ -136,7 +136,7 @@ PATCH all PNF Descriptors - Method not implemented
     [Documentation]    Test ID: 5.3.1.4.10
     ...    Test title: PATCH all PNF Descriptors Information - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update NF Descriptors Information
-    ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
+    ...    Pre-conditions: none
     ...    Reference: Clause 5.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
@@ -148,14 +148,13 @@ DELETE all PNF Descriptors - Method not implemented
     [Documentation]    Test ID: 5.3.1.4.11
     ...    Test title: DELETE all PNF Descriptors Information - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete PNF Descriptors Information
-    ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
+    ...    Pre-conditions: none
     ...    Reference: Clause 5.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The PNF Descriptors are not deleted by the failed operation
+    ...    Post-Conditions: none
     Send DELETE Request for all PNF Descriptors
     Check HTTP Response Status Code Is    405
-    Check Postcondition PNF Descriptors Exist
     
 GET all PNF Descriptors Information as Paged Response
     [Documentation]    Test ID: 5.3.1.4.12
@@ -168,7 +167,7 @@ GET all PNF Descriptors Information as Paged Response
     ...    Post-Conditions: none
     GET all PNF Descriptors Information
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contain Link
     
 GET PNF Descriptors Information - Bad Request Response too Big
         [Documentation]    Test ID: 5.3.1.4.13
@@ -181,4 +180,18 @@ GET PNF Descriptors Information - Bad Request Response too Big
     ...    Post-Conditions: none
     GET all PNF Descriptors Information
     Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is   ProblemDetails
\ No newline at end of file
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+GET all PNF Descriptors Information with "exclude_default" and "fields" attribute selector
+    [Documentation]    Test ID: 5.3.1.4.14
+    ...    Test title: GET all PNF Descriptors Information with "exclude_default" and "fields" attribute selector
+    ...    Test objective: The objective is to test the retrieval of all PNF Descriptors Information with "exclude_default" and "fields" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "exclude_default" and "fields" selector
+    ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NFVO supports the use of "exclude_default" and "fields" attribute selector
+    ...    Post-Conditions: none
+    GET all PNF Descriptors Information with exclude_default and fields attribute selector
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is   PnfdInfos
+    Check HTTP Response Body PnfdInfos Matches the requested fields selector
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/Subscriptions.robot b/SOL005/NSDManagement-API/Subscriptions.robot
index 131b7c2ff..1f1ae1249 100644
--- a/SOL005/NSDManagement-API/Subscriptions.robot
+++ b/SOL005/NSDManagement-API/Subscriptions.robot
@@ -159,7 +159,7 @@ Get All NSD Management Subscriptions as Paged Response
     ...    Post-Conditions: none    
     Get all NSD Management Subscriptions
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contain Link
 
 Get NSD Management Subscriptions - Bad Request Response too Big
     [Documentation]    Test ID: 5.3.1.7.12
diff --git a/SOL005/NSDManagement-API/jsons/subscriptions.json b/SOL005/NSDManagement-API/jsons/subscriptions.json
index 92a9db1b0..7aa8965f3 100644
--- a/SOL005/NSDManagement-API/jsons/subscriptions.json
+++ b/SOL005/NSDManagement-API/jsons/subscriptions.json
@@ -1,3 +1,3 @@
-{
+{{
 	"callbackUri": "{notifCallbackUri}"
-}
\ No newline at end of file
+}}
\ No newline at end of file
-- 
GitLab


From f7517bd8998178a91beaf705dd29e5f8c343e937 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 27 Oct 2020 15:58:00 +0500
Subject: [PATCH 119/322] new testcases and minor bugs fix added

---
 .../CreateNSInstanceWorkflow.robot            |  2 +-
 .../NSLCMOperationKeywords.robot              |  2 +-
 .../Subscriptions.robot                       | 21 ++++++++++++++-----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
index 47ee23b65..643bb48c7 100644
--- a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
@@ -22,7 +22,7 @@ NS Instance Creation
     Check HTTP Response Status Code Is    201
     Check HTTP Response Header Contains    Location
     Check HTTP Response Body Json Schema Is    NsInstance
-    Check resource not_instantiated    1
+    Check resource not_instantiated
     
 NS Instance Creation with DISABLED Network Service Descriptor
     [Documentation]    Test ID: 5.3.2.18.2
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index 30952bc57..44348a964 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -1137,6 +1137,6 @@ PUT notification
     Log  Cleaning the endpoint
     Clear Requests  ${callback_endpoint}         
         
-Check LINK in Header
+Check HTTP Response Header Contains Location
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
diff --git a/SOL005/NSLifecycleManagement-API/Subscriptions.robot b/SOL005/NSLifecycleManagement-API/Subscriptions.robot
index ff62a7c04..d2d0010ce 100644
--- a/SOL005/NSLifecycleManagement-API/Subscriptions.robot
+++ b/SOL005/NSLifecycleManagement-API/Subscriptions.robot
@@ -21,7 +21,6 @@ POST Create a new subscription
     Check HTTP Response Header Contains    Location
     Check HTTP Response Body Json Schema Is    subscription
     
-
 POST Create a new Subscription - DUPLICATION
     [Documentation]    Test ID: 5.3.2.15.2
     ...    Test title: POST Create a new subscription - DUPLICATION
@@ -172,7 +171,7 @@ DELETE subscriptions - Method not implemented
     ...    Reference: Clause 6.4.16.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: Subscription is not deleted
+    ...    Post-Conditions: none
     DELETE subscriptions
     Check HTTP Response Status Code Is    405
     
@@ -187,7 +186,7 @@ GET Subscriptions as Paged Response
     ...    Post-Conditions: none    
     GET Subscriptions
     Check HTTP Response Status Code Is  200
-    Check LINK in Header
+    Check HTTP Response Header Contains Location
     
 GET subscriptions - Bad Request Response too Big
     [Documentation]    Test ID: 5.3.2.15.15
@@ -198,6 +197,18 @@ GET subscriptions - Bad Request Response too Big
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-     GET Subscriptions
+    GET Subscriptions
     Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is    ProblemDetails
\ No newline at end of file
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+    
+POST Create a new subscription - Unprocessable Entity
+    [Documentation]    Test ID: 5.3.2.15.16
+    ...    Test title: POST Create a new subscription - Unprocessable Entity
+    ...    Test objective: The objective is to test the creation of a new lifecycle management subscription fials when content type of the payload body is supported and the payload body of a request contains syntactically correct data but the data cannot be processed
+    ...    Pre-conditions: none
+    ...    Reference: Clause 6.4.16.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none     
+    POST subscriptions
+    Check HTTP Response Status Code Is    422
\ No newline at end of file
-- 
GitLab


From 038650c73a0bb28dc9ef05df99c1dfa9e7e7bb66 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 27 Oct 2020 16:58:07 +0500
Subject: [PATCH 120/322] added majorApiVersion

---
 .../ApiVersion.robot                          |  10 +-
 .../FailOperationTask.robot                   |   1 -
 .../NSInstances.robot                         |   2 +-
 .../NSLCMOccurences.robot                     |   2 +-
 .../NSLCMOperationKeywords.robot              | 248 +++++++++---------
 .../environment/variables.txt                 |   2 +-
 6 files changed, 132 insertions(+), 133 deletions(-)

diff --git a/SOL005/NSLifecycleManagement-API/ApiVersion.robot b/SOL005/NSLifecycleManagement-API/ApiVersion.robot
index 9a1f0c8bc..7fe40a640 100644
--- a/SOL005/NSLifecycleManagement-API/ApiVersion.robot
+++ b/SOL005/NSLifecycleManagement-API/ApiVersion.robot
@@ -169,35 +169,35 @@ DELETE API Version
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/v1/api_version
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/v1/api_version
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/v1/api_version
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/v1/api_version
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/v1/api_version
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
diff --git a/SOL005/NSLifecycleManagement-API/FailOperationTask.robot b/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
index e4c017684..b87ddc4d8 100644
--- a/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
@@ -21,7 +21,6 @@ POST Fail operation task
 	Check HTTP Response Status Code Is    202
 	Check resource is finally failed
 	
-	
 POST Fail operation task Not Found
     [Documentation]    Test ID: 5.3.2.13.2
     ...    Test title: POST Fail operation task Not Found
diff --git a/SOL005/NSLifecycleManagement-API/NSInstances.robot b/SOL005/NSLifecycleManagement-API/NSInstances.robot
index 106da04e8..e76837554 100644
--- a/SOL005/NSLifecycleManagement-API/NSInstances.robot
+++ b/SOL005/NSLifecycleManagement-API/NSInstances.robot
@@ -158,7 +158,7 @@ GET information about multiple NS instances as Paged Response
     ...    Post-Conditions: none.
     GET NsInstances
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contains Location
     
 GET information about multiple NS instances - Bad Request Response too Big
     [Documentation]    Test ID: 5.3.2.1.13
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot b/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot
index 3a6aa7eae..1c434a168 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot
@@ -157,7 +157,7 @@ GET status information about multiple NS LCM occurrences as Paged Response
     ...    Post-Conditions: none
 	GET NS LCM OP Occurrences
 	Check HTTP Response Status Code Is    200
-	Check LINK in Header
+	Check HTTP Response Header Contains Location
 
 GET status information about multiple NS LCM occurrences - Bad Request Response too Big
     [Documentation]    Test ID: 5.3.2.8.13
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index 44348a964..b9d4fc363 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -28,50 +28,50 @@ Check subscription existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
     Integer    response status    200
     
 Check Instance Deleted
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}
     Integer    response status    404
     
 Check Fail not supported
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}
     # how to check if Fail is not supported? Also In Sol002
     
 Check Cancel not supported
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}
     # how to check if Cancel is not supported? Also In Sol002
     
 Check Continue not supported
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}
     # how to check if Continue is not supported? Also In Sol002
     
 Check retry not supported
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}
     # how to check if retry is not supported? Also In Sol002
     
 Check Rollback not supported
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}
     # how to check if rollback is not supported? Also In Sol002
     
 Check resource FAILED_TEMP
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId} 
     String    response body operationState    FAILED_TEMP
 
 Check resource not 
     [Arguments]   ${status}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId} 
     Should Not Be Equal As Strings  response body operationState    ${status}
 
 Check Operation Notification Status is
@@ -119,7 +119,7 @@ Probe resource Instantiated
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId} 
     String    response body nsState    INSTANTIATED
 
 Check resource not_instantiated
@@ -132,14 +132,14 @@ Probe resource not_instantiated
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log     ${fresh_resource}
     ${instanceId}=  Set Variable If	    ${fresh_resource} == 0   ${nsInstanceId}   ${response['body']['id']}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${instanceId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${instanceId}
     String    response body nsState     NOT_INSTANTIATED
 
 Check operation resource state is FAILED_TEMP    
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId} 
     String    response body instantiationState    FAILED_TEMP 
     
 Check operation resource state is not FAILED_TEMP
@@ -147,14 +147,14 @@ Check operation resource state is not FAILED_TEMP
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId} 
     String  response body instantiationState  not  FAILED_TEMP
 
 Check resource is finally failed
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId} 
     String    response body instantiationState    FINALLY_FAILED 
 
 Launch another LCM operation
@@ -163,21 +163,21 @@ Launch another LCM operation
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/scaleNsToLevelRequest.json
     ${body}=        Format String   ${template}     instantiationLevelId=${instantiationLevelId}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/scale_to_level    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/scale_to_level    ${body}
     Integer    response status    202
 
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId} 
     Integer    response status    200
     
 Check Postcondition NS Instance is not created
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nonExistentNsId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nonExistentNsId} 
     Integer    response status    404
     
 Check HTTP Response Status Code Is
@@ -190,7 +190,7 @@ Check Postcondition NS Instance is deleted
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${disabledNsdId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${disabledNsdId} 
     Integer    response status    404
     
 Check Postcondition NS Instance is not modified
@@ -215,7 +215,7 @@ Check Postcondition NS Instance is not deleted
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId} 
     Integer    response status    200
     
 Check HTTP Response Header ContentType is
@@ -225,24 +225,24 @@ Check HTTP Response Header ContentType is
     Log    Content Type validated 
 
 POST New nsInstance
-    Log    Create NS instance by POST to ${apiRoot}/${apiName}/${apiVersion}/ns_instances
+    Log    Create NS instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/CreateNsRequest.json 
     ${body}=        Format String   ${template}     nsdId=${nsdId}   nsInstanceName=${nsInstanceName}   vimAccountId=${vimAccountId}   nsInstanceDescription=${nsInstanceDescription}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/ns_instances    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}     
 
 POST New nsInstance with DISABLED nsd
-    Log    Create NS instance by POST to ${apiRoot}/${apiName}/${apiVersion}/ns_instances
+    Log    Create NS instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/CreateNsRequest.json 
     ${body}=        Format String   ${template}     nsdId=${disabledNsdId}   nsInstanceName=${nsInstanceName}   vimAccountId=${vimAccountId}   nsInstanceDescription=${nsInstanceDescription}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/ns_instances    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  
 
@@ -251,7 +251,7 @@ GET NsInstances
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -261,7 +261,7 @@ GET NsInstance Invalid Attribute-Based filtering parameter
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get   ${apiRoot}/${apiName}/${apiVersion}/ns_instances?attribute_not_exist=some_value
+    Get   ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances?attribute_not_exist=some_value
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -270,7 +270,7 @@ GET NsInstance Invalid Attribute Selector
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"} 
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances?fields=wrong_field	
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances?fields=wrong_field	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  
 	
@@ -278,28 +278,28 @@ Get NSInstances with all_fields attribute selector
     Log    Get the list of NSInstances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_instances?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get NSInstances with exclude_default attribute selector
     Log    Get the list of NSInstances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_instances?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get NSInstances with fields attribute selector
     Log    Get the list of NSInstances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_instances?fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 Get NSInstances with exclude_fields attribute selector
     Log    Get the list of NSInstances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_instances?exclude_fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     	
@@ -308,7 +308,7 @@ PUT NSInstances
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/ns_instances
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}   
 	
@@ -317,7 +317,7 @@ PATCH NSInstances
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/ns_instances
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  
 	
@@ -326,7 +326,7 @@ DELETE NSInstances
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/ns_instances
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 
@@ -335,7 +335,7 @@ POST IndividualNSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nonExistentNsId}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nonExistentNsId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
@@ -344,7 +344,7 @@ GET IndividualNSInstance
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}
     ${Etag}=    Output    response headers ETag
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -355,7 +355,7 @@ PUT IndividualNSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 	
@@ -364,14 +364,14 @@ PATCH IndividualNSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 	
 DELETE IndividualNSInstance
     log    Trying to delete an individual VNF instance
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 	
@@ -379,7 +379,7 @@ DELETE IndividualNSInstance
 DELETE IndividualNSInstance Conflict
     log    Trying to delete an individual VNF instance
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${ConflictNsInstanceId}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${ConflictNsInstanceId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 
@@ -387,7 +387,7 @@ DELETE IndividualNSInstance Conflict
 DELETE Instantiate NSInstance
     log    Trying to delete an instantiate NS instance. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/instantiate
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/instantiate
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
  
@@ -396,7 +396,7 @@ DELETE Instantiate NSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/instantiate
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/instantiate
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
  
@@ -405,7 +405,7 @@ PUT Instantiate NSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/instantiate
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/instantiate
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
@@ -414,7 +414,7 @@ GET Instantiate NSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/instantiate
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/instantiate
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
@@ -425,14 +425,14 @@ GET Instantiate NSInstance
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/InstantiateNs.json
     ${body}=        Format String   ${template}     nsFlavourId=${nsFlavourId}   vimAccountId=${vimAccountId}   nsdId=${nsdId}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/instantiate    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/instantiate    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 DELETE Scale NSInstance
     log    Trying to delete an Scale NS instance. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/scale
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/scale
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
  
@@ -441,7 +441,7 @@ DELETE Scale NSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/scale
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/scale
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
  
@@ -450,7 +450,7 @@ PUT Scale NSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/scale
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/scale
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
@@ -459,7 +459,7 @@ GET Scale NSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/scale
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/scale
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
@@ -470,14 +470,14 @@ POST scale nsInstance
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/ScaleNs.json
     ${body}=        Format String   ${template}     scaleType=${scaleType}   scaleTimeout=${scaleTimeout}   scaleVnfType=${scaleVnfType}   scaleGroupDescriptor=${scaleGroupDescriptor}   scaleMemberVnfIndex=${scaleMemberVnfIndex}
-	Post    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/scale    ${body}
+	Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/scale    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE Update NSInstance
     log    Trying to delete an Update NS instance. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/update
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/update
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
  
@@ -486,7 +486,7 @@ DELETE Update NSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/update
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/update
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
  
@@ -495,7 +495,7 @@ PUT Update NSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/update
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/update
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
@@ -504,7 +504,7 @@ GET Update NSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/update
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/update
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
@@ -515,14 +515,14 @@ POST Update NSInstance
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/UpdateNsRequest.json
     ${body}=        Format String   ${template}     vnfUpdateType=${vnfUpdateType}
-	Post    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/update    ${body}
+	Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/update    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE Heal NSInstance
     log    Trying to Delete an Heal NS instance. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/heal
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/heal
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
  
@@ -531,7 +531,7 @@ DELETE Heal NSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/heal
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/heal
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
  
@@ -540,7 +540,7 @@ PUT Heal NSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/heal
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/heal
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
@@ -549,7 +549,7 @@ GET Heal NSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/heal
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/heal
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
@@ -560,14 +560,14 @@ POST Heal NSInstance
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/HealNsRequest.json
     ${body}=        Format String   ${template}     nsDegreeHealing=${nsDegreeHealing}
-	Post    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/heal    ${body}
+	Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/heal    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE Terminate NSInstance
     log    Trying to Delete an Terminate NS instance. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/terminate
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/terminate
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
  
@@ -576,7 +576,7 @@ PATCH Terminate NSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/terminate
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/terminate
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
  
@@ -585,7 +585,7 @@ PUT Terminate NSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/terminate
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/terminate
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
@@ -594,7 +594,7 @@ GET Terminate NSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/terminate
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/terminate
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
@@ -604,7 +604,7 @@ POST Terminate NSInstance
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/TerminateNsRequest.json
-	Post    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/terminate    ${body}
+	Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/terminate    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 		
@@ -612,7 +612,7 @@ POST NS LCM OP Occurrences
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs 	
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -620,7 +620,7 @@ PUT NS LCM OP Occurrences
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs 	
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -628,7 +628,7 @@ PATCH NS LCM OP Occurrences
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs 	
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -636,7 +636,7 @@ DELETE NS LCM OP Occurrences
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs 	
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -645,7 +645,7 @@ GET NS LCM OP Occurrences
 	Set Headers  {"Accept":"${ACCEPT}"}  
 	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
 	Log    Execute Query and validate response
-	Get    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs
+	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
  
@@ -653,7 +653,7 @@ GET NS LCM OP Occurrences Invalid attribute-based filtering parameters
     Log    Query status information about multiple NS lifecycle management operation occurrences.
 	Set Headers  {"Accept":"${ACCEPT}"}  
 	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"} 
-	GET    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs?${NEG_FILTER}
+	GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs?${NEG_FILTER}
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -661,35 +661,35 @@ GET NS LCM OP Occurrences Invalid attribute selector
     Log    Query status information about multiple NS lifecycle management operation occurrences.
     Set Headers  {"Accept":"${ACCEPT}"}  
 	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"} 
-	GET    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs?${NEG_SELECTOR}
+	GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs?${NEG_SELECTOR}
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 Get NS LCM OP Occurrences with all_fields attribute selector
     Log    Query status information about multiple NS lifecycle management operation occurrences, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get NS LCM OP Occurrences with exclude_default attribute selector
     Log    Query status information about multiple NS lifecycle management operation occurrences using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get NS LCM OP Occurrences with fields attribute selector
     Log    Query status information about multiple NS lifecycle management operation occurrences, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs?fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 Get NS LCM OP Occurrences with exclude_fields attribute selector
     Log    Query status information about multiple NS lifecycle management operation occurrences, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs?exclude_fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -697,7 +697,7 @@ POST Individual NS LCM OP Occurrence
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId} 	
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId} 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -705,7 +705,7 @@ PUT Individual NS LCM OP Occurrence
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId} 		
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId} 		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -713,7 +713,7 @@ PATCH Individual NS LCM OP Occurrence
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId} 	 	
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId} 	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -721,7 +721,7 @@ DELETE Individual NS LCM OP Occurrence
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId} 	 	
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId} 	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -730,35 +730,35 @@ GET Individual NS LCM OP Occurrence
 	Set Headers  {"Accept":"${ACCEPT}"}  
 	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
 	Log    Execute Query and validate response
-	Get    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId} 
+	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId} 
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 	
 GET Retry operation task
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/retry 	
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/retry 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PUT Retry operation task
     log    Trying to perform a PUT. This method should not be implemented 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/retry  		
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/retry  		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PATCH Retry operation task
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/retry  	 	
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/retry  	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 DELETE Retry operation task
     log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/retry  	 	
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/retry  	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -766,35 +766,35 @@ POST Retry operation task
     Log    Retry a NS lifecycle operation if that operation has experienced a temporary failure
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Post    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/retry
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/retry
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 GET Rollback operation task
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/rollback 	
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/rollback 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PUT Rollback operation task
     log    Trying to perform a PUT. This method should not be implemented 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/rollback  		
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/rollback  		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PATCH Rollback operation task
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/rollback  	 	
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/rollback  	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 DELETE Rollback operation task
     log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/rollback  	 	
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/rollback  	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -802,35 +802,35 @@ POST Rollback operation task
     Log    Rollback a NS lifecycle operation task
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Post    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/rollback
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/rollback
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 GET Continue operation task
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/continue 	
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/continue 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PUT Continue operation task
     log    Trying to perform a PUT. This method should not be implemented 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/continue  		
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/continue  		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PATCH Continue operation task
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/continue  	 	
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/continue  	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 DELETE Continue operation task
     log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/continue  	 	
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/continue  	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -838,35 +838,35 @@ POST Continue operation task
     Log    Continue a NS lifecycle operation task
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Post    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/continue
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/continue
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 
 GET Fail operation task
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/fail 	
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/fail 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PUT Fail operation task
     log    Trying to perform a PUT. This method should not be implemented 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/fail  		
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/fail  		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PATCH Fail operation task
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/fail  	 	
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/fail  	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 DELETE Fail operation task
     log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/fail  	 	
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/fail  	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -874,35 +874,35 @@ POST Fail operation task
     Log    Fail a NS lifecycle operation task
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Post    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/fail
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/fail
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 GET Cancel operation task
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/cancel 	
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/cancel 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PUT Cancel operation task
     log    Trying to perform a PUT. This method should not be implemented 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/cancel  		
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/cancel  		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PATCH Cancel operation task
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/cancel  	 	
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/cancel  	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 DELETE Cancel operation task
     Log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/cancel  	 	
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/cancel  	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -910,7 +910,7 @@ POST Cancel operation task
     Log    Cancel a NS lifecycle operation task
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Post    ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/cancel
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/cancel
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -919,7 +919,7 @@ PUT subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -928,7 +928,7 @@ PATCH subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -937,18 +937,18 @@ DELETE subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 POST subscriptions
-    Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/LccnSubscriptionRequest.json
     ${body}=        Format String   ${template}     callbackUri=${callback_uri}   callbackEndpoint=${callback_endpoint}   callbackPort=${callback_port}   nsdId=${nsdId}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}    
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -960,7 +960,7 @@ POST subscriptions DUPLICATION
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/LccnSubscriptionRequest.json
     ${body}=        Format String   ${template}     callbackUri=${callback_uri}   callbackEndpoint=${callback_endpoint}   callbackPort=${callback_port}     nsdId=${nsdId}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}    
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -972,7 +972,7 @@ POST subscriptions NO DUPLICATION
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/LccnSubscriptionRequest.json
     ${body}=        Format String   ${template}     callbackUri=${callback_uri}   callbackEndpoint=${callback_endpoint}   callbackPort=${callback_port}     nsdId=${nsdId}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}    
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -983,7 +983,7 @@ GET Subscriptions
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 
@@ -991,28 +991,28 @@ Get subscriptions with all_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?all_fields
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?all_fields
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get subscriptions with exclude_default attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get subscriptions with fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 Get subscriptions with exclude_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?exclude_fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}     
 	
@@ -1020,7 +1020,7 @@ GET subscriptions with filter
     Log    Get the list of active subscriptions using a filter
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 
@@ -1028,7 +1028,7 @@ Get subscriptions - invalid filter
     Log    Get the list of active subscriptions using an invalid filter
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter_invalid} 
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter_invalid} 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 
@@ -1037,7 +1037,7 @@ POST Individual Subscription
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  
 	
@@ -1046,7 +1046,7 @@ PUT Individual Subscription
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  
 	
@@ -1055,7 +1055,7 @@ PATCH Individual Subscription
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 
@@ -1063,7 +1063,7 @@ GET Individual subscription
     log    Trying to get information about an individual subscription
     Set Headers    {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}  
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -1071,7 +1071,7 @@ DELETE Individual subscription
     log    Try to delete an individual subscription
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}    
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}    
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 
diff --git a/SOL005/NSLifecycleManagement-API/environment/variables.txt b/SOL005/NSLifecycleManagement-API/environment/variables.txt
index d58f1074f..c9c31a4ce 100644
--- a/SOL005/NSLifecycleManagement-API/environment/variables.txt
+++ b/SOL005/NSLifecycleManagement-API/environment/variables.txt
@@ -13,7 +13,7 @@ ${ACCEPT_JSON}         application/json
 ${ACCEPT}         application/json
 ${apiRoot}        /
 ${apiName}        nslcm
-${apiVersion}     v1
+${apiMajorVersion}     v1
 ${AUTH_USAGE}     1
 ${WRONG_AUTHORIZATION}    Bearer    XXXXXWRONGXXXXX
 ${nsInstanceId}       6fc3539c-e602-4afa-8e13-962fb5a7d81f
-- 
GitLab


From 626bf0cf522e627a3c42be9f73fe98f5bd050ad1 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Thu, 29 Oct 2020 15:41:31 +0500
Subject: [PATCH 121/322] new testcacse added, postcondition fixed

---
 .../CancelOperationTask.robot                 |  4 +-
 .../CreateNSInstanceWorkflow.robot            |  2 -
 .../IndividualNSInstance.robot                | 11 ++---
 .../IndividualNSLCMOccurences.robot           | 15 ++----
 .../IndividualSubscription.robot              |  6 +--
 .../NSInstances.robot                         | 48 ++++++++++++-------
 .../NSLCMOccurences.robot                     | 15 +++++-
 .../NSLCMOperationKeywords.robot              | 28 +++++------
 .../TerminateNSTask.robot                     | 10 ++--
 .../UpdateNSTask.robot                        | 10 ++--
 10 files changed, 80 insertions(+), 69 deletions(-)

diff --git a/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot b/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
index a930030d4..e50e2fcf6 100644
--- a/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
@@ -93,6 +93,4 @@ DELETE Cancel operation task - Method not implemented
     ...    Applicability: none
     ...    Post-Conditions: none
     DELETE Cancel operation task
-    Check HTTP Response Status Code Is    405
-    
-	
\ No newline at end of file
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
index 643bb48c7..a1dda903c 100644
--- a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
@@ -6,9 +6,7 @@ Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 
-
 *** Test Cases ***
-
 NS Instance Creation
     [Documentation]    Test ID: 5.3.2.18.1
     ...    Test title: NS Instance Creation
diff --git a/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot b/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
index cd4345a1a..32285a8d4 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
@@ -16,10 +16,9 @@ POST Individual NSInstance - Method not implemented
     ...    Reference: Clause 6.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: Check Postcondition NS Instance is not created
+    ...    Post-Conditions: none
     POST IndividualNSInstance
     Check HTTP Response Status Code Is    405
-    Check Postcondition NS Instance is not created
 
 GET Information about an individual NS Instance
     [Documentation]    Test ID: 5.3.2.2.2
@@ -42,10 +41,9 @@ PUT Individual NSInstance - Method not implemented
     ...    Reference: Clause 6.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: Check Postcondition NS Instance is not modified
+    ...    Post-Conditions: none
     PUT IndividualNSInstance
     Check HTTP Response Status Code Is    405
-    Check Postcondition NS Instance is not modified
 
 PATCH Individual NSInstance - Method not implemented 
     [Documentation]    Test ID: 5.3.2.2.4
@@ -55,10 +53,9 @@ PATCH Individual NSInstance - Method not implemented
     ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: Check Postcondition NS Instance is not modified
+    ...    Post-Conditions: none
     PATCH IndividualNSInstance
     Check HTTP Response Status Code Is    405
-    Check Postcondition NS Instance is not modified
 
 DELETE Individual NSInstance
      [Documentation]    Test ID: 5.3.2.2.5
@@ -85,4 +82,4 @@ DELETE Individual NSInstance Conflict
     DELETE IndividualNSInstance
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
-    Check Postcondition NS Instance is not deleted
+    Check Postcondition NS Instance is not deleted
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot b/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
index fd9eeea93..b0e32dba8 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
@@ -15,7 +15,7 @@ Post Individual NS LCM occurrences - Method not implemented
     ...    Reference: Clause 6.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS instance is not created in the NFVO
+    ...    Post-Conditions: none
 	POST Individual NS LCM OP Occurrence
 	Check HTTP Response Status Code Is    405
 
@@ -40,7 +40,7 @@ PUT status information about Individual NS LCM occurrences - Method not implemen
     ...    Reference: Clause 6.4.10.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS instance is not modified from the NFVO
+    ...    Post-Conditions: none
     PUT Individual NS LCM OP Occurrence
     Check HTTP Response Status Code Is    405
 
@@ -52,7 +52,7 @@ PATCH status information about Individual NS LCM occurrences - Method not implem
     ...    Reference: Clause 6.4.10.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS instance is not modified from the NFVO
+    ...    Post-Conditions: none
     PATCH Individual NS LCM OP Occurrence
     Check HTTP Response Status Code Is    405
 
@@ -64,11 +64,6 @@ DELETE status information about Individual NS LCM occurrences - Method not imple
     ...    Reference: Clause 6.4.10.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS instance is not deleted from the NFVO
+    ...    Post-Conditions: none
     DELETE Individual NS LCM OP Occurrence
-    Check HTTP Response Status Code Is    405
-    
-
-
-
-	
\ No newline at end of file
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot b/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot
index 64105600e..44191a80e 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot
@@ -17,7 +17,7 @@ POST Individual Subscription - Method not implemented
     ...    Reference: Clause 6.4.17.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS lifecycle management subscription is not created on the NFVO
+    ...    Post-Conditions: none
     POST Individual Subscription
     Check HTTP Response Status Code Is    405
 
@@ -42,7 +42,7 @@ PUT an individual subscription - Method not implemented
     ...    Reference: Clause 6.4.17.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS lifecycle management subscription is not modified by the operation
+    ...    Post-Conditions: none
     PUT Individual Subscription
     Check HTTP Response Status Code Is    405
 
@@ -54,7 +54,7 @@ PATCH an individual subscription - Method not implemented
     ...    Reference: Clause 6.4.17.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS lifecycle management subscription is not modified by the operation
+    ...    Post-Conditions: none
     PATCH Individual Subscription
     Check HTTP Response Status Code Is    405
     
diff --git a/SOL005/NSLifecycleManagement-API/NSInstances.robot b/SOL005/NSLifecycleManagement-API/NSInstances.robot
index e76837554..8c662bcab 100644
--- a/SOL005/NSLifecycleManagement-API/NSInstances.robot
+++ b/SOL005/NSLifecycleManagement-API/NSInstances.robot
@@ -11,7 +11,7 @@ POST Create a new NsInstance
     [Documentation]    Test ID: 5.3.2.1.1
     ...    Test title: POST Create a new NsInstance
     ...    Test objective: The objective is to test the creation of a new Ns Instances and perform a JSON schema validation of the collected instance data structure
-    ...    Pre-conditions: None.
+    ...    Pre-conditions: none.
     ...    Reference: Clause 6.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none.
@@ -59,15 +59,16 @@ GET information about multiple NS instances Bad Request Invalid attribute select
     GET NsInstance Invalid Attribute Selector
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails
+    
 GET NSInstances with "all_fields" attribute selector
     [Documentation]    Test ID: 5.3.2.1.5
     ...    Test title: GET NSInstances with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active NSInstances with attribute selector
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
-    ...    Applicability:  
-    ...    Post-Conditions: 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
     Get NSInstances with all_fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   NsInstances 
@@ -76,11 +77,11 @@ GET NSInstances with "exclude_default" attribute selector
     [Documentation]    Test ID: 5.3.2.1.6
     ...    Test title: GET NSInstances with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve the list of active NSInstances with attribute selector
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
-    ...    Applicability:  
-    ...    Post-Conditions: 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
     Get NSInstances with exclude_default attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   NsInstances
@@ -89,11 +90,11 @@ GET NSInstances with "fields" attribute selector
     [Documentation]    Test ID: 5.3.2.1.7
     ...    Test title: GET NSInstances with "fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active NSInstances with attribute selector
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
-    ...    Applicability:  
-    ...    Post-Conditions: 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
     Get NSInstances with fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   NsInstances
@@ -102,11 +103,11 @@ GET NSInstances with "exclude_fields" attribute selector
     [Documentation]    Test ID: 5.3.2.1.8
     ...    Test title: GET NSInstances with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active NSInstances with attribute selector
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
-    ...    Applicability:  
-    ...    Post-Conditions: 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
     Get NSInstances with exclude_fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   NsInstances
@@ -119,7 +120,7 @@ PUT NSInstances - Method not implemented
     ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS instance is not modified by the operation
+    ...    Post-Conditions: none
     PUT NSInstances
     Check HTTP Response Status Code Is    405
     
@@ -131,7 +132,7 @@ PATCH NSInstances - Method not implemented
     ...    Reference: Clause 6.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS instance is not modified by the operation
+    ...    Post-Conditions: none
     PATCH NSInstances
     Check HTTP Response Status Code Is    405
 
@@ -143,7 +144,7 @@ DELETE NSInstances - Method not implemented
     ...    Reference: Clause 6.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS instance is not deleted by the operation
+    ...    Post-Conditions: none
     DELETE NSInstances
     Check HTTP Response Status Code Is    405
     
@@ -171,4 +172,17 @@ GET information about multiple NS instances - Bad Request Response too Big
     ...    Post-Conditions: none.
     GET NsInstances
     Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is    ProblemDetails
\ No newline at end of file
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+    
+GET NSInstances with "fields" and "exclude_default" attribute selector
+    [Documentation]    Test ID: 5.3.2.1.14
+    ...    Test title: GET NSInstances with "fields" and "exclude_default" attribute selector
+    ...    Test objective: The objective is to retrieve the list of active NSInstances with attribute selector list and exclude_default
+    ...    Pre-conditions: none
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability:  none
+    ...    Post-Conditions: none
+    Get NSInstances with fields and exclude_default attribute selector
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is   NsInstances
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot b/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot
index 1c434a168..2ba76b8f0 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot
@@ -170,4 +170,17 @@ GET status information about multiple NS LCM occurrences - Bad Request Response
     ...    Post-Conditions: none
 	GET NS LCM OP Occurrences
 	Check HTTP Response Status Code Is    400
-	Check HTTP Response Body Json Schema Is    ProblemDetails
\ No newline at end of file
+	Check HTTP Response Body Json Schema Is    ProblemDetails
+	
+GET status information about multiple NS LCM occurrences with "fields" and "exclude_default" 
+     [Documentation]    Test ID: 5.3.2.8.14
+    ...    Test title: GET status information about multiple NS LCM occurrences with "fields" and "exclude_default"
+    ...    Test objective: The objective is to test that GET method returns a list of LCM occurrences of the NS
+    ...    Pre-conditions: At least one LCM occurrences available in the NFVO
+    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+	Get NS LCM OP Occurrences with fields and exclude_default attribute selector
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    NsLcmOpOccs
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index b9d4fc363..b871442b7 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -173,13 +173,6 @@ Check resource existence
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId} 
     Integer    response status    200
     
-Check Postcondition NS Instance is not created
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nonExistentNsId} 
-    Integer    response status    404
-    
 Check HTTP Response Status Code Is
     [Arguments]    ${expected_status}
     Log    Validate Status code    
@@ -193,13 +186,6 @@ Check Postcondition NS Instance is deleted
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${disabledNsdId} 
     Integer    response status    404
     
-Check Postcondition NS Instance is not modified
-    GET IndividualNSInstance
-    ${resp_dict}=    evaluate    json.loads('''${response['body']}''')    json
-    ${template}=    Get File    jsons/CreateNsRequest.json 
-    ${body}=        Format String   ${template}     nsdId=${nsdId}   nsInstanceName=${nsInstanceName}   vimAccountId=${vimAccountId}   nsInstanceDescription=${nsInstanceDescription}
-    Dictionaries Should Be Equal    ${resp_dict}    ${body}    values=True
-    
 Check HTTP Response Header Contains
     [Arguments]    ${HEADER_TOCHECK}
     Should Contain     ${response['headers']}    ${HEADER_TOCHECK}
@@ -294,6 +280,13 @@ Get NSInstances with fields attribute selector
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances?fields=${fields}
     ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+Get NSInstances with fields and exclude_default attribute selector
+    Log    Get the list of NSInstances, using fields
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances?fields=${fields}&exclude_default
+    ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 Get NSInstances with exclude_fields attribute selector
     Log    Get the list of NSInstances, using fields
@@ -684,6 +677,13 @@ Get NS LCM OP Occurrences with fields attribute selector
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs?fields=${fields}
     ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+Get NS LCM OP Occurrences with fields and exclude_default attribute selector
+    Log    Query status information about multiple NS lifecycle management operation occurrences, using fields
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs?fields=${fields}&exclude_default
+    ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 Get NS LCM OP Occurrences with exclude_fields attribute selector
     Log    Query status information about multiple NS lifecycle management operation occurrences, using fields
diff --git a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
index 942c47487..5f5ad8950 100644
--- a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
@@ -55,7 +55,7 @@ PUT Terminate NSInstance - Method not implemented
     ...    Reference: Clause 6.4.8.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: resource state not modified
+    ...    Post-Conditions: none
     PUT Terminate NSInstance
     Check HTTP Response Status Code Is    405
     
@@ -67,7 +67,7 @@ PATCH Terminate NSInstance - Method not implemented
     ...    Reference: Clause 6.4.8.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: resource state not modified
+    ...    Post-Conditions: none
     PATCH Terminate NSInstance
     Check HTTP Response Status Code Is    405
 
@@ -79,8 +79,6 @@ DELETE Terminate NSInstance - Method not implemented
     ...    Reference: Clause 6.4.8.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: resource state not modified
+    ...    Post-Conditions: none
     DELETE Terminate NSInstance
-    Check HTTP Response Status Code Is    405
-    
-    
\ No newline at end of file
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot b/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot
index 171fac57a..eafae6ae1 100644
--- a/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot
@@ -54,7 +54,7 @@ PUT Update NSInstance - Method not implemented
     ...    Reference: Clause 6.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The  NS instance is not updated on the NFVO
+    ...    Post-Conditions: none
     PUT Update NSInstance
     Check HTTP Response Status Code Is    405
     
@@ -66,7 +66,7 @@ PATCH Update NSInstance - Method not implemented
     ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The  NS instance is not updated on the NFVO
+    ...    Post-Conditions: none
     PATCH Update NSInstance
     Check HTTP Response Status Code Is    405
 
@@ -78,8 +78,6 @@ DELETE Update NSInstance - Method not implemented
     ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The  NS instance is not deleted on the NFVO
+    ...    Post-Conditions: none
     DELETE Update NSInstance
-    Check HTTP Response Status Code Is    405
-    
-    
\ No newline at end of file
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
-- 
GitLab


From 9dd75a2933a81b6ebb604ee1ba9577ba9c2d1c36 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Mon, 2 Nov 2020 12:53:02 +0500
Subject: [PATCH 122/322] deltas for 2.7.1 SOL005 PM added

---
 .../IndividualPmJob.robot                     |  26 ++-
 .../IndividualSubscription.robot              | 102 ----------
 .../IndividualThreshold.robot                 |  31 ++-
 .../NSPerformanceManagementKeywords.robot     |  24 +--
 .../Subscriptions.robot                       | 182 ------------------
 .../environment/individualSubscription.txt    |   6 -
 .../environment/subscriptions.txt             |   4 -
 .../environment/variables.txt                 |   5 +-
 .../jsons/PmJobModifications.json             |   3 +
 .../jsons/ThresholdModifications.json         |   3 +
 .../jsons/subscriptions.json                  |   6 -
 .../schemas/PmJobModifications.json           |  64 ++++++
 .../schemas/PmSubscription.schema.json        | 105 ----------
 .../schemas/PmSubscriptions.schema.json       | 108 -----------
 .../schemas/ThresholdModifications.json       |  64 ++++++
 15 files changed, 188 insertions(+), 545 deletions(-)
 delete mode 100644 SOL005/NSPerformanceManagement-API/IndividualSubscription.robot
 delete mode 100644 SOL005/NSPerformanceManagement-API/Subscriptions.robot
 delete mode 100644 SOL005/NSPerformanceManagement-API/environment/individualSubscription.txt
 delete mode 100644 SOL005/NSPerformanceManagement-API/environment/subscriptions.txt
 create mode 100644 SOL005/NSPerformanceManagement-API/jsons/PmJobModifications.json
 create mode 100644 SOL005/NSPerformanceManagement-API/jsons/ThresholdModifications.json
 delete mode 100644 SOL005/NSPerformanceManagement-API/jsons/subscriptions.json
 create mode 100644 SOL005/NSPerformanceManagement-API/schemas/PmJobModifications.json
 delete mode 100644 SOL005/NSPerformanceManagement-API/schemas/PmSubscription.schema.json
 delete mode 100644 SOL005/NSPerformanceManagement-API/schemas/PmSubscriptions.schema.json
 create mode 100644 SOL005/NSPerformanceManagement-API/schemas/ThresholdModifications.json

diff --git a/SOL005/NSPerformanceManagement-API/IndividualPmJob.robot b/SOL005/NSPerformanceManagement-API/IndividualPmJob.robot
index 7ab7999b9..8eb28fd4a 100644
--- a/SOL005/NSPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL005/NSPerformanceManagement-API/IndividualPmJob.robot
@@ -70,17 +70,18 @@ PUT Individual NS Performance Job - Method not implemented
     Send Put request for individual NS Performance Job
     Check HTTP Response Status Code Is    405
 
-PATCH Individual NS Performance Job - Method not implemented
+PATCH Individual NS Performance Job 
     [Documentation]    Test ID: 5.3.4.2.6
-    ...    Test title: PATCH Individual NS Performance Job - method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing new NS Performance Monitoring Job
+    ...    Test title: PATCH Individual NS Performance Job 
+    ...    Test objective: The objective is to test that PATCH method modify an existing new NS Performance Monitoring Job
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
     ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: none
+    ...    Post-Conditions: Resource modified
     Send Patch request for individual NS Performance Job
-    Check HTTP Response Status Code Is    405
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is     PmJobModifications
 
 DELETE Individual NS Performance Job
     [Documentation]    Test ID: 5.3.4.2.7
@@ -93,4 +94,17 @@ DELETE Individual NS Performance Job
     ...    Post-Conditions: The NS Performance Job is no more available in the NFVO    
     Send Delete request for individual NS Performance Job
     Check HTTP Response Status Code Is    204
-    Check Postcondition NS Pm Job is Deleted
\ No newline at end of file
+    Check Postcondition NS Pm Job is Deleted
+    
+PATCH Individual NS Performance Job - Precondition failed
+    [Documentation]    Test ID: 5.3.4.2.8
+    ...    Test title: PATCH Individual NS Performance Job - Precondition failed
+    ...    Test objective: The objective is to attempt to Modify an individual NS Performance job fails, where the precondition was not met
+    ...    Pre-conditions: The related job already exsisit
+    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: The resource is not modified
+    Send Patch request for individual NS Performance Job
+    Check HTTP Response Status Code Is    412
+    Check HTTP Response Body Json Schema Is     ProblemDetails
\ No newline at end of file
diff --git a/SOL005/NSPerformanceManagement-API/IndividualSubscription.robot b/SOL005/NSPerformanceManagement-API/IndividualSubscription.robot
deleted file mode 100644
index 02370945f..000000000
--- a/SOL005/NSPerformanceManagement-API/IndividualSubscription.robot
+++ /dev/null
@@ -1,102 +0,0 @@
-*** Settings ***
-Documentation     This resource represents an individual subscription for notifications about performance management related events.
-...               The client can use this resource to read and to terminate a subscription to notifications related to NS performance
-...               management.
-Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt    # Generic Parameters
-Resource          NSPerformanceManagementKeywords.robot
-Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
-Library           OperatingSystem
-Library           JSONLibrary
-Resource          environment/individualSubscription.txt
-
-*** Test Cases ***
-GET Individual NS Performance Subscription
-    [Documentation]    Test ID: 5.3.4.7.1
-    ...    Test title: GET Individual NS Performance Subscription
-    ...    Test objective: The objective is to test the retrieval of individual NS Performance subscription and perform a JSON schema and content validation of the returned subscription data structure
-    ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Individual NS Performance Subscription
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is   PkgmSubscription
-    Check HTTP Response Body Subscription Identifier matches the requested Subscription
-
-GET Individual NS Performance Subscription with invalid resource identifier
-    [Documentation]    Test ID: 5.3.4.7.2
-    ...    Test title: GET Individual NS Performance Subscription with invalid resource identifier
-    ...    Test objective: The objective is to test that the retrieval of an individual NS Performance subscription fails when using an invalid resource identifier
-    ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    GET individual NS Performance Subscription with invalid resource identifier
-    Check HTTP Response Status Code Is    404
-
-DELETE Individual NS Performance Subscription with invalid resource identifier
-    [Documentation]    Test ID: 5.3.4.7.3
-    ...    Test title: DELETE Individual NS Performance Subscription with invalid resource identifier
-    ...    Test objective: The objective is to test that the deletion of an individual NS Performance subscription fails when using an invalid resource identifier
-    ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.8.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none   
-    Send Delete request for individual NS Performance Subscription with invalid resource identifier
-    Check HTTP Response Status Code Is    404
-
-POST Individual NS Performance Subscription - Method not implemented
-    [Documentation]    Test ID: 5.3.4.7.4
-    ...    Test title: POST Individual NS Performance Subscription - Method not implemented
-    ...    Test objective: The objective is to test that POST method is not allowed to create a new NS Performance Subscription
-    ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: The NS Performance Subscription is not created on the NFVO
-    Send Post request for individual NS Performance Subscription
-    Check HTTP Response Status Code Is    405
-    Check Postcondition NS Performance Subscription is not Created
-
-PUT Individual NS Performance Subscription - Method not implemented
-    [Documentation]    Test ID: 5.3.4.7.5
-    ...    Test title: PUT Individual NS Performance Subscription - Method not implemented
-    ...    Test objective: The objective is to test that PUT method is not allowed to update an existing NS Performance subscription
-    ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.8.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: The NS Performance subscription is not modified by the operation
-    Send Put request for individual NS Performance Subscription
-    Check HTTP Response Status Code Is    405
-    Check Postcondition NS Performance Subscription is Unmodified (Implicit)
-
-PATCH Individual NS Performance Subscription - Method not implemented
-    [Documentation]    Test ID: 5.3.4.7.6
-    ...    Test title: PATCH Individual NS Performance Subscription - Method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing NS Performance subscription
-    ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.8.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: The NS Performance subscription is not modified by the operation
-    Send Patch request for individual NS Performance Subscription
-    Check HTTP Response Status Code Is    405
-    Check Postcondition NS Performance Subscription is Unmodified (Implicit)
-
-DELETE Individual NS Performance Subscription
-    [Documentation]    Test ID: 5.3.4.7.7
-    ...    Test title: DELETE Individual NS Performance Subscription
-    ...    Test objective: The objective is to test the deletion of an individual NS Performance subscription
-    ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.8.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: The NS Performance Subscription is not available anymore in the NFVO    
-    Send Delete request for individual NS Performance Subscription
-    Check HTTP Response Status Code Is    204
-    Check Postcondition NS Performance Subscription is Deleted
\ No newline at end of file
diff --git a/SOL005/NSPerformanceManagement-API/IndividualThreshold.robot b/SOL005/NSPerformanceManagement-API/IndividualThreshold.robot
index 2be5fdb3e..57458c1b0 100644
--- a/SOL005/NSPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL005/NSPerformanceManagement-API/IndividualThreshold.robot
@@ -34,6 +34,7 @@ GET Individual Threshold with invalid resource identifier
     ...    Post-Conditions: none
     GET individual NS performance Threshold with invalid resource identifier
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
 
 DELETE Individual Threshold with invalid resource identifier
     [Documentation]    Test ID: 5.3.4.5.3
@@ -55,10 +56,9 @@ POST Individual Threshold - Method not implemented
     ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS performance Threshold is not created on the NFVO
+    ...    Post-Conditions: none
     Send Post request for individual NS performance Threshold
     Check HTTP Response Status Code Is    405
-    Check Postcondition NS performance Threshold is not Created
 
 PUT Individual Threshold - Method not implemented
     [Documentation]    Test ID: 5.3.4.5.5
@@ -68,22 +68,22 @@ PUT Individual Threshold - Method not implemented
     ...    Reference: Clause 7.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS performance Threshold is not modified by the operation
+    ...    Post-Conditions: none
     Send Put request for individual NS performance Threshold
     Check HTTP Response Status Code Is    405
-    Check Postcondition NS performance Threshold is Unmodified (Implicit)
 
-PATCH Individual Threshold - Method not implemented
+PATCH Individual Threshold 
     [Documentation]    Test ID: 5.3.4.5.6
-    ...    Test title: PATCH Individual Threshold - Method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing NS performance threshold
+    ...    Test title: PATCH Individual Threshold 
+    ...    Test objective: The objective is to test that PATCH method modify an existing NS performance threshold
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
     ...    Reference: Clause 7.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS performance Threshold is not modified by the operation
+    ...    Post-Conditions: The NS performance Threshold is modified by the operation
     Send Patch request for individual NS performance Threshold
-    Check HTTP Response Status Code Is    405
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    ThresholdModifications
     Check Postcondition NS performance Threshold is Unmodified (Implicit)
 
 DELETE Individual Threshold
@@ -99,3 +99,16 @@ DELETE Individual Threshold
     Check HTTP Response Status Code Is    204
     Check Postcondition NS performance Threshold is Deleted
 
+PATCH Individual Threshold - Precondition failed 
+    [Documentation]    Test ID: 5.3.4.5.8
+    ...    Test title: PATCH Individual Threshold - Precondition failed 
+    ...    Test objective: The objective is to attempt to Modify an individual NS Performance threshold fails, where the precondition was not met
+    ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
+    ...    Reference: Clause 7.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: The NS performance Threshold is not modified by the operation
+    Send Patch request for individual NS performance Threshold
+    Check HTTP Response Status Code Is    412
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+    Check Postcondition NS performance Threshold is Unmodified (Implicit)
\ No newline at end of file
diff --git a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
index fcf0c3523..0d50c014e 100644
--- a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
+++ b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
@@ -236,10 +236,12 @@ Send Put request for individual NS Performance Job
     Set Suite Variable    ${response}    ${output}
     
 Send Patch request for individual NS Performance Job    
-    Log    Trying to perform a PATCH (method should not be implemented)
+    Log    Trying to perform a PATCH 
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+    ${body}=    Get File    jsons/PmJobModifications.json
+    PATCH    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -380,7 +382,7 @@ Send Post Request Create new Performance Threshold
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${template}=    Get File    jsons/CreateThresholdRequest.json
     ${body}=        Format String   ${template}     pmJobId=${pmJobId}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/thresholds    ${request}
+    POST    ${apiRoot}/${apiName}/${apiVersion}/thresholds    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -480,11 +482,10 @@ Send Put request for individual NS performance Threshold
 Send Patch request for individual NS performance Threshold
     Log    Trying to PUT threshold
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
-    ${origOutput}=    Output    response
-    Set Suite Variable    ${origResponse}    ${origOutput}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
+    ${body}=    Get File    jsons/ThresholdModifications.json
+    PATCH    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -495,15 +496,6 @@ Check Postcondition NS performance Threshold is Unmodified (Implicit)
     ${threshold}=    evaluate    json.loads('''${response['body']}''')    json
     Should Be Equal    ${origresponse['body']['id']}    ${threshold.id}
     Should Be Equal    ${origresponse['body']['criteria']}    ${threshold.criteria}
-    
-Check Postcondition NS performance Threshold is not Created
-    Log    Trying to get a new Threshold
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${newThresholdId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    Check HTTP Response Status Code Is    404
 
 Check Postcondition NS performance Threshold is Deleted
     Log    Check Postcondition Threshold is deleted
diff --git a/SOL005/NSPerformanceManagement-API/Subscriptions.robot b/SOL005/NSPerformanceManagement-API/Subscriptions.robot
deleted file mode 100644
index 3f97d8afe..000000000
--- a/SOL005/NSPerformanceManagement-API/Subscriptions.robot
+++ /dev/null
@@ -1,182 +0,0 @@
-*** Settings ***
-Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/subscriptions.txt
-Resource          NSPerformanceManagementKeywords.robot
-Library           OperatingSystem
-Library           JSONSchemaLibrary    schemas/
-Library           JSONLibrary
-Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
-Library           MockServerLibrary
-Library           Process
-Suite Setup       Create Sessions
-Suite Teardown    Terminate All Processes    kill=true
-
-*** Test Cases ***
-Get All NS Performance Subscriptions
-    [Documentation]    Test ID: 5.3.4.6.1
-    ...    Test title: Get All NS Performance Subscriptions
-    ...    Test objective: The objective is to test the retrieval of all NS Performance subscriptions and perform a JSON schema validation of the returned subscriptions data structure
-    ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    Get all NS Performance Subscriptions
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    PmSubscriptions
-
-
-Get NS Performance Subscriptions with attribute-based filter
-    [Documentation]    Test ID: 5.3.4.6.2
-    ...    Test title: Get NS Performance Subscriptions with attribute-based filter
-    ...    Test objective: The objective is to test the retrieval of NS Performance subscriptions using attribute-based filter, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued attribute-based filters 
-    ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get NS Performance Subscriptions with attribute-based filters
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    PmSubscriptions
-    Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filter
-
-
-Get NS Performance Subscriptions with invalid attribute-based filter
-    [Documentation]    Test ID: 5.3.4.6.3
-    ...    Test title: Get NS Performance Subscriptions with attribute-based filters
-    ...    Test objective: The objective is to test that the retrieval of NS Performance subscriptions fails when using invalid attribute-based filters, and perform the JSON schema validation of the failed operation HTTP response. 
-    ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get NS Performance Subscriptions with invalid attribute-based filters
-    Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is   ProblemDetails 
-
-
-GET NS Performance Subscription with invalid resource endpoint
-    [Documentation]    Test ID: 5.3.4.6.4
-    ...    Test title: GET NS Performance Subscription with invalid resource endpoint
-    ...    Test objective: The objective is to test that the retrieval of all NS Performance subscriptions fails when using invalid resource endpoint.
-    ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none   
-    Get NS Performance Subscriptions with invalid resource endpoint
-    Check HTTP Response Status Code Is    404
-    
-
-Create new NS Performance subscription
-    [Documentation]    Test ID: 5.3.4.6.5
-    ...    Test title: Create new NS Performance subscription
-    ...    Test objective: The objective is to test the creation of a new NS Performance subscription and perform a JSON schema and content validation of the returned subscription data structure
-    ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: The NS Performance subscription is successfully set and it matches the issued subscription
-    Send Post Request for NS Performance Subscription
-    Check HTTP Response Status Code Is    201
-    Check HTTP Response Body Json Schema Is    PmSubscription
-    Check HTTP Response Body PmSubscription Attributes Values Match the Issued Subscription
-    Check Postcondition NS Performance Subscription Is Set
-    
-
-Create duplicated NS Performance subscription with NFVO not creating duplicated subscriptions
-    [Tags]    no-duplicated-subs
-    [Documentation]    Test ID: 5.3.4.6.6
-    ...    Test title: Create duplicated NS Performance subscription with NFVO not creating duplicated subscriptions
-    ...    Test objective: The objective is to test the attempt of a creation of a duplicated NS Performance subscription and check that no new subscription is created by the NFVO and a link to the original subscription is returned
-    ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The NFVO does not support the creation of duplicated subscriptions
-    ...    Post-Conditions: The existing NS Performance subscription returned is available in the NFVO
-    Send Post Request for Duplicated NS Performance Subscription
-    Check HTTP Response Status Code Is    303
-    Check HTTP Response Body Is Empty
-    Check HTTP Response Header Contains    Location
-    Check Postcondition Subscription Resource URI Returned in Location Header Is Available
-
-Create duplicated NS Performance subscription with NFVO creating duplicated subscriptions
-    [Tags]    duplicated-subs
-    [Documentation]    Test ID: 5.3.4.6.7
-    ...    Test title: Create duplicated NS Performance subscription with NFVO creating duplicated subscriptions
-    ...    Test objective: The objective is to test the creation of a duplicated NS Performance subscription and perform a JSON schema and content validation of the returned duplicated subscription data structure
-    ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The NFVO supports the creation of duplicated subscriptions
-    ...    Post-Conditions: The duplicated NS Performance subscription is successfully set and it matches the issued subscription    
-    Send Post Request for Duplicated NS Performance Subscription
-    Check HTTP Response Status Code Is    201
-    Check HTTP Response Body Json Schema Is    PmSubscription
-    Check HTTP Response Body PmSubscription Attributes Values Match the Issued Subscription
-    Check Postcondition NS Performance Subscription Is Set 
-
-
-PUT NSD Performance Subscriptions - Method not implemented
-    [Documentation]    Test ID: 5.3.4.6.8
-    ...    Test title: PUT NS Performance Subscriptions - Method not implemented
-    ...    Test objective: The objective is to test that PUT method is not allowed to modify NS Performance subscriptions
-    ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send Put Request for NS Performance Subscriptions
-    Check HTTP Response Status Code Is    405
-    
-    
-PATCH NSD Performance Subscriptions - Method not implemented
-    [Documentation]    Test ID: 5.3.4.6.9
-    ...    Test title: PATCH NS Performance Subscriptions - Method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to update NS Performance subscriptions
-    ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none   
-    Send Patch Request for NS Performance Subscriptions
-    Check HTTP Response Status Code Is    405
-    
-        
-DELETE NSD Performance Subscriptions - Method not implemented
-    [Documentation]    Test ID: 5.3.4.6.10
-    ...    Test title: DELETE NS Performance Subscriptions - Method not implemented
-    ...    Test objective: The objective is to test that DELETE method is not allowed to delete NS Performance subscriptions
-    ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.7.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: The NS Performance subscriptions are not deleted by the failed operation 
-    Send Delete Request for NS Performance Subscriptions
-    Check HTTP Response Status Code Is    405
-
-Get All NS Performance Subscriptions as Paged Response
-    [Documentation]    Test ID: 5.3.4.6.11
-    ...    Test title: Get All NS Performance Subscriptions as Paged Response
-    ...    Test objective: The objective is to test the retrieval of all NS Performance subscriptions as paged response.
-    ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    Get all NS Performance Subscriptions
-    Check HTTP Response Status Code Is    200
-    Check LINK in Header
-
-Get NS Performance Subscriptions - Bad Request Response too Big
-    [Documentation]    Test ID: 5.3.4.6.12
-    ...    Test title: Get NS Performance Subscriptions - Bad Request Response too Big
-    ...    Test objective: The objective is to test that the retrieval of NS Performance subscriptions fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response. 
-    ...    Pre-conditions: At least one NS Performance subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get all NS Performance Subscriptions
-    Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is   ProblemDetails
\ No newline at end of file
diff --git a/SOL005/NSPerformanceManagement-API/environment/individualSubscription.txt b/SOL005/NSPerformanceManagement-API/environment/individualSubscription.txt
deleted file mode 100644
index db29963df..000000000
--- a/SOL005/NSPerformanceManagement-API/environment/individualSubscription.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-*** Variables ***
-${subscriptionId}    17563e75-0e14-4bd7-94b4-6bbb869c79aa
-${erroneousSubscriptionId}    erroneousSubscriptionId
-${newSubscriptionId}    newSubsciptionId
-${response}    httpresponse
-${origResponse}    httpresponse
diff --git a/SOL005/NSPerformanceManagement-API/environment/subscriptions.txt b/SOL005/NSPerformanceManagement-API/environment/subscriptions.txt
deleted file mode 100644
index 78a574197..000000000
--- a/SOL005/NSPerformanceManagement-API/environment/subscriptions.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-*** Variables ***
-${filter_ok}      callbackUri=http://localhost/subscriptions
-${filter_ko}      erroneousFilter=erroneous
-${SEPERATOR}      =
diff --git a/SOL005/NSPerformanceManagement-API/environment/variables.txt b/SOL005/NSPerformanceManagement-API/environment/variables.txt
index ca012fa80..30f5de744 100644
--- a/SOL005/NSPerformanceManagement-API/environment/variables.txt
+++ b/SOL005/NSPerformanceManagement-API/environment/variables.txt
@@ -31,4 +31,7 @@ ${thresholdType}        SIMPLE
 ${thresholdValue}       10
 ${hysteresis}           50
 ${collectionPeriod}     10
-${reportingPeriod}      30
\ No newline at end of file
+${reportingPeriod}      30
+
+${response}    {}
+${CONTENT_TYPE_PATCH}    application/merge-patch+json
\ No newline at end of file
diff --git a/SOL005/NSPerformanceManagement-API/jsons/PmJobModifications.json b/SOL005/NSPerformanceManagement-API/jsons/PmJobModifications.json
new file mode 100644
index 000000000..f66ab98ec
--- /dev/null
+++ b/SOL005/NSPerformanceManagement-API/jsons/PmJobModifications.json
@@ -0,0 +1,3 @@
+{
+	"callbackUri": ""
+}
\ No newline at end of file
diff --git a/SOL005/NSPerformanceManagement-API/jsons/ThresholdModifications.json b/SOL005/NSPerformanceManagement-API/jsons/ThresholdModifications.json
new file mode 100644
index 000000000..60c7f184d
--- /dev/null
+++ b/SOL005/NSPerformanceManagement-API/jsons/ThresholdModifications.json
@@ -0,0 +1,3 @@
+{
+	"callbackUri":""
+}
\ No newline at end of file
diff --git a/SOL005/NSPerformanceManagement-API/jsons/subscriptions.json b/SOL005/NSPerformanceManagement-API/jsons/subscriptions.json
deleted file mode 100644
index 3ca4fc25a..000000000
--- a/SOL005/NSPerformanceManagement-API/jsons/subscriptions.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{{
-	"callbackUri": "{callback_uri}{callback_endpoint}",
-	"filter": {{
-		"notificationTypes": ["ThresholdCrossedNotification"]
-	}}
-}}
\ No newline at end of file
diff --git a/SOL005/NSPerformanceManagement-API/schemas/PmJobModifications.json b/SOL005/NSPerformanceManagement-API/schemas/PmJobModifications.json
new file mode 100644
index 000000000..26910ec0a
--- /dev/null
+++ b/SOL005/NSPerformanceManagement-API/schemas/PmJobModifications.json
@@ -0,0 +1,64 @@
+{
+    "description": "This type represents modifications to a PM job. It shall comply with the provisions defined in Table 7.5.2.12-1.\n",
+    "type": "object",
+    "properties": {
+      "callbackUri": {
+        "description": "String formatted according to IETF RFC 3986.\n",
+        "type": "string",
+        "format": "uri"
+      },
+      "authentication": {
+        "type": "object",
+        "required": [
+          "authType"
+        ],
+        "properties": {
+          "authType": {
+            "description": "Defines the types of Authentication / Authorization which the API consumer is willing to accept when receiving a notification. Permitted values: - BASIC: In every HTTP request to the notification endpoint, use\n  HTTP Basic authentication with the client credentials.\n- OAUTH2_CLIENT_CREDENTIALS: In every HTTP request to the\n  notification endpoint, use an OAuth 2.0 Bearer token, obtained\n  using the client credentials grant type.\n- TLS_CERT: Every HTTP request to the notification endpoint is sent\n  over a mutually authenticated TLS session, i.e. not only the\n  server is authenticated, but also the client is authenticated\n  during the TLS tunnel setup.\n",
+            "type": "array",
+            "items": {
+              "type": "string",
+              "enum": [
+                "BASIC",
+                "OAUTH2_CLIENT_CREDENTIALS",
+                "TLS_CERT"
+              ]
+            }
+          },
+          "paramsBasic": {
+            "description": "Parameters for authentication/authorization using BASIC. Shall be present if authType is \"BASIC\" and the contained information has not been provisioned out of band. Shall be absent otherwise.\n",
+            "type": "object",
+            "properties": {
+              "userName": {
+                "description": "Username to be used in HTTP Basic authentication. Shall be present if it has not been provisioned out of band.\n",
+                "type": "string"
+              },
+              "password": {
+                "description": "Password to be used in HTTP Basic authentication. Shall be present if it has not been provisioned out of band.\n",
+                "type": "string"
+              }
+            }
+          },
+          "paramsOauth2ClientCredentials": {
+            "description": "Parameters for authentication/authorization using OAUTH2_CLIENT_CREDENTIALS. Shall be present if authType is \"OAUTH2_CLIENT_CREDENTIALS\" and the contained information has not been provisioned out of band. Shall be absent otherwise.\n",
+            "type": "object",
+            "properties": {
+              "clientId": {
+                "description": "Client identifier to be used in the access token request of the OAuth 2.0 client credentials grant type. Shall be present if it has not been provisioned out of band. The clientId and clientPassword passed in a subscription shall not be the same as the clientId and clientPassword that are used to obtain authorization for API requests. Client credentials may differ between subscriptions. The value of clientPassword should be generated by a random process.\n",
+                "type": "string"
+              },
+              "clientPassword": {
+                "description": "Client password to be used in the access token request of the OAuth 2.0 client credentials grant type. Shall be present if it has not been provisioned out of band. The clientId and clientPassword passed in a subscription shall not be the same as the clientId and clientPassword that are used to obtain authorization for API requests. Client credentials may differ between subscriptions. The value of clientPassword should be generated by a random process.\n",
+                "type": "string"
+              },
+              "tokenEndpoint": {
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string",
+                "format": "uri"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
\ No newline at end of file
diff --git a/SOL005/NSPerformanceManagement-API/schemas/PmSubscription.schema.json b/SOL005/NSPerformanceManagement-API/schemas/PmSubscription.schema.json
deleted file mode 100644
index 8fc48f07f..000000000
--- a/SOL005/NSPerformanceManagement-API/schemas/PmSubscription.schema.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-  "description": "This type represents a subscription.\n",
-  "type": "object",
-  "required": [
-    "id",
-    "callbackUri",
-    "_links"
-  ],
-  "properties": {
-    "id": {
-      "description": "An identifier with the intention of being globally unique.\n",
-      "type": "string"
-    },
-    "filter": {
-      "description": "This type represents a filter that can be used to subscribe for  notifications related to performance management events. It shall comply with the provisions defined in Table 7.5.3.2-1. At a particular nesting level in the filter structure, the following applies:  All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes).  If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n",
-      "type": "object",
-      "properties": {
-        "nsInstanceSubscriptionFilter": {
-          "description": "This type represents subscription filter criteria to match NS instances.\n",
-          "type": "object",
-          "properties": {
-            "nsdIds": {
-              "description": "If present, match NS instances that were created based on a NSD identified by one of the nsdId values listed in this attribute.\n",
-              "type": "array",
-              "items": {
-                "description": "An identifier with the intention of being globally unique.\n",
-                "type": "string"
-              }
-            },
-            "vnfdIds": {
-              "description": "If present, match NS instances that contain VNF instances that were created based on a VNFD identified by one of the vnfdId values listed in this attribute.\n",
-              "type": "array",
-              "items": {
-                "description": "An identifier with the intention of being globally unique.\n",
-                "type": "string"
-              }
-            },
-            "pnfdIds": {
-              "description": "If present, match NS instances that contain PNFs that are represented by a PNFD identified by one of the pnfdId values listed in this attribute.\n",
-              "type": "array",
-              "items": {
-                "description": "An identifier with the intention of being globally unique.\n",
-                "type": "string"
-              }
-            },
-            "nsInstanceIds": {
-              "description": "If present, match NS instances with an instance identifier listed in this attribute.\n",
-              "type": "array",
-              "items": {
-                "description": "An identifier with the intention of being globally unique.\n",
-                "type": "string"
-              }
-            },
-            "nsInstanceNames": {
-              "description": "If present, match NS instances with a NS Instance Name listed in this attribute.\n",
-              "type": "array",
-              "items": {
-                "description": "This type represents stack of string values\n",
-                "type": "string"
-              }
-            }
-          }
-        },
-        "notificationTypes": {
-          "description": "Match particular notification types. Permitted values: - ThresholdCrossedNotification - PerformanceInformationAvailableNotification The permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.          \n",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "enum": [
-              "ThresholdCrossedNotification",
-              "PerformanceInformationAvailableNotification"
-            ]
-          }
-        }
-      }
-    },
-    "callbackUri": {
-      "description": "String formatted according to IETF RFC 3986.\n",
-      "type": "string"
-    },
-    "_links": {
-      "description": "Links to resources related to this resource.\n",
-      "type": "object",
-      "required": [
-        "self"
-      ],
-      "properties": {
-        "self": {
-          "description": "This type represents a link to a resource.\n",
-          "type": "object",
-          "required": [
-            "href"
-          ],
-          "properties": {
-            "href": {
-              "description": "URI of the referenced resource.\n",
-              "type": "string",
-              "format": "url"
-            }
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/SOL005/NSPerformanceManagement-API/schemas/PmSubscriptions.schema.json b/SOL005/NSPerformanceManagement-API/schemas/PmSubscriptions.schema.json
deleted file mode 100644
index afe99ab68..000000000
--- a/SOL005/NSPerformanceManagement-API/schemas/PmSubscriptions.schema.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-  "type": "array",
-  "items": {
-    "description": "This type represents a subscription.\n",
-    "type": "object",
-    "required": [
-      "id",
-      "callbackUri",
-      "_links"
-    ],
-    "properties": {
-      "id": {
-        "description": "An identifier with the intention of being globally unique.\n",
-        "type": "string"
-      },
-      "filter": {
-        "description": "This type represents a filter that can be used to subscribe for  notifications related to performance management events. It shall comply with the provisions defined in Table 7.5.3.2-1. At a particular nesting level in the filter structure, the following applies:  All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes).  If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n",
-        "type": "object",
-        "properties": {
-          "nsInstanceSubscriptionFilter": {
-            "description": "This type represents subscription filter criteria to match NS instances.\n",
-            "type": "object",
-            "properties": {
-              "nsdIds": {
-                "description": "If present, match NS instances that were created based on a NSD identified by one of the nsdId values listed in this attribute.\n",
-                "type": "array",
-                "items": {
-                  "description": "An identifier with the intention of being globally unique.\n",
-                  "type": "string"
-                }
-              },
-              "vnfdIds": {
-                "description": "If present, match NS instances that contain VNF instances that were created based on a VNFD identified by one of the vnfdId values listed in this attribute.\n",
-                "type": "array",
-                "items": {
-                  "description": "An identifier with the intention of being globally unique.\n",
-                  "type": "string"
-                }
-              },
-              "pnfdIds": {
-                "description": "If present, match NS instances that contain PNFs that are represented by a PNFD identified by one of the pnfdId values listed in this attribute.\n",
-                "type": "array",
-                "items": {
-                  "description": "An identifier with the intention of being globally unique.\n",
-                  "type": "string"
-                }
-              },
-              "nsInstanceIds": {
-                "description": "If present, match NS instances with an instance identifier listed in this attribute.\n",
-                "type": "array",
-                "items": {
-                  "description": "An identifier with the intention of being globally unique.\n",
-                  "type": "string"
-                }
-              },
-              "nsInstanceNames": {
-                "description": "If present, match NS instances with a NS Instance Name listed in this attribute.\n",
-                "type": "array",
-                "items": {
-                  "description": "This type represents stack of string values\n",
-                  "type": "string"
-                }
-              }
-            }
-          },
-          "notificationTypes": {
-            "description": "Match particular notification types. Permitted values: - ThresholdCrossedNotification - PerformanceInformationAvailableNotification The permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.          \n",
-            "type": "array",
-            "items": {
-              "type": "string",
-              "enum": [
-                "ThresholdCrossedNotification",
-                "PerformanceInformationAvailableNotification"
-              ]
-            }
-          }
-        }
-      },
-      "callbackUri": {
-        "description": "String formatted according to IETF RFC 3986.\n",
-        "type": "string"
-      },
-      "_links": {
-        "description": "Links to resources related to this resource.\n",
-        "type": "object",
-        "required": [
-          "self"
-        ],
-        "properties": {
-          "self": {
-            "description": "This type represents a link to a resource.\n",
-            "type": "object",
-            "required": [
-              "href"
-            ],
-            "properties": {
-              "href": {
-                "description": "URI of the referenced resource.\n",
-                "type": "string",
-                "format": "url"
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/SOL005/NSPerformanceManagement-API/schemas/ThresholdModifications.json b/SOL005/NSPerformanceManagement-API/schemas/ThresholdModifications.json
new file mode 100644
index 000000000..4b011194f
--- /dev/null
+++ b/SOL005/NSPerformanceManagement-API/schemas/ThresholdModifications.json
@@ -0,0 +1,64 @@
+{
+    "description": "This type represents modifications to a threshold. It shall comply with the provisions defined in Table 7.5.2.11-1.\n",
+    "type": "object",
+    "properties": {
+      "callbackUri": {
+        "description": "String formatted according to IETF RFC 3986.\n",
+        "type": "string",
+        "format": "uri"
+      },
+      "authentication": {
+        "type": "object",
+        "required": [
+          "authType"
+        ],
+        "properties": {
+          "authType": {
+            "description": "Defines the types of Authentication / Authorization which the API consumer is willing to accept when receiving a notification. Permitted values: - BASIC: In every HTTP request to the notification endpoint, use\n  HTTP Basic authentication with the client credentials.\n- OAUTH2_CLIENT_CREDENTIALS: In every HTTP request to the\n  notification endpoint, use an OAuth 2.0 Bearer token, obtained\n  using the client credentials grant type.\n- TLS_CERT: Every HTTP request to the notification endpoint is sent\n  over a mutually authenticated TLS session, i.e. not only the\n  server is authenticated, but also the client is authenticated\n  during the TLS tunnel setup.\n",
+            "type": "array",
+            "items": {
+              "type": "string",
+              "enum": [
+                "BASIC",
+                "OAUTH2_CLIENT_CREDENTIALS",
+                "TLS_CERT"
+              ]
+            }
+          },
+          "paramsBasic": {
+            "description": "Parameters for authentication/authorization using BASIC. Shall be present if authType is \"BASIC\" and the contained information has not been provisioned out of band. Shall be absent otherwise.\n",
+            "type": "object",
+            "properties": {
+              "userName": {
+                "description": "Username to be used in HTTP Basic authentication. Shall be present if it has not been provisioned out of band.\n",
+                "type": "string"
+              },
+              "password": {
+                "description": "Password to be used in HTTP Basic authentication. Shall be present if it has not been provisioned out of band.\n",
+                "type": "string"
+              }
+            }
+          },
+          "paramsOauth2ClientCredentials": {
+            "description": "Parameters for authentication/authorization using OAUTH2_CLIENT_CREDENTIALS. Shall be present if authType is \"OAUTH2_CLIENT_CREDENTIALS\" and the contained information has not been provisioned out of band. Shall be absent otherwise.\n",
+            "type": "object",
+            "properties": {
+              "clientId": {
+                "description": "Client identifier to be used in the access token request of the OAuth 2.0 client credentials grant type. Shall be present if it has not been provisioned out of band. The clientId and clientPassword passed in a subscription shall not be the same as the clientId and clientPassword that are used to obtain authorization for API requests. Client credentials may differ between subscriptions. The value of clientPassword should be generated by a random process.\n",
+                "type": "string"
+              },
+              "clientPassword": {
+                "description": "Client password to be used in the access token request of the OAuth 2.0 client credentials grant type. Shall be present if it has not been provisioned out of band. The clientId and clientPassword passed in a subscription shall not be the same as the clientId and clientPassword that are used to obtain authorization for API requests. Client credentials may differ between subscriptions. The value of clientPassword should be generated by a random process.\n",
+                "type": "string"
+              },
+              "tokenEndpoint": {
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string",
+                "format": "uri"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
\ No newline at end of file
-- 
GitLab


From 81ef0d341f1f703c9c582a2c119d59f5e688262d Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Mon, 2 Nov 2020 13:53:24 +0500
Subject: [PATCH 123/322] added majorAPIVersion

---
 .../ApiVersion.robot                          |  10 +-
 .../NSPerformanceManagementKeywords.robot     | 361 +++---------------
 .../NSPerformanceManagement-API/PMJobs.robot  |   2 +-
 .../Thresholds.robot                          |   2 +-
 .../environment/variables.txt                 |   2 +-
 5 files changed, 60 insertions(+), 317 deletions(-)

diff --git a/SOL005/NSPerformanceManagement-API/ApiVersion.robot b/SOL005/NSPerformanceManagement-API/ApiVersion.robot
index c3232f1b2..438bcd408 100644
--- a/SOL005/NSPerformanceManagement-API/ApiVersion.robot
+++ b/SOL005/NSPerformanceManagement-API/ApiVersion.robot
@@ -169,35 +169,35 @@ DELETE API Version
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/v1/api_version
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/v1/api_version
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/v1/api_version
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/v1/api_version
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/v1/api_version
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
diff --git a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
index 0d50c014e..57c7078a8 100644
--- a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
+++ b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
@@ -1,12 +1,10 @@
 *** Settings ***
 Resource    environment/variables.txt
-Resource    environment/subscriptions.txt
 Resource    environment/pmJobs.txt
 Resource    environment/IndividualPmJob.txt
 Resource    environment/reports.txt
 Resource    environment/thresholds.txt
 Resource    environment/individualThresholds.txt
-Resource    environment/individualSubscription.txt
 Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
 Library    MockServerLibrary 
 Library    OperatingSystem
@@ -22,7 +20,7 @@ GET all NS Performance Monitoring Jobs
     Log    Trying to get all PM Jobs present in the NFVO
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -30,7 +28,7 @@ GET NS Performance Monitoring Jobs with attribute-based filter
     Log    Trying to get all PM Jobs present in the NFVO, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?${POS_FILTER}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?${POS_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -38,7 +36,7 @@ GET NS Performance Monitoring Jobs with all_fields attribute selector
     Log    Trying to get all PM Jobs present in the NFVO, using 'all_fields' filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?all_fields
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?all_fields
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -46,7 +44,7 @@ GET NS Performance Monitoring Jobs with exclude_default attribute selector
     Log    Trying to get all NS Packages present in the NFVO, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -55,7 +53,7 @@ GET NS Performance Monitoring Jobs with include attribute selector
     Pass Execution If    ${FIELD_USAGE} == 0    Skipping test as NFVO is not supporting 'fields'
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?include=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?include=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -64,7 +62,7 @@ GET NS Performance Monitoring Jobs with exclude attribute selector
     Pass Execution If    ${FIELD_USAGE} == 0    Skipping test as NFVO is not supporting 'fields'
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?exclude=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?exclude=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -72,7 +70,7 @@ GET NS Performance Monitoring Jobs with invalid attribute-based filter
     Log    Trying to get all PM Jobs present in the NFVO, using an erroneous filter param
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?${NEG_FILTER}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?${NEG_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -80,7 +78,7 @@ GET NS Performance Monitoring Jobs with invalid resource endpoint
     Log    Trying to perform a GET on a erroneous URI
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_job    # wrong URI /pm_job instead of /pm_jobs
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_job    # wrong URI /pm_job instead of /pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -91,7 +89,7 @@ Send Post Request Create new NS Performance Monitoring Job
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/CreatePmJobRequest.json
     ${body}=        Format String   ${template}     pmJobId=${pmJobId}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs    ${body}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -99,7 +97,7 @@ Send PUT Request for all NS Performance Monitoring Jobs
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -107,7 +105,7 @@ Send PATCH Request for all NS Performance Monitoring Jobs
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -115,7 +113,7 @@ Send DELETE Request for all NS Performance Monitoring Jobs
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -127,7 +125,7 @@ Check Postcondition PmJob Exists
     Log    Checking that Pm Job exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${response['body']['id']}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
@@ -188,7 +186,7 @@ GET individual NS Performance Job
     Log    Trying to get a Pm Job present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -196,7 +194,7 @@ GET individual NS Performance Job with invalid resource identifier
     Log    Trying to perform a negative get, using erroneous PM Job identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${erroneousPmJobId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${erroneousPmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -204,7 +202,7 @@ Send Delete request for individual NS Performance Job
     Log    Trying to delete an existing PM Job
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -212,7 +210,7 @@ Send Delete request for individual NS Performance Job with invalid resource iden
     Log    Trying to perform a negative delete, using erroneous PM Job identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${erroneousPmJobId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${erroneousPmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -220,7 +218,7 @@ Send Post request for individual NS Performance Job
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${newPmJobId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${newPmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -228,10 +226,10 @@ Send Put request for individual NS Performance Job
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -241,7 +239,7 @@ Send Patch request for individual NS Performance Job
     Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${body}=    Get File    jsons/PmJobModifications.json
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}    ${body}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -249,7 +247,7 @@ Check Postcondition NS Performance Job is not Created
     Log    Trying to get a new Pm Job
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${newPmJobId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${newPmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    404
@@ -277,7 +275,7 @@ Get Individual Performance Report
     Log    Trying to get a performance report present in the NFVO
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -285,41 +283,41 @@ Get Individual Performance Report with invalid resource endpoint
     Log    Trying to get a performance report with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${erroneousReportId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${erroneousReportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for Individual Performance Report
     Log    Trying to create new performance report
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for Individual Performance Report
     Log    Trying to update performance report
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Send Patch request for Individual Performance Report
     Log    Trying to update performance report
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for Individual Performance Report
     Log    Trying to delete performance report   
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -331,7 +329,7 @@ Check Postcondition NS Individual Performance Report is not Created
     Log    Trying to get a new report
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    404
@@ -347,7 +345,7 @@ GET all Performance Thresholds
     Log    Trying to get all thresholds present in the NFVO    
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -355,7 +353,7 @@ GET Performance Thresholds with attribute-based filter
     Log    Trying to get thresholds present in the NFVO with filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds?${FILTER_OK_Threshold}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds?${FILTER_OK_Threshold}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -363,7 +361,7 @@ GET Performance Thresholds with invalid attribute-based filter
     Log    Trying to get thresholds present in the NFVO with invalid filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds?${FILTER_KO}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds?${FILTER_KO}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -371,7 +369,7 @@ GET NS performance Thresholds with invalid resource endpoint
     Log    Trying to get thresholds present in the NFVO with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/threshold
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/threshold
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -382,7 +380,7 @@ Send Post Request Create new Performance Threshold
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${template}=    Get File    jsons/CreateThresholdRequest.json
     ${body}=        Format String   ${template}     pmJobId=${pmJobId}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/thresholds    ${body}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -391,7 +389,7 @@ Send PUT Request for all Performance Thresholds
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/thresholds
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -400,14 +398,14 @@ Send PATCH Request for all Performance Thresholds
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/thresholds
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send DELETE Request for all Performance Thresholds
     Log    DELETE THresholds
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/thresholds
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -419,7 +417,7 @@ Check Postcondition Threshold Exists
     Log    Checking that Threshold exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${response['body']['id']}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
@@ -435,7 +433,7 @@ GET Individual NS performance Threshold
     Log    Trying to get a Threhsold present in the NFVO
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -443,28 +441,28 @@ GET individual NS performance Threshold with invalid resource identifier
     Log    Trying to get a Threhsold with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${erroneousThresholdId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${erroneousThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual NS performance Threshold
     Log    Trying to delete a Threhsold in the NFVO
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual NS performance Threshold with invalid resource identifier
     Log    Trying to delete a Threhsold in the NFVO with invalid id
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${erroneousThresholdId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${erroneousThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual NS performance Threshold
     Log    Trying to create new threshold
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${newThresholdId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${newThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -472,10 +470,10 @@ Send Put request for individual NS performance Threshold
     Log    Trying to PUT threshold
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -485,7 +483,7 @@ Send Patch request for individual NS performance Threshold
     Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${body}=    Get File    jsons/ThresholdModifications.json
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}    ${body}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -507,138 +505,11 @@ Check HTTP Response Body Threshold Identifier matches the requested Threshold
     Should Be Equal    ${response['body']['id']}    ${thresholdId} 
     Log    Pm Job identifier as expected
 
-
-
-Get all NS Performance Subscriptions
-    [Documentation]    The client can use this method to query the list of active subscriptions to Performance management notifications
-    ...    subscribed by the client.
-    ...    This method shall follow the provisions specified in the Tables 7.4.7.3.2-1 and 7.4.7.3.2-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-
-Get NS Performance Subscriptions with attribute-based filters
-    [Documentation]    The client can use this method to query the list of active subscriptions to Performance management notifications
-    ...    subscribed by the client.
-    ...    This method shall follow the provisions specified in the Tables 7.4.7.3.2-1 and 7.4.7.3.2-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ok}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-
-Get NS Performance Subscriptions with invalid attribute-based filters
-    [Documentation]    The client can use this method to query the list of active subscriptions to Performance management notifications
-    ...    subscribed by the client.
-    ...    This method shall follow the provisions specified in the Tables 7.4.7.3.2-1 and 7.4.7.3.2-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ko}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-
-Get NS Performance Subscriptions with invalid resource endpoint
-    [Documentation]    The client can use this method to query the list of active subscriptions to Performance management notifications
-    ...    subscribed by the client.
-    ...    This method shall follow the provisions specified in the Tables 7.4.7.3.2-1 and 7.4.7.3.2-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscription
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}    
-
-
-Send Post Request for NS Performance Subscription
-    [Documentation]    The POST method creates a new subscription
-    ...    This method shall follow the provisions specified in the Tables 7.4.7.3.1-1 and 7.4.7.3.1-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    ...    Creation of two subscription resources with the same callbackURI and the same filter can result in performance
-    ...    degradation and will provide duplicates of notifications to the OSS, and might make sense only in very rare use cases.
-    ...    Consequently, the NFVO may either allow creating a subscription resource if another subscription resource with the
-    ...    same filter and callbackUri already exists (in which case it shall return the "201 Created" response code), or may decide
-    ...    to not create a duplicate subscription resource (in which case it shall return a "303 See Other" response code referencing
-    ...    the existing subscription resource with the same filter and callbackUri).
-    Set headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${template}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1
-    ...    Check Notification Endpoint    
-
-
-Send Post Request for Duplicated NS Performance Subscription
-    [Documentation]    The POST method creates a new subscription
-    ...    This method shall follow the provisions specified in the Tables 7.4.7.3.1-1 and 7.4.7.3.1-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    ...    Creation of two subscription resources with the same callbackURI and the same filter can result in performance
-    ...    degradation and will provide duplicates of notifications to the OSS, and might make sense only in very rare use cases.
-    ...    Consequently, the NFVO may either allow creating a subscription resource if another subscription resource with the
-    ...    same filter and callbackUri already exists (in which case it shall return the "201 Created" response code), or may decide
-    ...    to not create a duplicate subscription resource (in which case it shall return a "303 See Other" response code referencing
-    ...    the existing subscription resource with the same filter and callbackUri).
-    Set headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${template}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT}
-    ...       Check Notification Endpoint
-
-
-
-Send Put Request for NS Performance Subscriptions
-    [Documentation]    This method is not supported. When this method is requested on this resource, the NFVO shall return a "405 Method
-    ...    Not Allowed" response as defined in Clause 4.3.5.4.
-    Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    
-
-Send Patch Request for NS Performance Subscriptions
-    [Documentation]    This method is not supported. When this method is requested on this resource, the NFVO shall return a "405 Method
-    ...    Not Allowed" response as defined in Clause 4.3.5.4.
-    Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    
-
-Send Delete Request for NS Performance Subscriptions
-    [Documentation]    This method is not supported. When this method is requested on this resource, the NFVO shall return a "405 Method
-    ...    Not Allowed" response as defined in Clause 4.3.5.4.
-    Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-
 Check HTTP Response Status Code Is
     [Arguments]    ${expected_status}    
     Should Be Equal As Strings    ${response['status']}    ${expected_status}
     Log    Status code validated 
     
-    
-    
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
     Should Contain    ${response['headers']['Content-Type']}    application/json
@@ -650,145 +521,18 @@ Check HTTP Response Body Json Schema Is
 Check HTTP Response Body Is Empty
     Should Be Empty    ${response['body']}    
     Log    No json schema is provided. Validation OK  
-
-
-Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filter
-    Log    Check Response includes NS Package Management according to filter
-    @{words} =  Split String    ${filter_ok}       ,${SEPERATOR} 
-    Should Be Equal As Strings    ${response['body'][0]['callbackUri']}    @{words}[1]
-
-Check HTTP Response Body PmSubscription Attributes Values Match the Issued Subscription
-    Log    Check Response matches subscription
-    ${template}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
-    ${subscription}=    evaluate    json.loads('''${body}''')    json
-    Should Be Equal    ${response['body']['callbackUri']}    ${subscription['callbackUri']}
-
-
-Check Postcondition NS Performance Subscription Is Set
-    Log    Check Postcondition subscription exist
-    Log    Trying to get the subscription
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${response['body']['id']}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    Check HTTP Response Status Code Is    200
-    
-    
-Check Postcondition Subscription Resource URI Returned in Location Header Is Available
-    Log    Going to check postcondition
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${response['headers']['Location']}
-    Integer    response status    200
-    Log    Received a 200 OK as expected
-    ${contentType}=    Output    response headers Content-Type
-    Should Contain    ${contentType}    application/json
-    ${result}=    Output    response body
-    Validate Json    PmSubscriptions.schema.json    ${result}
-    Log    Validated PmSubscriptions schema
-    ${template}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
-    ${subscription}=    evaluate    json.loads('''${body}''')    json
-    Should Be Equal    ${result['callbackUri']}    ${subscription['callbackUri']}
-    Log    Validated Issued subscription is same as original
-        
-Get Individual NS Performance Subscription
-    Log    Trying to get a single subscription identified by subscriptionId
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    
-GET individual NS Performance Subscription with invalid resource identifier
-    Log    Trying to perform a request on a subscriptionID which doesn't exist
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-Send Delete request for individual NS Performance Subscription
-    Log    Trying to perform a DELETE on a subscriptionId
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-Check Postcondition NS Performance Subscription is Deleted
-    Log    Check Postcondition Subscription is deleted
-    GET individual NS Performance Subscription
-    Check HTTP Response Status Code Is    404 
-
-Send Delete request for individual NS Performance Subscription with invalid resource identifier
-    Log    Trying to perform a DELETE on a subscriptionId which doesn't exist
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-Send Post request for individual NS Performance Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${newSubscriptionId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-Send Put request for individual NS Performance Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
-    ${origOutput}=    Output    response
-    Set Suite Variable    ${origResponse}    ${origOutput}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    
-Send Patch request for individual NS Performance Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
-    ${origOutput}=    Output    response
-    Set Suite Variable    ${origResponse}    ${origOutput}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-   
-Check Postcondition NS Performance Subscription is Unmodified (Implicit)
-    Log    Check postconidtion subscription not modified
-    GET individual NS Performance Subscription
-    Log    Check Response matches original VNF Threshold
-    ${subscription}=    evaluate    json.loads('''${response['body']}''')    json
-    Should Be Equal    ${origResponse['body']['id']}    ${subscription.id}
-    Should Be Equal    ${origResponse['body']['callbackUri']}    ${subscription.callbackUri}
-
-Check Postcondition NS Performance Subscription is not Created
-    Log    Trying to get a new subscription
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${newSubscriptionId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    Check HTTP Response Status Code Is    404
-
-Check HTTP Response Body Subscription Identifier matches the requested Subscription
-    Log    Trying to check response ID
-    Should Be Equal    ${response['body']['id']}    ${subscriptionId} 
-    Log    Subscription identifier as expected    
-
+ 
 Check HTTP Response Header Contains
     [Arguments]    ${CONTENT_TYPE}
     Should Contain    ${response['headers']}    ${CONTENT_TYPE}
     Log    Header is present
 
-
 Create Sessions
     Pass Execution If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 0    MockServer not started as NFVO is not checking the notification endpoint
     Start Process  java  -jar  ${MOCK_SERVER_JAR}    -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
     Create Mock Session  ${callback_uri}
-    
-    
+       
 Check Notification Endpoint
     &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
     &{headers} =	Create Dictionary	Content-Type=application/json  
@@ -797,7 +541,6 @@ Check Notification Endpoint
     Wait Until Keyword Succeeds    ${total_polling_time}   ${polling_interval}   Verify Mock Expectation    ${notification_request}
     Clear Requests  ${callback_endpoint}
     
-Check LINK in Header
+Check HTTP Response Header Contains Location
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
-    Should Not Be Empty    ${linkURL}
-
+    Should Not Be Empty    ${linkURL}
\ No newline at end of file
diff --git a/SOL005/NSPerformanceManagement-API/PMJobs.robot b/SOL005/NSPerformanceManagement-API/PMJobs.robot
index 3665194be..93f5ab754 100644
--- a/SOL005/NSPerformanceManagement-API/PMJobs.robot
+++ b/SOL005/NSPerformanceManagement-API/PMJobs.robot
@@ -180,7 +180,7 @@ GET all NS Performance Monitoring Jobs as Paged Response
     ...    Post-Conditions: none
     GET all NS Performance Monitoring Jobs
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contains Location
     
 GET NS Performance Monitoring Jobs - Bad Request Response too Big
     [Documentation]    Test ID: 5.3.4.1.14
diff --git a/SOL005/NSPerformanceManagement-API/Thresholds.robot b/SOL005/NSPerformanceManagement-API/Thresholds.robot
index a57d72fb5..21d59256a 100644
--- a/SOL005/NSPerformanceManagement-API/Thresholds.robot
+++ b/SOL005/NSPerformanceManagement-API/Thresholds.robot
@@ -124,7 +124,7 @@ GET All Performance Thresholds as Paged Response
     ...    Post-Conditions: none
     GET all Performance Thresholds
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contains Location
     
 GET Performance Thresholds - Bad Request Response too Big
     [Documentation]    Test ID: 5.3.4.4.10
diff --git a/SOL005/NSPerformanceManagement-API/environment/variables.txt b/SOL005/NSPerformanceManagement-API/environment/variables.txt
index 30f5de744..07c1e0685 100644
--- a/SOL005/NSPerformanceManagement-API/environment/variables.txt
+++ b/SOL005/NSPerformanceManagement-API/environment/variables.txt
@@ -8,7 +8,7 @@ ${ACCEPT_JSON}    application/json
 ${apiRoot}        /
 ${AUTH_USAGE}     1
 ${NEG_AUTHORIZATION}    Bearer negativetoken
-${apiVersion}     v1
+${apiMajorVersion}     v1
 ${apiName}        nspm
 ${FIELD_USAGE}    1
 ${NFVO_CHECKS_NOTIF_ENDPOINT}    1
-- 
GitLab


From 2756d222d2f3a5352406da3aa5f92f60eaf8d380 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Mon, 2 Nov 2020 16:09:13 +0500
Subject: [PATCH 124/322] new testcase and bug fix added

---
 .../IndividualPmJob.robot                     |  4 +-
 .../IndividualReport.robot                    | 21 ++++------
 .../NSPerformanceManagementKeywords.robot     | 42 ++++++-------------
 .../NSPerformanceManagement-API/PMJobs.robot  | 30 +++++++++----
 .../Thresholds.robot                          |  4 +-
 .../environment/variables.txt                 |  2 +-
 6 files changed, 48 insertions(+), 55 deletions(-)

diff --git a/SOL005/NSPerformanceManagement-API/IndividualPmJob.robot b/SOL005/NSPerformanceManagement-API/IndividualPmJob.robot
index 8eb28fd4a..3adb819eb 100644
--- a/SOL005/NSPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL005/NSPerformanceManagement-API/IndividualPmJob.robot
@@ -50,7 +50,7 @@ POST Individual NS Performance Job - Method not implemented
     [Documentation]    Test ID: 5.3.4.2.4
     ...    Test title: POST Individual NS Performance Job - method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new NS Performance Monitoring Job
-    ...    Pre-conditions: A NS instance is instantiated
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
@@ -62,7 +62,7 @@ PUT Individual NS Performance Job - Method not implemented
     [Documentation]    Test ID: 5.3.4.2.5
     ...    Test title: PUT Individual NS Performance Job - method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing NS Performance Monitoring Job
-    ...    Pre-conditions: A NS instance is instantiated. One or more NS Performance jobs are set in the NFVO.
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
diff --git a/SOL005/NSPerformanceManagement-API/IndividualReport.robot b/SOL005/NSPerformanceManagement-API/IndividualReport.robot
index b79aee7dc..5d35b0025 100644
--- a/SOL005/NSPerformanceManagement-API/IndividualReport.robot
+++ b/SOL005/NSPerformanceManagement-API/IndividualReport.robot
@@ -31,56 +31,53 @@ Get Individual Performance Report with invalid resource endpoint
     ...    Post-Conditions: none
     Get Individual Performance Report with invalid resource endpoint
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
 
 POST Individual Performance Report - Method not implemented
     [Documentation]    Test ID: 5.3.4.3.3
     ...    Test title: POST Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new NS performance report within a monitoring job
-    ...    Pre-conditions: A NS instance is instantiated.
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS performance report is not created on the NFVO
+    ...    Post-Conditions: none
     Send Post request for Individual Performance Report
     Check HTTP Response Status Code Is    405
-    Check Postcondition NS Individual Performance Report is not Created
 
 PUT Individual Performance Report - Method not implemented
     [Documentation]    Test ID: 5.3.4.3.4
     ...    Test title: PUT Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing NS performance report within a monitoring job
-    ...    Pre-conditions: A NS instance is instantiated. One or more NS performance reports are set for a monitoring job in the NFVO.
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS performance report is not modified by the operation
+    ...    Post-Conditions: none
     Send Put request for Individual Performance Report
     Check HTTP Response Status Code Is    405
-    Check Postcondition NS Individual Performance Report is Unmodified (Implicit)
 
 PATCH Individual Performance Report - Method not implemented
     [Documentation]    Test ID: 5.3.4.3.5
     ...    Test title: PATCH Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing NS performance report within a monitoring job
-    ...    Pre-conditions: A NS instance is instantiated. One or more NS performance reports are set for a monitoring job in the NFVO.
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS performance report is not modified by the operation
+    ...    Post-Conditions: none
     Send Patch request for Individual Performance Report
     Check HTTP Response Status Code Is    405
-    Check Postcondition NS Individual Performance Report is Unmodified (Implicit)
 
 DELETE Individual Performance Report - Method not implemented
     [Documentation]    Test ID: 5.3.4.3.6
     ...    Test title: DELETE Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing NS performance report within a monitoring job
-    ...    Pre-conditions: A NS instance is instantiated. One or more NS performance reports are set for a monitoring job in the NFVO.
+    ...    Pre-conditions: none
     ...    Reference: Clause 7.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS performance report is not deleted by the operation
+    ...    Post-Conditions: none
     Send Delete request for Individual Performance Report
     Check HTTP Response Status Code Is    405
-    Check Postcondition NS Individual Performance Report Exists
 
diff --git a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
index 57c7078a8..e22cffb96 100644
--- a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
+++ b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
@@ -48,12 +48,21 @@ GET NS Performance Monitoring Jobs with exclude_default attribute selector
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
-GET NS Performance Monitoring Jobs with include attribute selector
+GET NS Performance Monitoring Jobs with fields attribute selector
     Log    Trying to get all NS Packages present in the NFVO, using filter params
     Pass Execution If    ${FIELD_USAGE} == 0    Skipping test as NFVO is not supporting 'fields'
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?include=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?fields=${fields}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+GET NS Performance Monitoring Jobs with fields and exclude_default attribute selector
+    Log    Trying to get all NS Packages present in the NFVO, using filter params
+    Pass Execution If    ${FIELD_USAGE} == 0    Skipping test as NFVO is not supporting 'fields'
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?fields=${fields}&exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -117,9 +126,6 @@ Send DELETE Request for all NS Performance Monitoring Jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
-Check Postcondition NS Performance Monitoring Jobs Exist
-    Log    Checking that Pm Job still exists
-    GET all NS Performance Monitoring Jobs
     
 Check Postcondition PmJob Exists
     Log    Checking that Pm Job exists
@@ -140,7 +146,7 @@ Check HTTP Response Body PmJobs Matches the requested exclude selector
     Should Be Empty    ${criteria}
     Log    Reports element is empty as expected
 
-Check HTTP Response Body PmJobs Matches the requested include selector
+Check HTTP Response Body PmJobs Matches the requested selector
     Log    Trying to validate criteria schema
     ${criteria}=    Get Value From Json    ${response['body']}    $..criteria
     Validate Json    criteria.schema.json    ${criteria}
@@ -321,26 +327,6 @@ Send Delete request for Individual Performance Report
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
-Check Postcondition NS Individual Performance Report Exists
-    Log    Checking that report still exists
-    Get Individual Performance Report
-
-Check Postcondition NS Individual Performance Report is not Created
-    Log    Trying to get a new report
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    Check HTTP Response Status Code Is    404
-
-Check Postcondition NS Individual Performance Report is Unmodified (Implicit)
-    Log    Check Postcondition VNF PM job is not modified
-    Get Individual Performance Report
-    Log    Check Response matches original VNF report
-    ${report}=    evaluate    json.loads('''${response['body']}''')    json
-    Should Be Equal    ${origResponse['body']['entries'][0]['objectInstanceId']}    ${report['entries'][0]['objectInstanceId']}
-
 GET all Performance Thresholds
     Log    Trying to get all thresholds present in the NFVO    
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
@@ -408,10 +394,6 @@ Send DELETE Request for all Performance Thresholds
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
-
-Check Postcondition Thresholds Exist
-    Log    Checking that Thresholds still exists
-    GET all Performance Thresholds
     
 Check Postcondition Threshold Exists
     Log    Checking that Threshold exists
diff --git a/SOL005/NSPerformanceManagement-API/PMJobs.robot b/SOL005/NSPerformanceManagement-API/PMJobs.robot
index 93f5ab754..315b42b67 100644
--- a/SOL005/NSPerformanceManagement-API/PMJobs.robot
+++ b/SOL005/NSPerformanceManagement-API/PMJobs.robot
@@ -65,19 +65,19 @@ GET all NS Performance Monitoring Jobs with "exclude_default" attribute selector
     Check HTTP Response Body Json Schema Is   PmJobs
     Check HTTP Response Body PmJobs Matches the requested exclude_default selector
 
-GET all NS Performance Monitoring Jobs with "include" attribute selector
+GET all NS Performance Monitoring Jobs with "fields" attribute selector
     [Documentation]    Test ID: 5.3.4.1.5
-    ...    Test title: GET all NS Performance Monitoring Jobs with "include" attribute selector
-    ...    Test objective: The objective is to test the retrieval of all NS performance monitoring jobs "include" attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued "include" selector
+    ...    Test title: GET all NS Performance Monitoring Jobs with "fields" attribute selector
+    ...    Test objective: The objective is to test the retrieval of all NS performance monitoring jobs "fields" attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued "include" selector
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
     ...    Reference: Clause 4.3.3.2.1, 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the use of "include" attribute selector
     ...    Post-Conditions: none
-    GET NS Performance Monitoring Jobs with include attribute selector
+    GET NS Performance Monitoring Jobs with fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   PmJobs
-    Check HTTP Response Body PmJobs Matches the requested include selector
+    Check HTTP Response Body PmJobs Matches the requested selector
 
 GET all NS Performance Monitoring Jobs with "exclude" attribute selector
     [Documentation]    Test ID: 5.3.4.1.6
@@ -117,6 +117,7 @@ GET NS Performance Monitoring Jobs with invalid resource endpoint
     ...    Post-Conditions: none
     GET NS Performance Monitoring Jobs with invalid resource endpoint
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 Create new NS Performance Monitoring Job
     [Documentation]    Test ID: 5.3.4.1.9
@@ -164,10 +165,9 @@ DELETE all NS Performance Monitoring Jobs - Method not implemented
     ...    Reference: Clause 7.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS Performance Monitoring Jobs are not deleted by the failed operation
+    ...    Post-Conditions: none
     Send PATCH Request for all NS Performance Monitoring Jobs
     Check HTTP Response Status Code Is    405
-    Check Postcondition NS Performance Monitoring Jobs Exist
     
 GET all NS Performance Monitoring Jobs as Paged Response
     [Documentation]    Test ID: 5.3.4.1.13
@@ -193,4 +193,18 @@ GET NS Performance Monitoring Jobs - Bad Request Response too Big
     ...    Post-Conditions: none
     GET all NS Performance Monitoring Jobs
     Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is   ProblemDetails
\ No newline at end of file
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+GET all NS Performance Monitoring Jobs with "fields" and "exclude_default" attribute selector
+    [Documentation]    Test ID: 5.3.4.1.15
+    ...    Test title: GET all NS Performance Monitoring Jobs with "fields" and "exclude_default" attribute selector
+    ...    Test objective: The objective is to test the retrieval of all NS performance monitoring jobs "fields" and "exclude_default" attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued selector
+    ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
+    ...    Reference: Clause 4.3.3.2.1, 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NFVO supports the use of "include" attribute selector
+    ...    Post-Conditions: none
+    GET NS Performance Monitoring Jobs with fields and exclude_default attribute selector
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is   PmJobs
+    Check HTTP Response Body PmJobs Matches the requested selector
\ No newline at end of file
diff --git a/SOL005/NSPerformanceManagement-API/Thresholds.robot b/SOL005/NSPerformanceManagement-API/Thresholds.robot
index 21d59256a..3c74956a8 100644
--- a/SOL005/NSPerformanceManagement-API/Thresholds.robot
+++ b/SOL005/NSPerformanceManagement-API/Thresholds.robot
@@ -47,6 +47,7 @@ GET Performance Thresholds with invalid attribute-based filter
     ...    Post-Conditions: none
     GET Performance Thresholds with invalid attribute-based filter
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 GET Performance Thresholds with invalid resource endpoint
     [Documentation]    Test ID: 5.3.4.4.4
@@ -108,10 +109,9 @@ DELETE Performance Thresholds - Method not implemented
     ...    Reference: Clause 7.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS performance thresholds are not deleted by the failed operation
+    ...    Post-Conditions: none
     Send DELETE Request for all Performance Thresholds
     Check HTTP Response Status Code Is    405
-    Check Postcondition Thresholds Exist
     
 GET All Performance Thresholds as Paged Response
     [Documentation]    Test ID: 5.3.4.4.9
diff --git a/SOL005/NSPerformanceManagement-API/environment/variables.txt b/SOL005/NSPerformanceManagement-API/environment/variables.txt
index 07c1e0685..db2e7c3e5 100644
--- a/SOL005/NSPerformanceManagement-API/environment/variables.txt
+++ b/SOL005/NSPerformanceManagement-API/environment/variables.txt
@@ -8,7 +8,7 @@ ${ACCEPT_JSON}    application/json
 ${apiRoot}        /
 ${AUTH_USAGE}     1
 ${NEG_AUTHORIZATION}    Bearer negativetoken
-${apiMajorVersion}     v1
+${apiMajorVersion}     v2
 ${apiName}        nspm
 ${FIELD_USAGE}    1
 ${NFVO_CHECKS_NOTIF_ENDPOINT}    1
-- 
GitLab


From c7683a3d066e594aa6b82de30bf76ebd22d9a16e Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 3 Nov 2020 12:13:06 +0500
Subject: [PATCH 125/322] deltas for 2.7.1 SOl005 NSFM added

---
 .../NSFaultManagement-API/Subscriptions.robot |  16 +-
 .../schemas/alarm.schema.json                 | 347 +++++++++---------
 .../schemas/alarms.schema.json                |   5 +-
 3 files changed, 193 insertions(+), 175 deletions(-)

diff --git a/SOL005/NSFaultManagement-API/Subscriptions.robot b/SOL005/NSFaultManagement-API/Subscriptions.robot
index 3fa988c74..1aea8c7f9 100644
--- a/SOL005/NSFaultManagement-API/Subscriptions.robot
+++ b/SOL005/NSFaultManagement-API/Subscriptions.robot
@@ -22,7 +22,6 @@ Create a new alarm subscription
     Check Operation Occurrence Id
     Check HTTP Response Body Json Schema Is  FmSubscription
   
-
 Create a new alarm subscription - DUPLICATION
      [Documentation]    Test ID: 5.3.3.3.2
     ...    Test title: Create a new alarm subscription - DUPLICATION
@@ -285,4 +284,17 @@ Retrieve a list of alarm subscriptions with filter "filter.probableCauses"
     Get subscriptions with filter "filter_probableCauses"
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    FmSubscriptions
-    Check PostCondition HTTP Response Body Subscriptions Matches the requested attribute-based filter "filter_probableCauses"
\ No newline at end of file
+    Check PostCondition HTTP Response Body Subscriptions Matches the requested attribute-based filter "filter_probableCauses"
+    
+Create a new alarm subscription - Unprocessable Entity
+    [Documentation]    Test ID: 5.3.3.3.22
+    ...    Test title: Create a new alarm subscription- Unprocessable Entity
+    ...    Test objective: The objective is to test that creation of a new Fault management alarm subscriptions fials when content type of the payload body is supported and the payload body of a request contains syntactically correct data but the data cannot be processed.
+    ...    Pre-conditions: 
+    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO 
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    POST Subscription
+    Check HTTP Response Status Code Is    422
+    Check HTTP Response Body Json Schema Is  ProblemDetails
\ No newline at end of file
diff --git a/SOL005/NSFaultManagement-API/schemas/alarm.schema.json b/SOL005/NSFaultManagement-API/schemas/alarm.schema.json
index b51ab8c36..76fc39504 100644
--- a/SOL005/NSFaultManagement-API/schemas/alarm.schema.json
+++ b/SOL005/NSFaultManagement-API/schemas/alarm.schema.json
@@ -1,183 +1,186 @@
 {
-  "description": "The alarm data type encapsulates information about an alarm. It shall comply with the provisions defined in Table 8.5.2.4-1\n",
-  "type": "object",
-  "required": [
-    "id",
-    "managedObjectId",
-    "alarmRaisedTime",
-    "rootCauseFaultyComponent",
-    "ackState",
-    "perceivedSeverity",
-    "eventTime",
-    "eventType",
-    "probableCause",
-    "isRootCause",
-    "_links"
-  ],
-  "properties": {
-    "id": {
-      "description": "An identifier with the intention of being globally unique.\n",
-      "type": "string"
-    },
-    "managedObjectId": {
-      "description": "An identifier with the intention of being globally unique.\n",
-      "type": "string"
-    },
-    "rootCauseFaultyComponent": {
-      "description": "This type represents the faulty component that has a negative impact on an NS.  It shall comply with the provisions defined in Table 8.5.3.4-1.\n",
-      "type": "object",
-      "properties": {
-        "faultyNestedNsInstanceId": {
-          "description": "An identifier with the intention of being globally unique.\n",
-          "type": "string"
-        },
-        "faultyResourceType": {
-          "description": "An identifier with the intention of being globally unique.\n",
-          "type": "string"
-        },
-        "faultyNsVirtualLinkInstanceId": {
-          "description": "An identifier with the intention of being globally unique.\n",
-          "type": "string"
+    "description": "The alarm data type encapsulates information about an alarm. It shall comply with the provisions defined in Table 8.5.2.4-1\n",
+    "type": "object",
+    "required": [
+      "id",
+      "managedObjectId",
+      "alarmRaisedTime",
+      "ackState",
+      "perceivedSeverity",
+      "eventTime",
+      "eventType",
+      "probableCause",
+      "isRootCause",
+      "_links"
+    ],
+    "properties": {
+      "id": {
+        "description": "An identifier with the intention of being globally unique.\n",
+        "type": "string"
+      },
+      "managedObjectId": {
+        "description": "An identifier with the intention of being globally unique.\n",
+        "type": "string"
+      },
+      "rootCauseFaultyComponent": {
+        "description": "This type represents the faulty component that has a negative impact on an NS.  It shall comply with the provisions defined in Table 8.5.3.4-1.\n",
+        "type": "object",
+        "properties": {
+          "faultyNestedNsInstanceId": {
+            "description": "An identifier with the intention of being globally unique.\n",
+            "type": "string"
+          },
+          "faultyResourceType": {
+            "description": "An identifier with the intention of being globally unique.\n",
+            "type": "string"
+          },
+          "faultyNsVirtualLinkInstanceId": {
+            "description": "An identifier with the intention of being globally unique.\n",
+            "type": "string"
+          }
         }
-      }
-    },
-    "rootCauseFaultyResource": {
-      "description": "This type represents the faulty virtual resources that have a negative impact on a NS.\n",
-      "type": "object",
-      "required": [
-        "faultyResource",
-        "faultyResourceType"
-      ],
-      "properties": {
-        "faultyResource": {
-          "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance or by an NS instance. Information about the resource is available from the VIM.\n",
-          "type": "object",
-          "required": [
-            "resourceId"
-          ],
-          "properties": {
-            "vimId": {
-              "description": "An identifier with the intention of being globally unique.\n",
-              "type": "string"
-            },
-            "resourceProviderId": {
-              "description": "An identifier with the intention of being globally unique.\n",
-              "type": "string"
-            },
-            "resourceId": {
-              "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance. Representation: string of variable length.\n",
-              "type": "string"
-            },
-            "vimLevelResourceType": {
-              "description": "Type of the resource in the scope of the VIM or the resource provider. The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or the resource provider and can be used as information that complements the ResourceHandle.\n",
-              "type": "string"
+      },
+      "rootCauseFaultyResource": {
+        "description": "This type represents the faulty virtual resources that have a negative impact on a NS.\n",
+        "type": "object",
+        "required": [
+          "faultyResource",
+          "faultyResourceType"
+        ],
+        "properties": {
+          "faultyResource": {
+            "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance or by an NS instance. Information about the resource is available from the VIM.\n",
+            "type": "object",
+            "required": [
+              "resourceId"
+            ],
+            "properties": {
+              "vimId": {
+                "description": "An identifier with the intention of being globally unique.\n",
+                "type": "string"
+              },
+              "resourceProviderId": {
+                "description": "An identifier with the intention of being globally unique.\n",
+                "type": "string"
+              },
+              "resourceId": {
+                "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance. Representation: string of variable length.\n",
+                "type": "string"
+              },
+              "vimLevelResourceType": {
+                "description": "Type of the resource in the scope of the VIM or the resource provider. The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or the resource provider and can be used as information that complements the ResourceHandle.\n",
+                "type": "string"
+              }
             }
+          },
+          "faultyResourceType": {
+            "description": "The enumeration FaultyResourceType represents those types of faulty resource. Acceptable values are: - COMPUTE - Virtual compute resource. - STORAGE - Virtual storage resource. - NETWORK - Virtual network resource.\n",
+            "type": "string",
+            "enum": [
+              "COMPUTE",
+              "STORAGE",
+              "NETWORK"
+            ]
           }
-        },
-        "faultyResourceType": {
-          "description": "The enumeration FaultyResourceType represents those types of faulty resource. Acceptable values are: - COMPUTE - Virtual compute resource. - STORAGE - Virtual storage resource. - NETWORK - Virtual network resource.\n",
-          "type": "string",
-          "enum": [
-            "COMPUTE",
-            "STORAGE",
-            "NETWORK"
-          ]
         }
-      }
-    },
-    "alarmRaisedTime": {
-      "description": "Date-time stamp. Representation: String formatted according toas defined by the date-time production in IETF RFC 3339.\n",
-      "format": "date-time"
-    },
-    "alarmChangedTime": {
-      "description": "Date-time stamp. Representation: String formatted according toas defined by the date-time production in IETF RFC 3339.\n",
-      "format": "date-time"
-    },
-    "alarmClearedTime": {
-      "description": "Date-time stamp. Representation: String formatted according toas defined by the date-time production in IETF RFC 3339.\n",
-      "format": "date-time"
-    },
-    "ackState": {
-      "description": "Acknowledgment state of the alarm. Permitted values: UNACKNOWLEDGED ACKNOWLEDGED\n",
-      "type": "string",
-      "enum": [
-        "UNACKNOWLEDGED",
-        "ACKNOWLEDGED"
-      ]
-    },
-    "perceivedSeverity": {
-      "description": "Indicates the relative level of urgency for operator attention. * CRITICAL: The Critical severity level indicates that a service\n  affecting condition has occurred and an immediate corrective action\n  is required. Such a severity can be reported, for example, when a\n  managed object becomes totally out of service and its capability needs\n  to be restored (ITU-T Recommendation X.733).\n* MAJOR: The Major severity level indicates that a service affecting\n  condition has developed and an urgent corrective action is required.\n  Such a severity can be reported, for example, when there is a severe\n  degradation in the capability of the managed object and its full\n  capability needs to be restored (ITU-T Recommendation X.733).\n* MINOR: The Minor severity level indicates the existence of a\n  non-service affecting fault condition and that corrective action\n  should be taken in order to prevent a more serious (for example,\n  service affecting) fault. Such a severity can be reported, for\n  example, when the detected alarm condition is not currently degrading\n  the capacity of the managed object (ITU-T Recommendation X.733).\n* WARNING: The Warning severity level indicates the detection of a\n  potential or impending service affecting fault, before any significant\n  effects have been felt. Action should be taken to further diagnose (if\n  necessary) and correct the problem in order to prevent it from\n  becoming a more serious service affecting fault (ITU-T Recommendation\n  X.733).\n* INDETERMINATE: The Indeterminate severity level indicates that the\n  severity level cannot be determined (ITU-T Recommendation X.733).\n* CLEARED: The Cleared severity level indicates the clearing of one or\n  more previously reported alarms. This alarm clears all alarms for this\n  managed object that have the same Alarm type, Probable cause and\n  Specific problems (if given) (ITU-T Recommendation X.733).\n",
-      "type": "string",
-      "enum": [
-        "CRITICAL",
-        "MAJOR",
-        "MINOR",
-        "WARNING",
-        "INDETERMINATE",
-        "CLEARED"
-      ]
-    },
-    "eventTime": {
-      "description": "Date-time stamp. Representation: String formatted according toas defined by the date-time production in IETF RFC 3339.\n",
-      "format": "date-time"
-    },
-    "eventType": {
-      "description": "The enumeration EventType represents those types of events that trigger an alarm. - COMMUNICATIONS_ALARM: An alarm of this type is associated with the\n  procedure and/or process required conveying information from one point\n  to another (ITU-T Recommendation X.733).\n- PROCESSING_ERROR_ALARM: An alarm of this type is associated with a\n  software or processing fault (ITU-T Recommendation X.733).\n- ENVIRONMENTAL_ALARM: An alarm of this type is associated with a\n  condition related to an enclosure in which the equipment resides\n  (ITU-T Recommendation X.733).\n- QOS_ALARM: An alarm of this type is associated with degradation in the\n  quality of a service (ITU-T Recommendation X.733).\n- EQUIPMENT_ALARM: An alarm of this type is associated with an equipment\n  fault (ITU-T Recommendation X.733).\n",
-      "type": "string",
-      "enum": [
-        "COMMUNICATIONS_ALARM",
-        "PROCESSING_ERROR_ALARM",
-        "ENVIRONMENTAL_ALARM",
-        "QOS_ALARM",
-        "EQUIPMENT_ALARM"
-      ]
-    },
-    "faultType": {
-      "description": "Additional information to clarify the type of the fault.\n",
-      "type": "string"
-    },
-    "probableCause": {
-      "description": "Information about the probable cause of the fault.\n",
-      "type": "string"
-    },
-    "isRootCause": {
-      "description": "Attribute indicating if this fault is the root for other correlated alarms. If TRUE, then the alarms listed in the attribute CorrelatedAlarmId are caused by this fault.\n",
-      "type": "boolean"
-    },
-    "correlatedAlarmIds": {
-      "description": "List of identifiers of other alarms correlated to this fault.\n",
-      "type": "array",
-      "items": {
-        "description": "An identifier with the intention of being globally unique.\n",
+      },
+      "alarmRaisedTime": {
+        "description": "Date-time stamp. Representation: String formatted according toas defined by the date-time production in IETF RFC 3339.\n",
+        "format": "date-time"
+      },
+      "alarmChangedTime": {
+        "description": "Date-time stamp. Representation: String formatted according toas defined by the date-time production in IETF RFC 3339.\n",
+        "format": "date-time"
+      },
+      "alarmClearedTime": {
+        "description": "Date-time stamp. Representation: String formatted according toas defined by the date-time production in IETF RFC 3339.\n",
+        "format": "date-time"
+      },
+      "alarmAcknowledgedTime": {
+        "description": "Date-time stamp. Representation: String formatted according toas defined by the date-time production in IETF RFC 3339.\n",
+        "format": "date-time"
+      },
+      "ackState": {
+        "description": "Acknowledgment state of the alarm. Permitted values: UNACKNOWLEDGED ACKNOWLEDGED\n",
+        "type": "string",
+        "enum": [
+          "UNACKNOWLEDGED",
+          "ACKNOWLEDGED"
+        ]
+      },
+      "perceivedSeverity": {
+        "description": "Indicates the relative level of urgency for operator attention. * CRITICAL: The Critical severity level indicates that a service\n  affecting condition has occurred and an immediate corrective action\n  is required. Such a severity can be reported, for example, when a\n  managed object becomes totally out of service and its capability needs\n  to be restored (ITU-T Recommendation X.733).\n* MAJOR: The Major severity level indicates that a service affecting\n  condition has developed and an urgent corrective action is required.\n  Such a severity can be reported, for example, when there is a severe\n  degradation in the capability of the managed object and its full\n  capability needs to be restored (ITU-T Recommendation X.733).\n* MINOR: The Minor severity level indicates the existence of a\n  non-service affecting fault condition and that corrective action\n  should be taken in order to prevent a more serious (for example,\n  service affecting) fault. Such a severity can be reported, for\n  example, when the detected alarm condition is not currently degrading\n  the capacity of the managed object (ITU-T Recommendation X.733).\n* WARNING: The Warning severity level indicates the detection of a\n  potential or impending service affecting fault, before any significant\n  effects have been felt. Action should be taken to further diagnose (if\n  necessary) and correct the problem in order to prevent it from\n  becoming a more serious service affecting fault (ITU-T Recommendation\n  X.733).\n* INDETERMINATE: The Indeterminate severity level indicates that the\n  severity level cannot be determined (ITU-T Recommendation X.733).\n* CLEARED: The Cleared severity level indicates the clearing of one or\n  more previously reported alarms. This alarm clears all alarms for this\n  managed object that have the same Alarm type, Probable cause and\n  Specific problems (if given) (ITU-T Recommendation X.733).\n",
+        "type": "string",
+        "enum": [
+          "CRITICAL",
+          "MAJOR",
+          "MINOR",
+          "WARNING",
+          "INDETERMINATE",
+          "CLEARED"
+        ]
+      },
+      "eventTime": {
+        "description": "Date-time stamp. Representation: String formatted according toas defined by the date-time production in IETF RFC 3339.\n",
+        "format": "date-time"
+      },
+      "eventType": {
+        "description": "The enumeration EventType represents those types of events that trigger an alarm. - COMMUNICATIONS_ALARM: An alarm of this type is associated with the\n  procedure and/or process required conveying information from one point\n  to another (ITU-T Recommendation X.733).\n- PROCESSING_ERROR_ALARM: An alarm of this type is associated with a\n  software or processing fault (ITU-T Recommendation X.733).\n- ENVIRONMENTAL_ALARM: An alarm of this type is associated with a\n  condition related to an enclosure in which the equipment resides\n  (ITU-T Recommendation X.733).\n- QOS_ALARM: An alarm of this type is associated with degradation in the\n  quality of a service (ITU-T Recommendation X.733).\n- EQUIPMENT_ALARM: An alarm of this type is associated with an equipment\n  fault (ITU-T Recommendation X.733).\n",
+        "type": "string",
+        "enum": [
+          "COMMUNICATIONS_ALARM",
+          "PROCESSING_ERROR_ALARM",
+          "ENVIRONMENTAL_ALARM",
+          "QOS_ALARM",
+          "EQUIPMENT_ALARM"
+        ]
+      },
+      "faultType": {
+        "description": "Additional information to clarify the type of the fault.\n",
         "type": "string"
-      }
-    },
-    "faultDetails": {
-      "description": "Provides additional information about the fault..\n",
-      "type": "string"
-    },
-    "_links": {
-      "description": "Links for this resource.\n",
-      "type": "object",
-      "required": [
-        "self"
-      ],
-      "properties": {
-        "self": {
-          "description": "This type represents a link to a resource.\n",
-          "type": "object",
-          "required": [
-            "href"
-          ],
-          "properties": {
-            "href": {
-              "description": "URI of a resource referenced from a notification. Should be an absolute URI (i.e. a URI that contains {apiRoot}), however, may be a relative URI (i.e. a URI where the {apiRoot} part is omitted) if the {apiRoot} information is not available.\n",
-              "type": "string",
-              "format": "url"
+      },
+      "probableCause": {
+        "description": "Information about the probable cause of the fault.\n",
+        "type": "string"
+      },
+      "isRootCause": {
+        "description": "Attribute indicating if this fault is the root for other correlated alarms. If TRUE, then the alarms listed in the attribute CorrelatedAlarmId are caused by this fault.\n",
+        "type": "boolean"
+      },
+      "correlatedAlarmIds": {
+        "description": "List of identifiers of other alarms correlated to this fault.\n",
+        "type": "array",
+        "items": {
+          "description": "An identifier with the intention of being globally unique.\n",
+          "type": "string"
+        }
+      },
+      "faultDetails": {
+        "description": "Provides additional information about the fault..\n",
+        "type": "string"
+      },
+      "_links": {
+        "description": "Links for this resource.\n",
+        "type": "object",
+        "required": [
+          "self"
+        ],
+        "properties": {
+          "self": {
+            "description": "This type represents a link to a resource.\n",
+            "type": "object",
+            "required": [
+              "href"
+            ],
+            "properties": {
+              "href": {
+                "description": "URI of a resource referenced from a notification. Should be an absolute URI (i.e. a URI that contains {apiRoot}), however, may be a relative URI (i.e. a URI where the {apiRoot} part is omitted) if the {apiRoot} information is not available.\n",
+                "type": "string",
+                "format": "url"
+              }
             }
           }
         }
       }
     }
-  }
-}
\ No newline at end of file
+  }
\ No newline at end of file
diff --git a/SOL005/NSFaultManagement-API/schemas/alarms.schema.json b/SOL005/NSFaultManagement-API/schemas/alarms.schema.json
index 284a1fa1c..716025e57 100644
--- a/SOL005/NSFaultManagement-API/schemas/alarms.schema.json
+++ b/SOL005/NSFaultManagement-API/schemas/alarms.schema.json
@@ -7,7 +7,6 @@
       "id",
       "managedObjectId",
       "alarmRaisedTime",
-      "rootCauseFaultyComponent",
       "ackState",
       "perceivedSeverity",
       "eventTime",
@@ -99,6 +98,10 @@
         "description": "Date-time stamp. Representation: String formatted according toas defined by the date-time production in IETF RFC 3339.\n",
         "format": "date-time"
       },
+      "alarmAcknowledgedTime": {
+        "description": "Date-time stamp. Representation: String formatted according toas defined by the date-time production in IETF RFC 3339.\n",
+        "format": "date-time"
+      },
       "ackState": {
         "description": "Acknowledgment state of the alarm. Permitted values: UNACKNOWLEDGED ACKNOWLEDGED\n",
         "type": "string",
-- 
GitLab


From 518a3516e000a8a9368ba39e41b41b511b8e4966 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 3 Nov 2020 12:20:24 +0500
Subject: [PATCH 126/322] added majorApiVersion and fix minor bugs

---
 SOL005/NSFaultManagement-API/Alarms.robot     |  33 +++---
 SOL005/NSFaultManagement-API/ApiVersion.robot |  10 +-
 .../IndividualAlarm.robot                     |   9 +-
 .../IndividualSubscription.robot              |   5 +-
 .../NSFMOperationKeywords.robot               | 106 +++++++++---------
 .../NSFaultManagement-API/Subscriptions.robot |  22 ++--
 .../environment/variables.txt                 |   2 +-
 7 files changed, 91 insertions(+), 96 deletions(-)

diff --git a/SOL005/NSFaultManagement-API/Alarms.robot b/SOL005/NSFaultManagement-API/Alarms.robot
index 50f47bcd7..4650a5b89 100644
--- a/SOL005/NSFaultManagement-API/Alarms.robot
+++ b/SOL005/NSFaultManagement-API/Alarms.robot
@@ -15,7 +15,7 @@ POST Alarms - Method not implemented
     ...    Reference: Clause 8.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none 
-    ...    Post-Conditions:  alarm not created
+    ...    Post-Conditions:  none
     POST Alarms
     Check HTTP Response Status Code Is    405
 
@@ -62,11 +62,11 @@ GET information about multiple alarms with "all_fields" attribute selector
     [Documentation]    Test ID: 5.3.3.1.5
     ...    Test title: GET information about multiple alarms with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Alarms Task with all_fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    alarms
@@ -75,11 +75,11 @@ GET information about multiple alarms with exclude_default attribute selector
     [Documentation]    Test ID: 5.3.3.1.6
     ...    Test title: GET information about multiple alarms with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Alarms Task with exclude_default attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    alarms
@@ -89,11 +89,11 @@ GET information about multiple alarms with fields attribute selector
     [Documentation]    Test ID: 5.3.3.1.7
     ...    Test title: GET information about multiple alarms with fields attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     GET Alarms Task with fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    alarms
@@ -102,10 +102,10 @@ GET information about multiple alarms with "exclude_fields" attribute selector
     [Documentation]    Test ID: 5.3.3.1.8
     ...    Test title: GET information about multiple alarms with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: none
     GET Alarms Task with exclude_fields attribute selector
     Check HTTP Response Status Code Is    200
@@ -123,7 +123,6 @@ PUT Alarms - Method not implemented
     PUT Alarms
     Check HTTP Response Status Code Is    405
     
-    
 PATCH Alarms - Method not implemented
     [Documentation]    Test ID: 5.3.3.1.6
     ...    Test title: PATCH Alarms - Method not implemented
@@ -144,7 +143,7 @@ DELETE Alarms - Method not implemented
     ...    Reference: Clause 8.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
-    ...    Post-Conditions: alarm not deleted
+    ...    Post-Conditions: none
     DELETE Alarms
     Check HTTP Response Status Code Is    405
 
@@ -159,7 +158,7 @@ GET information about multiple alarms as Paged Response
     ...    Post-Conditions: none
     GET Alarms
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contains Location
     
 GET information about multiple alarms - Bad Request Response too Big
     [Documentation]    Test ID: 5.3.3.1.9
@@ -230,7 +229,6 @@ GET information about multiple alarms with filter "rootCauseFaultyComponent.faul
     Check HTTP Response Body Json Schema Is    alarms
     Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "faultyVnfInstanceId"
     
-
 GET information about multiple alarms with filter "rootCauseFaultyResource.faultyResourceType"
      [Documentation]    Test ID: 5.3.3.1.14
     ...    Test title: GET information about multiple alarms with filter "rootCauseFaultyResource.faultyResourceType"
@@ -285,5 +283,4 @@ GET information about multiple alarms with filter "probableCause"
     GET Alarms with filter "probableCause"
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    alarms
-    Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "probableCause"
-    
\ No newline at end of file
+    Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "probableCause"
\ No newline at end of file
diff --git a/SOL005/NSFaultManagement-API/ApiVersion.robot b/SOL005/NSFaultManagement-API/ApiVersion.robot
index 18dc486a9..47ae5def9 100644
--- a/SOL005/NSFaultManagement-API/ApiVersion.robot
+++ b/SOL005/NSFaultManagement-API/ApiVersion.robot
@@ -169,35 +169,35 @@ DELETE API Version
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/v1/api_version
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/v1/api_version
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/v1/api_version
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/v1/api_version
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/v1/api_version
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
diff --git a/SOL005/NSFaultManagement-API/IndividualAlarm.robot b/SOL005/NSFaultManagement-API/IndividualAlarm.robot
index b6481159f..d0b5dafe4 100644
--- a/SOL005/NSFaultManagement-API/IndividualAlarm.robot
+++ b/SOL005/NSFaultManagement-API/IndividualAlarm.robot
@@ -17,7 +17,7 @@ POST Individual Alarm - Method not implemented
     ...    Reference: Clause 8.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions:  alarm is not created
+    ...    Post-Conditions:  none
     POST Individual Alarm
     Check HTTP Response Status Code Is    405
 
@@ -45,7 +45,7 @@ GET information about Invalid Individual Alarm
     ...    Post-Conditions:   none 
     GET Invalid Individual Alarm
     Check HTTP Response Status Code Is    404
-    
+    Check HTTP Response Body Json Schema Is    ProblemDetails
 
 PUT Individual Alarm - Method not implemented
     [Documentation]    Test ID: 5.3.3.2.4
@@ -85,7 +85,6 @@ PATCH Alarm - Conflict
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
    
-
 PATCH Alarm - Precondition failed
     [Documentation]    Test ID: 5.3.3.2.7
     ...    Test title: Modify an individual alarm resource - Precondition failed
@@ -107,6 +106,6 @@ DELETE Individual Alarm - Method not implemented
     ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
-    ...    Post-Conditions: alarm not deleted
+    ...    Post-Conditions: none
     DELETE Individual Alarm
-    Check HTTP Response Status Code Is    405
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/NSFaultManagement-API/IndividualSubscription.robot b/SOL005/NSFaultManagement-API/IndividualSubscription.robot
index 50ab67ca2..b89a65012 100644
--- a/SOL005/NSFaultManagement-API/IndividualSubscription.robot
+++ b/SOL005/NSFaultManagement-API/IndividualSubscription.robot
@@ -14,7 +14,7 @@ Post Individual Subscription - Method not implemented
     ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: subscription is not created
+    ...    Post-Conditions: none
     POST Individual Subscription
     Check HTTP Response Status Code Is    405
 
@@ -65,5 +65,4 @@ DELETE an individual subscription
     ...    Applicability:  none
     ...    Post-Conditions: subscription is not deleted
     DELETE Individual Subscription
-    Check HTTP Response Status Code Is    204
-    
\ No newline at end of file
+    Check HTTP Response Status Code Is    204
\ No newline at end of file
diff --git a/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot b/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
index f2df28a61..ab113914a 100644
--- a/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
+++ b/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
@@ -19,7 +19,7 @@ Create Sessions
 Check Individual Subscription existence
     Set Headers    {"Accept":"${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
     Integer    response status    200
     
 Check HTTP Response Status Code Is
@@ -61,7 +61,7 @@ POST Alarms
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/alarms
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -69,7 +69,7 @@ PATCH Alarms
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/alarms
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse} =    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -77,7 +77,7 @@ PUT Alarms
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/alarms
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -85,7 +85,7 @@ DELETE Alarms
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/alarms
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -94,7 +94,7 @@ GET Alarms
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -103,7 +103,7 @@ GET Alarms With Filters
 	Set Headers  {"Accept":"${ACCEPT}"}  
 	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
 	Log    Execute Query
-	Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?${alarm_filter}=${nsInstanceId}
+	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?${alarm_filter}=${nsInstanceId}
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -112,42 +112,42 @@ GET Alarms With Invalid Filters
 	Set Headers  {"Accept":"${ACCEPT}"}  
 	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
 	Log    Execute Query
-	Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?${invalid_alarm_filter}=${nsInstanceId}
+	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?${invalid_alarm_filter}=${nsInstanceId}
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 GET Alarms Task with all_fields attribute selector
     Log    Query VNF The GET method queries information about multiple alarms, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/alarms?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 GET Alarms Task with exclude_default attribute selector
     Log    Query VNF The GET method queries information about multiple alarms, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/alarms?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 GET Alarms Task with fields attribute selector
     Log    Query VNF The GET method queries information about multiple alarms, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/alarms?fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 GET Alarms Task with exclude_fields attribute selector
     Log    Query VNF The GET method queries information about multiple alarms, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/alarms?exclude_fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}    
 POST Individual Alarm
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -155,7 +155,7 @@ DELETE Individual Alarm
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -163,7 +163,7 @@ PUT Individual Alarm
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
 
@@ -173,7 +173,7 @@ GET Individual Alarm
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query 
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -183,7 +183,7 @@ GET Invalid Individual Alarm
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query 
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms/${invalidAlarmId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${invalidAlarmId}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
    
@@ -193,7 +193,7 @@ PATCH Individual Alarm
     Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/alarmModifications.json
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}    ${body}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}    ${body}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
    
@@ -204,18 +204,18 @@ PATCH Individual Alarm Conflict
     Set Headers    {"If-Match": "${Etag}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/alarmModifications.json
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}    ${body}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}    ${body}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
 POST Subscription
-    Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
 
@@ -227,7 +227,7 @@ Post Create subscription - DUPLICATION
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}		
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 	
@@ -239,7 +239,7 @@ Post Create subscription - NO-DUPLICATION
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 	
@@ -247,7 +247,7 @@ GET Subscriptions
     Log    Get the list of active subscriptions
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
         
@@ -255,7 +255,7 @@ GET Subscriptions with filter
     Log    Get the list of active subscriptions using a filter
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}    
     
@@ -263,7 +263,7 @@ GET Subscriptions with Invalid filter
     Log    Get the list of active subscriptions using an invalid filter
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter_invalid}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter_invalid}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -271,35 +271,35 @@ Get subscriptions with all_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get subscriptions with exclude_default attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get subscriptions with fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 Get subscriptions with exclude_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?exclude_fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}     
 PUT Subscriptions
     log    Trying to perform a PUT Subscriptions. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -307,7 +307,7 @@ PATCH Subscriptions
     log    Trying to perform a PATCH Subscriptions. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -315,7 +315,7 @@ DELETE Subscriptions
     log    Trying to perform a DELETE Subscriptions. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -323,7 +323,7 @@ POST Individual Subscription
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}  
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -331,7 +331,7 @@ GET Individual Subscription
     log    Trying to get information about an individual subscription
     Set Headers    {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}   
     
@@ -339,7 +339,7 @@ PUT Individual Subscription
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}  
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -347,7 +347,7 @@ PATCH Individual Subscription
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}  
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
 
@@ -355,7 +355,7 @@ DELETE Individual Subscription
     log    Trying to perform a DELETE.
     Set Headers  {"Accept":"${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}  
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
     
@@ -428,7 +428,7 @@ Do DELETE Notification
     Log  Verifying results
     Verify Mock Expectation  ${req}
     
-Check LINK in Header
+Check HTTP Response Header Contains Location
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
 
@@ -437,7 +437,7 @@ GET Alarm With Filter "id"
 	Set Headers  {"Accept":"${ACCEPT}"}  
 	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
 	Log    Execute Query
-	Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?id=${alarmId}
+	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?id=${alarmId}
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -449,7 +449,7 @@ GET Alarms With Filter "rootCauseFaultyComponent_faultyNestedNsInstanceId"
 	Set Headers  {"Accept":"${ACCEPT}"}  
 	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
 	Log    Execute Query
-	Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?rootCauseFaultyComponent.faultyNestedNsInstanceId=${faultyNestedNsInstanceId}
+	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?rootCauseFaultyComponent.faultyNestedNsInstanceId=${faultyNestedNsInstanceId}
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -463,7 +463,7 @@ GET Alarms With Filter "rootCauseFaultyComponent_faultyNsVirtualLinkInstanceId"
 	Set Headers  {"Accept":"${ACCEPT}"}  
 	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
 	Log    Execute Query
-	Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?rootCauseFaultyComponent.faultyNsVirtualLinkInstanceId=${faultyNsVirtualLinkInstanceId}
+	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?rootCauseFaultyComponent.faultyNsVirtualLinkInstanceId=${faultyNsVirtualLinkInstanceId}
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -477,7 +477,7 @@ GET Alarms With Filter "rootCauseFaultyComponent_faultyVnfInstanceId"
 	Set Headers  {"Accept":"${ACCEPT}"}  
 	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
 	Log    Execute Query
-	Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?rootCauseFaultyComponent.faultyVnfInstanceId=${faultyVnfInstanceId}
+	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?rootCauseFaultyComponent.faultyVnfInstanceId=${faultyVnfInstanceId}
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -491,7 +491,7 @@ GET Alarms With Filter "rootCauseFaultyResource_faultyResourceType"
 	Set Headers  {"Accept":"${ACCEPT}"}  
 	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
 	Log    Execute Query
-	Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?rootCauseFaultyResource.faultyResourceType=${faultyResourceType}
+	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?rootCauseFaultyResource.faultyResourceType=${faultyResourceType}
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -505,7 +505,7 @@ GET Alarms with filter "eventType"
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?eventType=${eventType}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?eventType=${eventType}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -519,7 +519,7 @@ GET Alarms with filter "perceivedSeverity"
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?perceivedSeverity=${perceivedSeverity}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?perceivedSeverity=${perceivedSeverity}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -533,7 +533,7 @@ GET Alarms with filter "probableCause"
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?probableCause=${probableCause}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?probableCause=${probableCause}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -546,7 +546,7 @@ Get subscriptions with filter "id"
     Log    Get the list of active subscriptions using a filter "id"
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?id=${subscription_id}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?id=${subscription_id}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -557,7 +557,7 @@ Get subscriptions with filter "filter_notificationTypes"
     Log    Get the list of active subscriptions using a filter "filter.notificationTypes"
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?filter.notificationTypes=${notification_type}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.notificationTypes=${notification_type}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -570,7 +570,7 @@ Get subscriptions with filter "filter_faultyResourceTypes"
     Log    Get the list of active subscriptions using a filter "filter.faultyResourceTypes"
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?filter.faultyResourceTypes=${faultyResourceType}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.faultyResourceTypes=${faultyResourceType}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -583,7 +583,7 @@ Get subscriptions with filter "filter_perceivedSeverities"
     Log    Get the list of active subscriptions using a filter "filter.perceivedSeverities"
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?filter.perceivedSeverities=${perceivedSeverity}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.perceivedSeverities=${perceivedSeverity}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -596,7 +596,7 @@ Get subscriptions with filter "filter_eventTypes"
     Log    Get the list of active subscriptions using a filter "filter.eventTypes"
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?filter.eventTypes=${eventType}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.eventTypes=${eventType}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
@@ -609,7 +609,7 @@ Get subscriptions with filter "filter_probableCauses"
     Log    Get the list of active subscriptions using a filter "filter.probableCauses"
     Set Headers    {"Accept": "${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?filter.probableCauses=${probableCause}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.probableCauses=${probableCause}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 
diff --git a/SOL005/NSFaultManagement-API/Subscriptions.robot b/SOL005/NSFaultManagement-API/Subscriptions.robot
index 1aea8c7f9..4b7e352fa 100644
--- a/SOL005/NSFaultManagement-API/Subscriptions.robot
+++ b/SOL005/NSFaultManagement-API/Subscriptions.robot
@@ -105,11 +105,11 @@ GET subscriptions with "exclude_default" attribute selector
     [Documentation]    Test ID: 5.3.3.3.8
     ...    Test title: GET subscriptions with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
-    ...    Applicability:  
-    ...    Post-Conditions: 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
     Get subscriptions with exclude_default attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   FmSubscriptions
@@ -118,11 +118,11 @@ GET subscriptions with "fields" attribute selector
     [Documentation]    Test ID: 5.3.3.3.9
     ...    Test title: GET subscriptions with "fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
-    ...    Applicability:  
-    ...    Post-Conditions: 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
     Get subscriptions with fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   FmSubscriptions
@@ -131,11 +131,11 @@ GET subscriptions with "exclude_fields" attribute selector
     [Documentation]    Test ID: 5.3.3.3.10
     ...    Test title: GET subscriptions with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
-    ...    Applicability:  
-    ...    Post-Conditions: 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
     Get subscriptions with exclude_fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   FmSubscriptions  
@@ -172,7 +172,7 @@ DELETE subscriptions - Method not implemented
     ...    Reference: Clause 8.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
-    ...    Post-Conditions: subscription is not deleted
+    ...    Post-Conditions: none
     DELETE Subscriptions
     Check HTTP Response Status Code Is    405
     
@@ -187,7 +187,7 @@ Retrieve a list of alarm subscriptions as Paged Response
     ...    Post-Conditions: none
     GET Subscriptions
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contains Location
     
 GET subscriptions - Bad Request Response too Big
     [Documentation]    Test ID: 5.3.3.3.15
diff --git a/SOL005/NSFaultManagement-API/environment/variables.txt b/SOL005/NSFaultManagement-API/environment/variables.txt
index 7f86938c5..78e923fd0 100644
--- a/SOL005/NSFaultManagement-API/environment/variables.txt
+++ b/SOL005/NSFaultManagement-API/environment/variables.txt
@@ -11,7 +11,7 @@ ${nsInstanceId}    007c111c-38a1-42c0-a666-7475ecb1567c
 ${invalid_alarm_filter}    badFilter 
 ${apiRoot}        /
 ${apiName}        nsfm
-${apiVersion}     v1
+${apiMajorVersion}     v1
 ${CONTENT_TYPE}    application/json
 
 ${NFVO_ALLOWS_DUPLICATE_SUBS}     0
-- 
GitLab


From 49f601a47de62984ccfffd959101afc2fbc899eb Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Tue, 3 Nov 2020 12:55:10 +0100
Subject: [PATCH 127/322] fix for issue #121 in SOL005-NSD-Management

---
 .../IndividualNSDescriptor.robot              |  1 -
 .../IndividualPnfDescriptor.robot             |  1 -
 .../IndividualSubscription.robot              |  1 -
 SOL005/NSDManagement-API/NSD.robot            |  1 -
 .../NSDManagement-API/NSDArchiveContent.robot |  1 -
 .../NSDArchiveManifest.robot                  |  1 -
 .../NSDManagementKeywords.robot               |  3 -
 SOL005/NSDManagement-API/NSDescriptors.robot  |  1 -
 SOL005/NSDManagement-API/PNFD.robot           |  1 -
 .../PNFDArchiveContent.robot                  |  1 -
 .../PNFDArchiveManifest.robot                 |  1 -
 SOL005/NSDManagement-API/PNFDescriptors.robot |  1 -
 SOL005/NSDManagement-API/Subscriptions.robot  |  1 -
 .../environment/individualSubscription.txt    |  6 --
 .../environment/nsDescriptors.txt             | 34 -----------
 .../environment/pnfDescriptors.txt            | 15 -----
 .../environment/subscriptions.txt             |  5 --
 .../environment/variables.txt                 | 58 ++++++++++++++++++-
 18 files changed, 56 insertions(+), 77 deletions(-)
 delete mode 100644 SOL005/NSDManagement-API/environment/individualSubscription.txt
 delete mode 100644 SOL005/NSDManagement-API/environment/nsDescriptors.txt
 delete mode 100644 SOL005/NSDManagement-API/environment/pnfDescriptors.txt
 delete mode 100644 SOL005/NSDManagement-API/environment/subscriptions.txt

diff --git a/SOL005/NSDManagement-API/IndividualNSDescriptor.robot b/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
index a40de6a1f..cde65701a 100644
--- a/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
+++ b/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
@@ -2,7 +2,6 @@
 Documentation     This Clause defines all the resources and methods provided by the Individual NS descriptor interface. \
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/nsDescriptors.txt    # Specific nsDescriptors Parameters
 Resource          NSDManagementKeywords.robot
 Library           OperatingSystem
 Library           JSONLibrary
diff --git a/SOL005/NSDManagement-API/IndividualPnfDescriptor.robot b/SOL005/NSDManagement-API/IndividualPnfDescriptor.robot
index 25e264186..8b88fc1fe 100644
--- a/SOL005/NSDManagement-API/IndividualPnfDescriptor.robot
+++ b/SOL005/NSDManagement-API/IndividualPnfDescriptor.robot
@@ -2,7 +2,6 @@
 Documentation     This Clause defines all the resources and methods provided by the Iindividual PNF descriptor interface. \
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/pnfDescriptors.txt    # Specific nsDescriptors Parameters
 Resource          NSDManagementKeywords.robot
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
diff --git a/SOL005/NSDManagement-API/IndividualSubscription.robot b/SOL005/NSDManagement-API/IndividualSubscription.robot
index 2b3ef1c62..ec23f9937 100644
--- a/SOL005/NSDManagement-API/IndividualSubscription.robot
+++ b/SOL005/NSDManagement-API/IndividualSubscription.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/individualSubscription.txt
 Resource          NSDManagementKeywords.robot
 Library           OperatingSystem
 Library           JSONLibrary
diff --git a/SOL005/NSDManagement-API/NSD.robot b/SOL005/NSDManagement-API/NSD.robot
index f91965cae..7e4041b76 100644
--- a/SOL005/NSDManagement-API/NSD.robot
+++ b/SOL005/NSDManagement-API/NSD.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/nsDescriptors.txt    # Specific nsDescriptors Parameters
 Resource          NSDManagementKeywords.robot
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
diff --git a/SOL005/NSDManagement-API/NSDArchiveContent.robot b/SOL005/NSDManagement-API/NSDArchiveContent.robot
index 045c3f3af..dd887b574 100644
--- a/SOL005/NSDManagement-API/NSDArchiveContent.robot
+++ b/SOL005/NSDManagement-API/NSDArchiveContent.robot
@@ -2,7 +2,6 @@
 Documentation     This Clause defines the content of the individual NS descriptor, i.e. NSD content
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/nsDescriptors.txt    # Specific nsDescriptors Parameters
 Resource          NSDManagementKeywords.robot
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
diff --git a/SOL005/NSDManagement-API/NSDArchiveManifest.robot b/SOL005/NSDManagement-API/NSDArchiveManifest.robot
index 3980452b9..e28a30b3b 100644
--- a/SOL005/NSDManagement-API/NSDArchiveManifest.robot
+++ b/SOL005/NSDManagement-API/NSDArchiveManifest.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/nsDescriptors.txt    # Specific nsDescriptors Parameters
 Resource          NSDManagementKeywords.robot
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index 2b73948e7..35b37bc0e 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -1,8 +1,5 @@
 *** Settings ***
 Resource    environment/variables.txt
-Resource    environment/subscriptions.txt
-Resource    environment/nsDescriptors.txt    # Specific nsDescriptors Parameters
-Resource    environment/pnfDescriptors.txt    # Specific pnfDescriptors Parameters
 Resource    environment/individualSubscription.txt
 Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false 
 Library    MockServerLibrary 
diff --git a/SOL005/NSDManagement-API/NSDescriptors.robot b/SOL005/NSDManagement-API/NSDescriptors.robot
index f0460c39b..1e4c1086b 100644
--- a/SOL005/NSDManagement-API/NSDescriptors.robot
+++ b/SOL005/NSDManagement-API/NSDescriptors.robot
@@ -2,7 +2,6 @@
 Documentation     This Clause defines all the resources and methods provided by the NS descriptors interface.
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/nsDescriptors.txt    # Specific nsDescriptors Parameters
 Resource          NSDManagementKeywords.robot
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
diff --git a/SOL005/NSDManagement-API/PNFD.robot b/SOL005/NSDManagement-API/PNFD.robot
index c63bc467c..a6fb7b6c8 100644
--- a/SOL005/NSDManagement-API/PNFD.robot
+++ b/SOL005/NSDManagement-API/PNFD.robot
@@ -2,7 +2,6 @@
 Documentation     This Clause defines the content of the individual NS descriptor, i.e. PNFD content
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/pnfDescriptors.txt    # Specific PNFDescriptors Parameters
 Resource          NSDManagementKeywords.robot
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
diff --git a/SOL005/NSDManagement-API/PNFDArchiveContent.robot b/SOL005/NSDManagement-API/PNFDArchiveContent.robot
index 7a1697cc0..79392484a 100644
--- a/SOL005/NSDManagement-API/PNFDArchiveContent.robot
+++ b/SOL005/NSDManagement-API/PNFDArchiveContent.robot
@@ -2,7 +2,6 @@
 Documentation     This Clause defines the content of the individual NS descriptor, i.e. PNFD content
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/pnfDescriptors.txt    # Specific PNFDescriptors Parameters
 Resource          NSDManagementKeywords.robot
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
diff --git a/SOL005/NSDManagement-API/PNFDArchiveManifest.robot b/SOL005/NSDManagement-API/PNFDArchiveManifest.robot
index 7c3e330db..876c862c2 100644
--- a/SOL005/NSDManagement-API/PNFDArchiveManifest.robot
+++ b/SOL005/NSDManagement-API/PNFDArchiveManifest.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/nsDescriptors.txt    # Specific nsDescriptors Parameters
 Resource          NSDManagementKeywords.robot
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
diff --git a/SOL005/NSDManagement-API/PNFDescriptors.robot b/SOL005/NSDManagement-API/PNFDescriptors.robot
index 6d6b84239..935f789be 100644
--- a/SOL005/NSDManagement-API/PNFDescriptors.robot
+++ b/SOL005/NSDManagement-API/PNFDescriptors.robot
@@ -2,7 +2,6 @@
 Documentation     This Clause defines all the resources and methods provided by the PNF descriptors interface. \
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/pnfDescriptors.txt    # Specific nsDescriptors Parameters
 Resource          NSDManagementKeywords.robot
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
diff --git a/SOL005/NSDManagement-API/Subscriptions.robot b/SOL005/NSDManagement-API/Subscriptions.robot
index 1f1ae1249..bcff75e5a 100644
--- a/SOL005/NSDManagement-API/Subscriptions.robot
+++ b/SOL005/NSDManagement-API/Subscriptions.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/subscriptions.txt
 Resource          NSDManagementKeywords.robot
 Library           OperatingSystem
 Library           JSONLibrary
diff --git a/SOL005/NSDManagement-API/environment/individualSubscription.txt b/SOL005/NSDManagement-API/environment/individualSubscription.txt
deleted file mode 100644
index caf1c582e..000000000
--- a/SOL005/NSDManagement-API/environment/individualSubscription.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-*** Variables ***
-${subscriptionId}    f3ae6df7-07e1-47c9-8924-9ebe10343586
-${erroneousSubscriptionId}    442e3ee5-0499-4849-9b31-eb91ce1638f1    # Not existing ID on the subscriptions
-${newSubscriptionId}    newSubsciptionId
-${response}    httpresponse
-${origResponse}    httpresponse
diff --git a/SOL005/NSDManagement-API/environment/nsDescriptors.txt b/SOL005/NSDManagement-API/environment/nsDescriptors.txt
deleted file mode 100644
index b16e19ee9..000000000
--- a/SOL005/NSDManagement-API/environment/nsDescriptors.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-*** Variables ***
-${POS_FIELDS}     name=nsdOnboardingState
-${NEG_FIELDS}     wrongName=any_value
-${nsdInfoId}    5a569e1d-4ffe-4e9a-8cf6-c24226651e56
-${nsdInfoIdPlain}    5a569e1d-4ffe-4e9a-8cf6-c24226651e56
-${nsdInfoIdZip}    5a569e1d-4ffe-4e9a-8cf6-c24226651e56
-${erroneous_nsdInfoId}  erroneous_nsdInfoId
-${disabledNsdInfoId}  5a569e1d-4ffe-4e9a-8cf6-c24226651e56
-${fields}    _links
-${NFVO_FIELDS}    1
-${Etag}=    an etag
-${modifiedNsdInfoId}    f27200b1-1d8b-48c2-9d98-a993b8ab117f
-${notOnboardedNsdInfoId}    b992a851-08b1-45a8-9282-a5f7a7df04a6
-${ACCEPT_ZIP}    application/zip
-${ACCEPT_PLAIN}    text/plain
-${CONTENT_TYPE_ZIP}    application/zip
-${CONTENT_TYPE_PLAIN}    text/plain
-${NFVO_RANGE_OK}    1
-${range}          bytes=0-1023
-${erroneousRange}    bytes=100000-1000000    # Requesting a out of range number of bytes
-${onboardingStateNsdInfoId}    b992a851-08b1-45a8-9282-a5f7a7df04a6
-${contentZipFile}    files/nsdContent.zip
-${contentPlainFile}    files/nsdContent.yaml
-${creatingNsdInfoId}    71241932-994a-46e2-ad6c-1740674dda44
-${NEG_AUTHORIZATION}    Bearer negativetoken
-${BAD_AUTHORIZATION}    Bear sometoken
-${original_etag}    1234
-${wrong_etag}    abcd
-${usageState}    state
-${length}          1024
-${createdNsdInfoId}    f27200b1-1d8b-48c2-9d98-a993b8ab117f
-${NSD_NAME}     nsdName=onBoardedNSD
-${PNFD_NAME}     pnfdName=onBoardedPNFD
-${SEPERATOR}      =
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/environment/pnfDescriptors.txt b/SOL005/NSDManagement-API/environment/pnfDescriptors.txt
deleted file mode 100644
index c3bf1896b..000000000
--- a/SOL005/NSDManagement-API/environment/pnfDescriptors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-*** Variables ***
-${POS_FIELDS}     name=pnfdOnboardingState
-${NEG_FIELDS}     wrongName=any_value
-${pnfdInfoId}    40853bda-8a8f-4f63-9130-cef439f65348
-${erroneous_pnfdInfoId}  erroneous_pnfdInfoId
-${enabledPnfdInfoId}  40853bda-8a8f-4f63-9130-cef439f65348
-${NFVO_FIELDS}    1
-${fields}    _links
-${ACCEPT_PLAIN}    text/plain
-${CONTENT_TYPE_PLAIN}    text/plain
-${erroneous_pnfdId}    erroneousPnfdId
-${onboardingStatePnfdId}    8ed2bf1f-f6ae-4d18-b478-bfab02fd4cd2
-${contentFilePnfd}    files/pnfdContent.zip
-${creatingPnfdId}    2e4ce0ef-3ea8-49f9-92dd-8771866015bb
-${userDefinedDataSet}    some
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/environment/subscriptions.txt b/SOL005/NSDManagement-API/environment/subscriptions.txt
deleted file mode 100644
index 72c529236..000000000
--- a/SOL005/NSDManagement-API/environment/subscriptions.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-*** Variables ***
-${notifCallbackUri}     http://172.22.1.7:9091/nsd/subscriptions
-${filter_ok}      callbackUri=${notifCallbackUri}
-${filter_ko}      nfvId=f9f130e4-05eb-4082-a676-4c97d13a883d    # Not existant filter attribute-based
-${SEPERATOR}      =
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/environment/variables.txt b/SOL005/NSDManagement-API/environment/variables.txt
index c76778b56..ad6a34beb 100644
--- a/SOL005/NSDManagement-API/environment/variables.txt
+++ b/SOL005/NSDManagement-API/environment/variables.txt
@@ -33,6 +33,60 @@ ${NFVO_CHECKS_NOTIF_ENDPOINT}    1        ## If true, during subscription, the F
 ${NFVO_ALLOWS_DUPLICATE_SUBS}    1
 ${total_polling_time}   2 min
 ${polling_interval}     10 sec
-${response}    {}
+${response}    httpresponse
 ${retry}		5x
-${interval}		5 sec
\ No newline at end of file
+${interval}		5 sec
+
+
+${subscriptionId}    f3ae6df7-07e1-47c9-8924-9ebe10343586
+${erroneousSubscriptionId}    442e3ee5-0499-4849-9b31-eb91ce1638f1    # Not existing ID on the subscriptions
+${newSubscriptionId}    newSubsciptionId    
+${origResponse}    httpresponse
+
+
+${POS_FIELDS}     name=nsdOnboardingState
+${NEG_FIELDS}     wrongName=any_value
+${nsdInfoId}    5a569e1d-4ffe-4e9a-8cf6-c24226651e56
+${nsdInfoIdPlain}    5a569e1d-4ffe-4e9a-8cf6-c24226651e56
+${nsdInfoIdZip}    5a569e1d-4ffe-4e9a-8cf6-c24226651e56
+${erroneous_nsdInfoId}  erroneous_nsdInfoId
+${disabledNsdInfoId}  5a569e1d-4ffe-4e9a-8cf6-c24226651e56
+${fields}    _links
+${NFVO_FIELDS}    1
+${Etag}=    an etag
+${modifiedNsdInfoId}    f27200b1-1d8b-48c2-9d98-a993b8ab117f
+${notOnboardedNsdInfoId}    b992a851-08b1-45a8-9282-a5f7a7df04a6
+${ACCEPT_ZIP}    application/zip
+${ACCEPT_PLAIN}    text/plain
+${CONTENT_TYPE_ZIP}    application/zip
+${CONTENT_TYPE_PLAIN}    text/plain
+${NFVO_RANGE_OK}    1
+${range}          bytes=0-1023
+${erroneousRange}    bytes=100000-1000000    # Requesting a out of range number of bytes
+${onboardingStateNsdInfoId}    b992a851-08b1-45a8-9282-a5f7a7df04a6
+${contentZipFile}    files/nsdContent.zip
+${contentPlainFile}    files/nsdContent.yaml
+${creatingNsdInfoId}    71241932-994a-46e2-ad6c-1740674dda44
+${BAD_AUTHORIZATION}    Bear sometoken
+${original_etag}    1234
+${wrong_etag}    abcd
+${usageState}    state
+${length}          1024
+${createdNsdInfoId}    f27200b1-1d8b-48c2-9d98-a993b8ab117f
+${NSD_NAME}     nsdName=onBoardedNSD
+${PNFD_NAME}     pnfdName=onBoardedPNFD
+${SEPERATOR}      =
+
+
+${pnfdInfoId}    40853bda-8a8f-4f63-9130-cef439f65348
+${erroneous_pnfdInfoId}  erroneous_pnfdInfoId
+${enabledPnfdInfoId}  40853bda-8a8f-4f63-9130-cef439f65348
+${erroneous_pnfdId}    erroneousPnfdId
+${onboardingStatePnfdId}    8ed2bf1f-f6ae-4d18-b478-bfab02fd4cd2
+${contentFilePnfd}    files/pnfdContent.zip
+${creatingPnfdId}    2e4ce0ef-3ea8-49f9-92dd-8771866015bb
+${userDefinedDataSet}    some
+
+${notifCallbackUri}     http://172.22.1.7:9091/nsd/subscriptions
+${filter_ok}      callbackUri=${notifCallbackUri}
+${filter_ko}      nfvId=f9f130e4-05eb-4082-a676-4c97d13a883d    # Not existant filter attribute-based
-- 
GitLab


From 63d2ff08b1e8e11fb23db3d57d7afa26391fc889 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Tue, 3 Nov 2020 13:12:54 +0100
Subject: [PATCH 128/322] fix for issue #121 in SOL005-NSD-Performance

---
 .../IndividualPmJob.robot                     |  1 -
 .../IndividualReport.robot                    |  1 -
 .../IndividualThreshold.robot                 |  1 -
 .../NSPerformanceManagementKeywords.robot     |  5 ---
 .../Notifications.robot                       |  1 -
 .../NSPerformanceManagement-API/PMJobs.robot  |  1 -
 .../Thresholds.robot                          |  1 -
 .../environment/IndividualPmJob.txt           |  6 ----
 .../environment/individualThresholds.txt      |  6 ----
 .../environment/notifications.txt             | 12 -------
 .../environment/pmJobs.txt                    |  4 ---
 .../environment/reports.txt                   |  7 -----
 .../environment/thresholds.txt                |  4 ---
 .../environment/variables.txt                 | 31 ++++++++++++++++++-
 14 files changed, 30 insertions(+), 51 deletions(-)
 delete mode 100644 SOL005/NSPerformanceManagement-API/environment/IndividualPmJob.txt
 delete mode 100644 SOL005/NSPerformanceManagement-API/environment/individualThresholds.txt
 delete mode 100644 SOL005/NSPerformanceManagement-API/environment/notifications.txt
 delete mode 100644 SOL005/NSPerformanceManagement-API/environment/pmJobs.txt
 delete mode 100644 SOL005/NSPerformanceManagement-API/environment/reports.txt
 delete mode 100644 SOL005/NSPerformanceManagement-API/environment/thresholds.txt

diff --git a/SOL005/NSPerformanceManagement-API/IndividualPmJob.robot b/SOL005/NSPerformanceManagement-API/IndividualPmJob.robot
index 3adb819eb..18afc44ca 100644
--- a/SOL005/NSPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL005/NSPerformanceManagement-API/IndividualPmJob.robot
@@ -2,7 +2,6 @@
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
 Library           JSONLibrary
-Resource          environment/IndividualPmJob.txt
 Resource          NSPerformanceManagementKeywords.robot
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
 
diff --git a/SOL005/NSPerformanceManagement-API/IndividualReport.robot b/SOL005/NSPerformanceManagement-API/IndividualReport.robot
index 5d35b0025..c27242894 100644
--- a/SOL005/NSPerformanceManagement-API/IndividualReport.robot
+++ b/SOL005/NSPerformanceManagement-API/IndividualReport.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/reports.txt
 Resource          NSPerformanceManagementKeywords.robot
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
diff --git a/SOL005/NSPerformanceManagement-API/IndividualThreshold.robot b/SOL005/NSPerformanceManagement-API/IndividualThreshold.robot
index 57458c1b0..9c19fbf18 100644
--- a/SOL005/NSPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL005/NSPerformanceManagement-API/IndividualThreshold.robot
@@ -6,7 +6,6 @@ Resource          NSPerformanceManagementKeywords.robot
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
 Library           OperatingSystem
-Resource          environment/individualThresholds.txt
 
 *** Test Cases ***
 GET Individual Threshold
diff --git a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
index e22cffb96..3da49c3c0 100644
--- a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
+++ b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
@@ -1,10 +1,5 @@
 *** Settings ***
 Resource    environment/variables.txt
-Resource    environment/pmJobs.txt
-Resource    environment/IndividualPmJob.txt
-Resource    environment/reports.txt
-Resource    environment/thresholds.txt
-Resource    environment/individualThresholds.txt
 Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
 Library    MockServerLibrary 
 Library    OperatingSystem
diff --git a/SOL005/NSPerformanceManagement-API/Notifications.robot b/SOL005/NSPerformanceManagement-API/Notifications.robot
index e05d5c696..18ab8e3f9 100644
--- a/SOL005/NSPerformanceManagement-API/Notifications.robot
+++ b/SOL005/NSPerformanceManagement-API/Notifications.robot
@@ -1,5 +1,4 @@
 *** Setting ***
-Resource	environment/notifications.txt
 Resource	environment/variables.txt
 Suite Setup    Create Sessions
 Suite Teardown    Terminate All Processes    kill=true
diff --git a/SOL005/NSPerformanceManagement-API/PMJobs.robot b/SOL005/NSPerformanceManagement-API/PMJobs.robot
index 315b42b67..2d21210a7 100644
--- a/SOL005/NSPerformanceManagement-API/PMJobs.robot
+++ b/SOL005/NSPerformanceManagement-API/PMJobs.robot
@@ -4,7 +4,6 @@ Resource          environment/variables.txt    # Generic Parameters
 Resource          NSPerformanceManagementKeywords.robot
 Library           JSONLibrary
 Library           OperatingSystem
-Resource          environment/pmJobs.txt
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
 Library           MockServerLibrary
 
diff --git a/SOL005/NSPerformanceManagement-API/Thresholds.robot b/SOL005/NSPerformanceManagement-API/Thresholds.robot
index 3c74956a8..cc1bc0fc4 100644
--- a/SOL005/NSPerformanceManagement-API/Thresholds.robot
+++ b/SOL005/NSPerformanceManagement-API/Thresholds.robot
@@ -5,7 +5,6 @@ Resource          environment/variables.txt    # Generic Parameters
 Resource          NSPerformanceManagementKeywords.robot
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
-Resource          environment/thresholds.txt
 Library           OperatingSystem
 
 *** Test Cases ***
diff --git a/SOL005/NSPerformanceManagement-API/environment/IndividualPmJob.txt b/SOL005/NSPerformanceManagement-API/environment/IndividualPmJob.txt
deleted file mode 100644
index 99a00a748..000000000
--- a/SOL005/NSPerformanceManagement-API/environment/IndividualPmJob.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-*** Variables ***
-${pmJobId}        29f4ff6a-be91-4ec8-856e-fcf1e2479e4e
-${erroneousPmJobId}    erroneousPmJobId
-${response}=    httpresponse
-${OrigResponse}=    httpresponse
-${newPmJobId}    newPmJobId
diff --git a/SOL005/NSPerformanceManagement-API/environment/individualThresholds.txt b/SOL005/NSPerformanceManagement-API/environment/individualThresholds.txt
deleted file mode 100644
index 92faec2b7..000000000
--- a/SOL005/NSPerformanceManagement-API/environment/individualThresholds.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-*** Variables ***
-${thresholdId}    1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
-${erroneousThresholdId}    erroneousThresholdId
-${newThresholdId}    newThresholdId
-${response}=    httpresponse
-${origResponse}=    httpresponse
diff --git a/SOL005/NSPerformanceManagement-API/environment/notifications.txt b/SOL005/NSPerformanceManagement-API/environment/notifications.txt
deleted file mode 100644
index cd1193ae5..000000000
--- a/SOL005/NSPerformanceManagement-API/environment/notifications.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-*** Variables ***
-${callback_uri}    http://localhost
-${callback_port}    9091
-${callback_endpoint}    /endpoint
-${callback_endpoint_fwd}    /endpoint/check
-${callback_endpoint_error}    /endpoint_404
-${sleep_interval}    20s
-${total_polling_time}   2 min
-${polling_interval}     10 sec
-
-${notification_request}    []
-${notification_response}    []
\ No newline at end of file
diff --git a/SOL005/NSPerformanceManagement-API/environment/pmJobs.txt b/SOL005/NSPerformanceManagement-API/environment/pmJobs.txt
deleted file mode 100644
index ee57a3091..000000000
--- a/SOL005/NSPerformanceManagement-API/environment/pmJobs.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-*** Variables ***
-${POS_FILTER}     objectInstanceIds=1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
-${NEG_FILTER}     criteriaPmJob=erroneousAttributeName
-${fields}         criteria,objectInstanceIds
diff --git a/SOL005/NSPerformanceManagement-API/environment/reports.txt b/SOL005/NSPerformanceManagement-API/environment/reports.txt
deleted file mode 100644
index 6ac5f7c0b..000000000
--- a/SOL005/NSPerformanceManagement-API/environment/reports.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-*** Variables ***
-${pmJobId}        1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
-${reportId}       0fb4c875-e07f-46ca-a9dd-13907667a568
-${erroneousReportId}    erroneousReportId
-${newReportId}    newReportId
-${response}=    httpresponse
-${OrigResponse}=    httpresponse
diff --git a/SOL005/NSPerformanceManagement-API/environment/thresholds.txt b/SOL005/NSPerformanceManagement-API/environment/thresholds.txt
deleted file mode 100644
index 587560f0d..000000000
--- a/SOL005/NSPerformanceManagement-API/environment/thresholds.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-*** Variables ***
-${FILTER_OK_Threshold}      objectInstanceId=1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
-${FILTER_KO}      criterias=erroneousFilter
-${SEPERATOR}      =
\ No newline at end of file
diff --git a/SOL005/NSPerformanceManagement-API/environment/variables.txt b/SOL005/NSPerformanceManagement-API/environment/variables.txt
index db2e7c3e5..932a511d1 100644
--- a/SOL005/NSPerformanceManagement-API/environment/variables.txt
+++ b/SOL005/NSPerformanceManagement-API/environment/variables.txt
@@ -34,4 +34,33 @@ ${collectionPeriod}     10
 ${reportingPeriod}      30
 
 ${response}    {}
-${CONTENT_TYPE_PATCH}    application/merge-patch+json
\ No newline at end of file
+${CONTENT_TYPE_PATCH}    application/merge-patch+json
+
+${pmJobId}        29f4ff6a-be91-4ec8-856e-fcf1e2479e4e
+${erroneousPmJobId}    erroneousPmJobId
+${newPmJobId}    newPmJobId
+
+${thresholdId}    1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
+${erroneousThresholdId}    erroneousThresholdId
+${newThresholdId}    newThresholdId
+${origResponse}=    httpresponse
+
+${callback_endpoint_fwd}    /endpoint/check
+
+${notification_request}    []
+${notification_response}    []
+
+
+${POS_FILTER}     objectInstanceIds=1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
+${NEG_FILTER}     criteriaPmJob=erroneousAttributeName
+${fields}         criteria,objectInstanceIds
+
+
+${reportId}       0fb4c875-e07f-46ca-a9dd-13907667a568
+${erroneousReportId}    erroneousReportId
+${newReportId}    newReportId
+
+
+${FILTER_OK_Threshold}      objectInstanceId=1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
+${FILTER_KO}      criterias=erroneousFilter
+${SEPERATOR}      =
-- 
GitLab


From 8bc1c4639e5d1927fa87334e9a077980d09198fd Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Tue, 3 Nov 2020 15:06:12 +0100
Subject: [PATCH 129/322] fixed missing robot requirement

---
 SOL005/NSDManagement-API/NSDManagementKeywords.robot | 1 -
 requirements.txt                                     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index 35b37bc0e..c5a26d96a 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -1,6 +1,5 @@
 *** Settings ***
 Resource    environment/variables.txt
-Resource    environment/individualSubscription.txt
 Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false 
 Library    MockServerLibrary 
 Library    OperatingSystem
diff --git a/requirements.txt b/requirements.txt
index 7ec119049..f6c9c6d5d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,4 +9,4 @@ robotframework-dependencylibrary==1.0.0.post1
 robotframework-jsonlibrary==0.3
 robotframework-jsonschemalibrary==1.0
 robotframework-mockserver==0.0.4
-
+robotframework-requests==0.7.1
-- 
GitLab


From 3e9eaa62ee03834ede88e57e14635c05f5ce93ac Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 4 Nov 2020 18:15:26 +0500
Subject: [PATCH 130/322] deltas for 2.7.1 SOL005 VNF PKGM added

---
 ...essConfigurationForExternalArtifacts.robot | 109 ++++++
 .../IndividualVNFPackageArtifacts.robot       | 144 ++++++++
 .../ManifestInIndividualVNFPackage.robot      | 107 ++++++
 .../VNFDInIndividualVNFPackage.robot          |  69 +---
 .../VNFPackageArtifacts.robot                 | 344 ++++++++++--------
 .../VNFPackageManagementKeywords.robot        | 246 +++++++++++--
 .../environment/variables.txt                 |   6 +-
 .../jsons/ExternalArtifactsAccessConfig.json  |   6 +
 .../ExternalArtifactsAccessConfig.json        |  65 ++++
 9 files changed, 866 insertions(+), 230 deletions(-)
 create mode 100644 SOL005/VNFPackageManagement-API/AccessConfigurationForExternalArtifacts.robot
 create mode 100644 SOL005/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot
 create mode 100644 SOL005/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot
 create mode 100644 SOL005/VNFPackageManagement-API/jsons/ExternalArtifactsAccessConfig.json
 create mode 100644 SOL005/VNFPackageManagement-API/schemas/ExternalArtifactsAccessConfig.json

diff --git a/SOL005/VNFPackageManagement-API/AccessConfigurationForExternalArtifacts.robot b/SOL005/VNFPackageManagement-API/AccessConfigurationForExternalArtifacts.robot
new file mode 100644
index 000000000..0637fe22a
--- /dev/null
+++ b/SOL005/VNFPackageManagement-API/AccessConfigurationForExternalArtifacts.robot
@@ -0,0 +1,109 @@
+*** Settings ***
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt
+Resource          VNFPackageManagementKeywords.robot    
+Library           JSONLibrary
+Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+
+*** Test Cases ***
+Get Access configuration for external artifacts
+    [Documentation]    Test ID: 5.3.5.10.1
+    ...    Test title: Get Access configuration for external artifacts
+    ...    Test objective: The objective is to test the GET method reads the access configuration information that is used by the NFVO to get the content of external VNF package artifacts and perform a JSON schema and content validation of the collected data structure
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get access configuration information for external artifacts
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is   ExternalArtifactsAccessConfig
+
+Get Access configuration for external artifacts - Not Found
+    [Documentation]    Test ID: 5.3.5.10.2
+    ...    Test title: Get Access configuration for external artifacts - Not Found
+    ...    Test objective: The objective is to test that the retrieval of access configuration information that is used by the NFVO to get the content of external VNF package artifacts fails because resource is not present.
+    ...    Pre-conditions: none
+    ...    Reference: Clause 9.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get access configuration information for external artifacts
+    Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+PUT Access configuration for external artifacts 
+    [Documentation]    Test ID: 5.3.5.10.3
+    ...    Test title: 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:  the individual VNF package resource shall have been created, and the value of "onboardingState" attribute shall equal to "CREATED" or "ERROR"
+    ...    Reference: Clause 9.4.4a.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Check Postcondition individual VNF Package is created
+    Send PUT Request to access configuration information for external artifacts
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is   ExternalArtifactsAccessConfig
+    
+PUT Access configuration for external artifacts - Downloading
+    [Documentation]    Test ID: 5.3.5.10.4
+    ...    Test title: Access configuration for external artifacts - Downloading
+    ...    Test objective: The objective is to test that VNF package has been uploaded successfully previously, to indicate that the access configuration information has been stored successfully by the NFVO and the NFVO now starts downloading external artifacts.
+    ...    Pre-conditions:  the individual VNF package resource shall have been created, and the value of "onboardingState" attribute shall equal to "CREATED" or "ERROR"
+    ...    Reference: Clause 9.4.4a.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Check Postcondition individual VNF Package is created
+    Send PUT Request to access configuration information for external artifacts
+    Check HTTP Response Status Code Is    202
+    
+PUT Access configuration for external artifacts - Conflict
+    [Documentation]    Test ID: 5.3.5.10.5
+    ...    Test title: 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:  the individual VNF package resource shall have been created, and the value of "onboardingState" attribute is neither "CREATED" nor "ERROR"
+    ...    Reference: Clause 9.4.4a.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PUT Request to access configuration information for external artifacts
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+POST Access configuration for external artifacts - Method not implemented
+    [Documentation]    Test ID: 5.3.5.10.6
+    ...    Test title: POST Access configuration for external artifacts - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not allowed to create access configuration for external artifacts
+    ...    Pre-conditions: none
+    ...    Reference: Clause 9.4.4a.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send POST Request for access configuration for external artifacts
+    Check HTTP Response Status Code Is    405
+
+PATCH Access configuration for external artifacts - Method not implemented
+    [Documentation]    Test ID: 5.3.5.10.7
+    ...    Test title: PATCH Access configuration for external artifacts - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to update access configuration for external artifacts
+    ...    Pre-conditions: none
+    ...    Reference: Clause 9.4.4a.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PATCH Request for 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.5.10.8
+    ...    Test title: DELETE Access configuration for external artifacts - Method not implemented
+    ...    Test objective: The objective is to test that DELETE  method is not allowed to delete access configuration for external artifacts
+    ...    Pre-conditions: none
+    ...    Reference: Clause 9.4.4a.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send DELETE Request for Access configuration for external artifacts
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot b/SOL005/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot
new file mode 100644
index 000000000..09b951e99
--- /dev/null
+++ b/SOL005/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot
@@ -0,0 +1,144 @@
+*** Settings ***
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt
+Resource          VNFPackageManagementKeywords.robot 
+Library           JSONLibrary
+Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+
+*** Test Cases ***
+GET Individual VNF Package Artifact
+    [Documentation]    Test ID: 5.3.5.6.1
+    ...    Test title: GET Individual VNF Package Artifact
+    ...    Test objective: The objective is to test the retrieval of an individual VNF package artifact
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET Individual VNF Package Artifact
+    Check HTTP Response Status Code Is    200
+
+GET Individual VNF Package Artifact in octet stream format
+    [Documentation]    Test ID: 5.3.5.6.2
+    ...    Test title: GET Individual VNF Package Artifact in octet stream format
+    ...    Test objective: The objective is to test the retrieval of an individual VNF package artifact when the NFVO cannot determine the artifact content type. The test performs a validation that the returned artifcat in is octet-stream format 
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NFVO cannot determine the content type of the artifact
+    ...    Post-Conditions: none
+    GET Individual VNF Package Artifact in octet stream format
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/octet-stream
+
+GET Individual VNF Package Artifact with Range Request and NFVO supporting Range Requests
+    [Documentation]    Test ID: 5.3.5.6.3
+    ...    Test title: GET Individual VNF Package Artifact with Range Request and NFVO supporting Range Requests
+    ...    Test objective: The objective is to test the retrieval of an individual VNF package artifact when using a range request to return single range of bytes from the file, with the NFVO supporting it. The test also perform a validation that returned content matches the issued range
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
+    ...    Post-Conditions: none
+    GET Individual VNF Package Artifact with Range Request
+    Check HTTP Response Status Code Is    206
+    Check HTTP Response Header Content-Range Is Present and Matches the requested range
+    Check HTTP Response Header Content-Length Is Present and Matches the requested range length
+
+GET Individual VNF Package Artifact with Range Request and NFVO not supporting Range Requests
+    [Documentation]    Test ID: 5.3.5.6.4
+    ...    Test title: GET Individual VNF Package Artifact with Range Request and NFVO not supporting Range Requests
+    ...    Test objective: The objective is to test that the retrieval of an individual VNF package artifact, when using a range request to return single range of bytes from the file and the NFVO not supporting it, returns the full VNF Package artifact.
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NFVO does not support range requests to return single range of bytes from the VNF package artifact
+    ...    Post-Conditions: none    
+    GET Individual VNF Package Artifact with Range Request
+    Check HTTP Response Status Code Is    200
+
+GET Individual VNF Package Artifact with invalid Range Request
+    [Documentation]    Test ID: 5.3.5.6.5
+    ...    Test title: GET Individual VNF Package Artifact with invalid Range Request
+    ...    Test objective: The objective is to test that the retrieval of an individual VNF package artifact fails when using a range request that does not match any available byte range in the file.
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
+    ...    Post-Conditions: none      
+    GET Individual VNF Package Artifact with invalid Range Request
+    Check HTTP Response Status Code Is    416
+
+GET Individual VNF Package Artifact with invalid resource identifier
+    [Documentation]    Test ID: 5.3.5.6.6
+    ...    Test title: GET Individual VNF Package Artifact with invalid resource identifier
+    ...    Test objective: The objective is to test that the retrieval of an individual VNF package artifact fails when using an invalid resource identifier
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    GET Individual VNF Package Artifact with invalid resource identifier
+    Check HTTP Response Status Code Is    404
+
+GET Individual VNF Package Artifact with conflict due to onboarding state
+    [Documentation]    Test ID: 5.3.5.6.7
+    ...    Test title: GET Individual VNF Package Artifact with conflict due to onboarding state
+    ...    Test objective: The objective is to test that the retrieval of an individual VNF package artifact fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: The onboarding state of the VNF package for which the content is requested is different from ONBOARDED.
+    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none   
+    GET Artifact for VNF Package in onboarding state different from ONBOARDED
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+
+POST Individual VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 5.3.5.6.8
+    ...    Test title: POST Individual VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not allowed to create new VNF Package artifact
+    ...    Pre-conditions: none
+    ...    Reference: Clause 9.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send POST Request for individual VNF Package Artifact
+    Check HTTP Response Status Code Is    405
+
+PUT Individual VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 5.3.5.6.9
+    ...    Test title: PUT Individual VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNF Package artifact
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PUT Request for individual VNF Package Artifact
+    Check HTTP Response Status Code Is    405
+
+PATCH Individual VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 5.3.5.6.10
+    ...    Test title: PATCH Individual VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that PATCH  method is not allowed to update a VNF Package artifact
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PATCH Request for individual VNF Package Artifact
+    Check HTTP Response Status Code Is    405
+
+DELETE Individual VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 5.3.5.6.11
+    ...    Test title: DELETE Individual VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNF Package artifact
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.7.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: The VNF Package artifact is not deleted by the failed operation
+    Send DELETE Request for individual VNF Package Artifact
+    Check HTTP Response Status Code Is    405
+    Check Postcondition VNF Package Artifact Exist
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot b/SOL005/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot
new file mode 100644
index 000000000..0b6441057
--- /dev/null
+++ b/SOL005/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot
@@ -0,0 +1,107 @@
+*** Settings ***
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt
+Resource          VNFPackageManagementKeywords.robot    
+Library           JSONLibrary
+Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+
+*** Test Cases ***
+Get Manifest in Individual VNF Package
+    [Documentation]    Test ID: 5.3.5.11.1
+    ...    Test title: Get Manifest in Individual VNF Package
+    ...    Test objective: The objective is to test that content of manifest within a NVF Package is read successfully.
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Manifest in Individual VNF Package in plainFormat
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    text/plain
+    
+Get Manifest in Individual VNF Package with security information
+    [Documentation]    Test ID: 5.3.5.11.2
+    ...    Test title: Get Manifest in Individual VNF Package with security information
+    ...    Test objective: The objective is to test the retrieval of the Manifest in individual VNF package shall include in the ZIP archive the security information when requested with "include_signature" parameter, and perform a validation that returned content is in zip format
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Manifest in Individual VNF Package with security information
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get Manifest in Individual VNF Package - Not Acceptable
+    [Documentation]    Test ID: 5.3.5.11.3
+    ...    Test title: Get Manifest in Individual VNF Package - Not Acceptable
+    ...    Test objective: The objective is to test that the "Accept" header is not compatible with Content type "application/zip" but "incude_signature" is provided.\
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Manifest in Individual VNF Package with unacceptable request
+    Check HTTP Response Status Code Is    406
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+Get Manifest in Individual VNF Package - Conflict
+    [Documentation]    Test ID: 5.3.5.11.4
+    ...    Test title: Get Manifest in Individual VNF Package - Conflict
+    ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the resource.
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Manifest in Individual VNF Package in plainFormat
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+POST Manifest in Individual VNF Package - Method not implemented
+    [Documentation]    Test ID: 5.3.5.11.5
+    ...    Test title: POST Manifest in Individual VNF Package - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not allowed to create new Manifest
+    ...    Pre-conditions: none
+    ...    Reference: Clause 9.4.4b.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send POST Request for Manifest in individual VNF Package
+    Check HTTP Response Status Code Is    405
+
+PUT Manifest in Individual VNF Package - Method not implemented
+    [Documentation]    Test ID: 5.3.5.11.6
+    ...    Test title: PUT Manifest in Individual VNF Package - Method not implemented
+    ...    Test objective: The objective is to test that PUT method is not allowed to modify a Manifest
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.4b.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PUT Request for Manifest in individual VNF Package
+    Check HTTP Response Status Code Is    405
+
+PATCH Manifest in Individual VNF Package - Method not implemented
+    [Documentation]    Test ID: 5.3.5.11.7
+    ...    Test title: PATCH Manifest in Individual VNF Package - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to update a Manifest
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.4b.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PATCH Request for Manifest in individual VNF Package
+    Check HTTP Response Status Code Is    405
+
+DELETE Manifest in Individual VNF Package - Method not implemented
+    [Documentation]    Test ID: 5.3.5.11.8
+    ...    Test title: DELETE Manifest in Individual VNF Package - Method not implemented
+    ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a Manifest
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.4b.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send DELETE Request for Manifest in individual VNF Package
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot b/SOL005/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
index 79778b325..90829b3f6 100644
--- a/SOL005/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
+++ b/SOL005/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
@@ -6,19 +6,6 @@ Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
 
 *** Test Cases ***
-Get single file VNFD in Individual VNF Package in Plain Format
-    [Documentation]    Test ID: 5.3.5.3.1
-    ...    Test title: Get single file VNFD in Individual VNF Package in Plain Format
-    ...    Test objective: The objective is to test the retrieval of the VNFD in plain format for an individual VNF package and perform a validation that returned content is in plain format
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The VNFD is implemented as a single file
-    ...    Post-Conditions: none
-    Get single file VNFD in Individual VNF Package in Plain Format
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    text/plain
-
 Get VNFD in Individual VNF Package in Zip Format
     [Documentation]    Test ID: 5.3.5.3.2
     ...    Test title: Get VNFD in Individual VNF Package in Zip Format
@@ -32,45 +19,6 @@ Get VNFD in Individual VNF Package in Zip Format
     Check HTTP Response Status Code Is    200
     Check HTTP Response Header Content-Type Is    application/zip
 
-Get single file VNFD in Individual VNF Package in Plain or Zip Format
-    [Documentation]    Test ID: 5.3.5.3.3
-    ...    Test title: Get single file VNFD in Individual VNF Package in Plain or Zip Format
-    ...    Test objective: The objective is to test the retrieval of the single file VNFD for an individual VNF package when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that returned content is in Plain or Zip format
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The VNFD is implemented as a single file
-    ...    Post-Conditions: none
-    Get single file VNFD in Individual VNF Package in Plain or Zip Format
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is Any of   text/plain    application/zip
-    
-Get multi file VNFD in Individual VNF Package in Plain or Zip Format
-    [Documentation]    Test ID: 5.3.5.3.4
-    ...    Test title: Get multi file VNFD in Individual VNF Package in Plain or Zip Format
-    ...    Test objective: The objective is to test the retrieval of the multi file VNFD for an individual VNF package when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that returned content is in Zip format
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The VNFD is implemented as a multi file
-    ...    Post-Conditions: none
-    Get multi file VNFD in Individual VNF Package in Plain or Zip Format
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
-
-Get multi file VNFD in Individual VNF Package in Plain Format
-    [Documentation]    Test ID: 5.3.5.3.5
-    ...    Test title: Get multi file VNFD in Individual VNF Package in Plain Format
-    ...    Test objective: The objective is to test that the retrieval of the multi file VNFD for an individual VNF package fails when requesting it in Plain format, and perform a validation of the JSON schema validation of the failed operation HTTP response
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The VNFD is implemented as a multi file
-    ...    Post-Conditions: none
-    Get multi file VNFD in Individual VNF Package in Plain Format
-    Check HTTP Response Status Code Is    406
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-
 Get VNFD in Individual VNF Package with invalid resource identifier
     [Documentation]    Test ID: 5.3.5.3.6
     ...    Test title: Get VNFD in Individual VNF Package with invalid resource identifier
@@ -82,6 +30,7 @@ Get VNFD in Individual VNF Package with invalid resource identifier
     ...    Post-Conditions: none
     Get VNFD in Individual VNF Package with invalid resource identifier
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 Get VNFD in Individual VNF Package with conflict due to onboarding state
     [Documentation]    Test ID: 5.3.5.3.7
@@ -140,7 +89,19 @@ DELETE VNFD in Individual VNF Package - Method not implemented
     ...    Reference: Clause 9.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The VNFD is not deleted by the failed operation
+    ...    Post-Conditions: none
     Send DELETE Request for VNFD in individual VNF Package
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNFD Exist
\ No newline at end of file
+    
+Get VNFD in Individual VNF Package with security information
+    [Documentation]    Test ID: 5.3.5.3.12
+    ...    Test title: Get VNFD in Individual VNF Package with security information
+    ...    Test objective: The objective is to test the retrieval of the VNFD in zip format for an individual VNF package shall include in the ZIP archive the security information when requested with "include_signature" parameter, and perform a validation that returned content is in zip format
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get VNFD in Individual VNF Package with security information
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageArtifacts.robot b/SOL005/VNFPackageManagement-API/VNFPackageArtifacts.robot
index 09b951e99..4a49bf0bc 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageArtifacts.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageArtifacts.robot
@@ -1,144 +1,200 @@
-*** Settings ***
-Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt
-Resource          VNFPackageManagementKeywords.robot 
-Library           JSONLibrary
-Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
-
-*** Test Cases ***
-GET Individual VNF Package Artifact
-    [Documentation]    Test ID: 5.3.5.6.1
-    ...    Test title: GET Individual VNF Package Artifact
-    ...    Test objective: The objective is to test the retrieval of an individual VNF package artifact
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    GET Individual VNF Package Artifact
-    Check HTTP Response Status Code Is    200
-
-GET Individual VNF Package Artifact in octet stream format
-    [Documentation]    Test ID: 5.3.5.6.2
-    ...    Test title: GET Individual VNF Package Artifact in octet stream format
-    ...    Test objective: The objective is to test the retrieval of an individual VNF package artifact when the NFVO cannot determine the artifact content type. The test performs a validation that the returned artifcat in is octet-stream format 
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The NFVO cannot determine the content type of the artifact
-    ...    Post-Conditions: none
-    GET Individual VNF Package Artifact in octet stream format
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/octet-stream
-
-GET Individual VNF Package Artifact with Range Request and NFVO supporting Range Requests
-    [Documentation]    Test ID: 5.3.5.6.3
-    ...    Test title: GET Individual VNF Package Artifact with Range Request and NFVO supporting Range Requests
-    ...    Test objective: The objective is to test the retrieval of an individual VNF package artifact when using a range request to return single range of bytes from the file, with the NFVO supporting it. The test also perform a validation that returned content matches the issued range
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
-    ...    Post-Conditions: none
-    GET Individual VNF Package Artifact with Range Request
-    Check HTTP Response Status Code Is    206
-    Check HTTP Response Header Content-Range Is Present and Matches the requested range
-    Check HTTP Response Header Content-Length Is Present and Matches the requested range length
-
-GET Individual VNF Package Artifact with Range Request and NFVO not supporting Range Requests
-    [Documentation]    Test ID: 5.3.5.6.4
-    ...    Test title: GET Individual VNF Package Artifact with Range Request and NFVO not supporting Range Requests
-    ...    Test objective: The objective is to test that the retrieval of an individual VNF package artifact, when using a range request to return single range of bytes from the file and the NFVO not supporting it, returns the full VNF Package artifact.
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The NFVO does not support range requests to return single range of bytes from the VNF package artifact
-    ...    Post-Conditions: none    
-    GET Individual VNF Package Artifact with Range Request
-    Check HTTP Response Status Code Is    200
-
-GET Individual VNF Package Artifact with invalid Range Request
-    [Documentation]    Test ID: 5.3.5.6.5
-    ...    Test title: GET Individual VNF Package Artifact with invalid Range Request
-    ...    Test objective: The objective is to test that the retrieval of an individual VNF package artifact fails when using a range request that does not match any available byte range in the file.
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
-    ...    Post-Conditions: none      
-    GET Individual VNF Package Artifact with invalid Range Request
-    Check HTTP Response Status Code Is    416
-
-GET Individual VNF Package Artifact with invalid resource identifier
-    [Documentation]    Test ID: 5.3.5.6.6
-    ...    Test title: GET Individual VNF Package Artifact with invalid resource identifier
-    ...    Test objective: The objective is to test that the retrieval of an individual VNF package artifact fails when using an invalid resource identifier
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    GET Individual VNF Package Artifact with invalid resource identifier
-    Check HTTP Response Status Code Is    404
-
-GET Individual VNF Package Artifact with conflict due to onboarding state
-    [Documentation]    Test ID: 5.3.5.6.7
-    ...    Test title: GET Individual VNF Package Artifact with conflict due to onboarding state
-    ...    Test objective: The objective is to test that the retrieval of an individual VNF package artifact fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
-    ...    Pre-conditions: The onboarding state of the VNF package for which the content is requested is different from ONBOARDED.
-    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none   
-    GET Artifact for VNF Package in onboarding state different from ONBOARDED
-    Check HTTP Response Status Code Is    409
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-
-POST Individual VNF Package Artifact - Method not implemented
-    [Documentation]    Test ID: 5.3.5.6.8
-    ...    Test title: POST Individual VNF Package Artifact - Method not implemented
-    ...    Test objective: The objective is to test that POST method is not allowed to create new VNF Package artifact
-    ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send POST Request for individual VNF Package Artifact
-    Check HTTP Response Status Code Is    405
-
-PUT Individual VNF Package Artifact - Method not implemented
-    [Documentation]    Test ID: 5.3.5.6.9
-    ...    Test title: PUT Individual VNF Package Artifact - Method not implemented
-    ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNF Package artifact
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send PUT Request for individual VNF Package Artifact
-    Check HTTP Response Status Code Is    405
-
-PATCH Individual VNF Package Artifact - Method not implemented
-    [Documentation]    Test ID: 5.3.5.6.10
-    ...    Test title: PATCH Individual VNF Package Artifact - Method not implemented
-    ...    Test objective: The objective is to test that PATCH  method is not allowed to update a VNF Package artifact
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send PATCH Request for individual VNF Package Artifact
-    Check HTTP Response Status Code Is    405
-
-DELETE Individual VNF Package Artifact - Method not implemented
-    [Documentation]    Test ID: 5.3.5.6.11
-    ...    Test title: DELETE Individual VNF Package Artifact - Method not implemented
-    ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNF Package artifact
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: The VNF Package artifact is not deleted by the failed operation
-    Send DELETE Request for individual VNF Package Artifact
-    Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Package Artifact Exist
\ No newline at end of file
+*** Settings ***
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt
+Resource          VNFPackageManagementKeywords.robot    
+Library           JSONLibrary
+Library           OperatingSystem    
+Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+
+*** Test Cases ***
+Get VNF Package Artifact
+    [Documentation]    Test ID: 5.3.5.12.1
+    ...    Test title: Get VNF Package Artifact
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully, and perform a validation that returned content is in Zip format
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get VNF Package Artifact with "exclude_all_mano_artifacts" parameter
+    [Documentation]    Test ID: 5.3.5.12.2
+    ...    Test title: Get VNF Package Artifact with "exclude_all_mano_artifacts" parameter
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and it doesnot contain additional MANO artifacts  when requested with "exclude_all_mano_artifacts" parameter
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with exclude_all_mano_artifacts parameter
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get VNF Package Artifact with "exclude_all_non_mano_artifacts" parameter
+    [Documentation]    Test ID: 5.3.5.12.3
+    ...    Test title: Get VNF Package Artifact with "exclude_all_non_mano_artifacts" parameter
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and it doesnot contain non-MANO Artifacts when requested with "exclude_all_non_mano_artifacts" parameter
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with exclude_all_non_mano_artifacts parameter
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get VNF Package Artifact with "select_non_mano_artifact_sets" parameter
+    [Documentation]    Test ID: 5.3.5.12.4
+    ...    Test title: Get VNF Package Artifact with "select_non_mano_artifact_sets" parameter
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and also contain non_MANO artifacts set when requested with "select_non_mano_artifact_sets" parameter
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with select_non_mano_artifact_sets parameter
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get VNF Package Artifact with "include_signatures" parameter
+    [Documentation]    Test ID: 5.3.5.12.5
+    ...    Test title: Get VNF Package Artifact with "include_signatures" parameter
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and also contain security certificates when requested with "include_signature" parameter, and perform a validation that returned content is in Zip format
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with include_signatures parameter
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get VNF Package Artifact with Range Request and NFVO supporting Range Requests
+    [Documentation]    Test ID: 5.3.5.12.6
+    ...    Test title: Get VNF Package Artifact with Range Request and NFVO supporting Range Requests
+    ...    Test objective: The objective is to test the GET request read the whole content of the archive containing the artifact files successfully when using a range request to return single range of bytes from the file, with the NFVO supporting it. The test also perform a validation that returned content matches the issued range
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with Range Request
+    Check HTTP Response Status Code Is    206
+    Check HTTP Response Header Content-Range Is Present and Matches the requested range
+    Check HTTP Response Header Content-Length Is Present and Matches the requested range length
+    
+Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "select_non_mano_artifact_sets"
+    [Documentation]    Test ID: 5.3.5.12.7
+    ...    Test title: Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "select_non_mano_artifact_sets"
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when both "exclude_all_non_mano_artifacts" and "select_non_mano_artifact_sets" are present in request
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with exclude_all_non_mano_artifacts and select_non_mano_artifact_sets
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "exclude_all_mano_artifacts"
+    [Documentation]    Test ID: 5.3.5.12.8
+    ...    Test title: Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "exclude_all_mano_artifactss"
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when both "exclude_all_non_mano_artifacts" and "exclude_all_mano_artifacts" are present in request
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with exclude_all_non_mano_artifacts and exclude_all_mano_artifacts
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+Get VNF Package Artifact with invalid URI parameters undifend select_non_mano_artifact_sets
+    [Documentation]    Test ID: 5.3.5.12.9
+    ...    Test title: Get VNF Package Artifact with invalid URI parameters undefined select_non_mano_artifact_sets
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when one or more value provided in "select_non_mano_artifact_sets" are not provided in Manifest.
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with select_non_mano_artifact_sets parameter
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+
+Get VNF Package Artifact with conflict due to onboarding state
+    [Documentation]    Test ID: 5.3.5.12.10
+    ...    Test title: Get VNF Package Artifact with conflict due to onboarding state
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: The onboarding state of the VNF package for which the content is requested is different from ONBOARDED.
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none   
+    GET Artifact of VNF Package in onboarding state different from ONBOARDED
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+GET VNF Package Artifact with invalid Range Request
+    [Documentation]    Test ID: 5.3.5.12.11
+    ...    Test title: GET VNF Package Artifact with invalid Range Request
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when using a range request that does not match any available byte range in the file.
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
+    ...    Post-Conditions: none      
+    GET VNF Package Artifact with invalid Range Request
+    Check HTTP Response Status Code Is    416
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+POST VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 5.3.5.12.12
+    ...    Test title: POST VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not allowed to create new VNF Package artifact
+    ...    Pre-conditions: none
+    ...    Reference: Clause 9.4.5a.3.1 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send POST Request for VNF Package Artifact
+    Check HTTP Response Status Code Is    405
+
+PUT VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 5.3.5.12.13
+    ...    Test title: PUT VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNF Package artifact
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.5a.3.3 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PUT Request for VNF Package Artifact
+    Check HTTP Response Status Code Is    405
+
+PATCH VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 5.3.5.12.14
+    ...    Test title: PATCH VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that PATCH  method is not allowed to update a VNF Package artifact
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.5a.3.4 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PATCH Request for VNF Package Artifact
+    Check HTTP Response Status Code Is    405
+
+DELETE VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 5.3.5.12.15
+    ...    Test title: DELETE VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNF Package artifact
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.6.3.5 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send DELETE Request for VNF Package Artifact
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 16217594e..2306e97ca 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -312,14 +312,6 @@ Send DELETE Request for Individual VNF Package used for instantiated VNF instanc
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${instantiatedVnfPackageId}
     ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-Get single file VNFD in Individual VNF Package in Plain Format
-    Log    Trying to get a VNFD from a given VNF Package present in the NFVO Catalogue
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgPlainVNFD}/vnfd
-    ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
 Get VNFD in Individual VNF Package in Zip Format
@@ -329,22 +321,12 @@ Get VNFD in Individual VNF Package in Zip Format
     GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
-
-Get single file VNFD in Individual VNF Package in Plain or Zip Format
-    Log    Trying to get a VNFD from a given VNF Package present in the NFVO Catalogue
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgPlainVNFD}/vnfd
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
     
-Get multi file VNFD in Individual VNF Package in Plain or Zip Format
+Get VNFD in Individual VNF Package with security information
     Log    Trying to get a VNFD from a given VNF Package present in the NFVO Catalogue
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -410,15 +392,6 @@ Send DELETE Request for VNFD in individual VNF Package
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
-Check Postcondition VNFD Exist
-    Log    Checking that vnf pacakge still exists
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}, ${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output} 
-    Check HTTP Response Status Code Is    200
-
 GET Individual VNF Package Content  
     Log    Trying to get a VNF Package Content
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
@@ -901,7 +874,6 @@ Check HTTP Response Status Code Is
     Should Be Equal As Strings    ${response['status']}    ${expected_status}
     Log    Status code validated
     
-    
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
     Should Contain    ${response['headers']['Content-Type']}    application/json
@@ -909,7 +881,6 @@ Check HTTP Response Body Json Schema Is
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK  
     
-    
 Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filter
     Log    Check Response includes VNF Package Management according to filter
     @{words} =  Split String    ${filter_ok}       ,${SEPERATOR} 
@@ -947,3 +918,216 @@ Check HTTP Response Header Contains
 Check LINK in Header
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
+
+Get access configuration information for external artifacts
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Send PUT Request to access configuration information for external artifacts
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    ${body}=  Get File     jsons/ExternalArtifactsAccessConfig.json
+    PUT    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access    ${body}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Check Postcondition individual VNF Package is created
+    GET Individual VNF Package
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is   vnfPkgInfo
+    Should Be True     '${response['body']['id']}' =='CREATED' or '${response['body']['id']}'=='ERROR'
+    
+Send POST Request for access configuration for external artifacts
+    Log    Trying to perform a POST. This method should not be implemented
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    POST    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
+    
+Send PATCH Request for access configuration for external artifacts
+    Log    Trying to perform a PATCH. This method should not be implemented
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    PATCH    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
+
+Send DELETE Request for Access configuration for external artifacts
+    Log    Trying to perform a DELETE. This method should not be implemented
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get Manifest in Individual VNF Package in plainFormat
+        Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get Manifest in Individual VNF Package with security information
+    Log    Trying to get a manifest from a given VNF Package present in the NFVO Catalogue
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/manifest/include_signatures
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get Manifest in Individual VNF Package with unacceptable request
+    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/manifest/include_signatures
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Send POST Request for manifest in individual VNF Package
+    Log    Trying to perform a POST. This method should not be implemented
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    POST    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
+
+Send PUT Request for manifest in individual VNF Package
+    Log    Trying to perform a PUT. This method should not be implemented
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    PUT    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
+    
+Send PATCH Request for manifest in individual VNF Package
+    Log    Trying to perform a PATCH. This method should not be implemented
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    PATCH    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
+
+Send DELETE Request for manifest in individual VNF Package
+    Log    Trying to perform a DELETE. This method should not be implemented
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/manifest
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 
+    
+Get Artifact in VNF Package
+    Log    Trying to get Artifact in VNF Package
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Get Artifact in VNF Package with exclude_all_mano_artifacts parameter
+    Log    Trying to get Artifact in VNF Package with exclude_all_mano_artifacts
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_mano_artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get Artifact in VNF Package with exclude_all_non_mano_artifacts parameter
+    Log    Trying to get Artifact in VNF Package with security certificates
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get Artifact in VNF Package with select_non_mano_artifact_sets parameter
+    Log    Trying to get Artifact in VNF Package with security certificates
+    Pass Execution If    ${NFVO_non-MANO_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/select_non_mano_artifact_sets=${non_mano_artifact_sets}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get Artifact in VNF Package with include_signatures parameter
+    Log    Trying to get Artifact in VNF Package with security certificates
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/include_signatures
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get Artifact in VNF Package with Range Request
+    Log    Trying to get an Artifact using RANGE Header and using an NFVO that can handle it
+    Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
+    Set Headers    {"Range": "${range}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get Artifact in VNF Package with exclude_all_non_mano_artifacts and select_non_mano_artifact_sets
+    Log    Trying to get Artifact in VNF Package 
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&select_non_mano_artifact_sets=${non_mano_artifact_sets}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Get Artifact in VNF Package with exclude_all_non_mano_artifacts and exclude_all_mano_artifacts
+    Log    Trying to get Artifact in VNF Package 
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&exclude_all_non_mano_artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+GET Artifact of VNF Package in onboarding state different from ONBOARDED
+    Log    Trying to get a VNF Package artifact present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${onboardingStateVnfPkgId}/artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+GET VNF Package Artifact with invalid Range Request
+    Log    Trying to get a range of bytes of the limit of the VNF Package
+    Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Set Headers    {"Range": "${erroneousRange}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Send POST Request for VNF Package Artifact
+    Log    Trying to perform a POST (method should not be implemented)
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    POST    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Send PUT Request for VNF Package Artifact
+    Log    Trying to perform a PUT (method should not be implemented)
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    PUT    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+ 
+Send PATCH Request for VNF Package Artifact
+    Log    Trying to perform a PATCH (method should not be implemented)
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    PATCH    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Send DELETE Request for VNF Package Artifact
+    Log    Trying to perform a DELETE (method should not be implemented)
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/environment/variables.txt b/SOL005/VNFPackageManagement-API/environment/variables.txt
index 85aaa867c..ceae81c7d 100644
--- a/SOL005/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFPackageManagement-API/environment/variables.txt
@@ -9,7 +9,7 @@ ${ACCEPT_JSON}    application/json
 ${apiRoot}        /
 ${AUTH_USAGE}     1
 ${NEG_AUTHORIZATION}    Bearer negativetoken
-${apiVersion}     v1
+${apiVersion}     v2
 ${apiName}        vnfpkgm
 ${FIELD_USAGE}    1
 ${NFVO_PLAIN}     1
@@ -80,3 +80,7 @@ ${VAR_SEPERATOR}    &
 
 ${vnfPkgViaUriId}       788106a2-d692-44f3-a86d-384f0ce35e42
 ${creatingVnfPkgViaUriId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
+${vnfPkgUri}        http://localhost/content.zip
+
+${NFVO_non-MANO_OK}    1    # If 1 means that non-MANO artifacts are supported by the NFVO
+${non_mano_artifact_sets} 
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/jsons/ExternalArtifactsAccessConfig.json b/SOL005/VNFPackageManagement-API/jsons/ExternalArtifactsAccessConfig.json
new file mode 100644
index 000000000..987555643
--- /dev/null
+++ b/SOL005/VNFPackageManagement-API/jsons/ExternalArtifactsAccessConfig.json
@@ -0,0 +1,6 @@
+{
+	"artifact":
+	{
+		"artifactUri":"127.0.0.1"
+	}
+}
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/schemas/ExternalArtifactsAccessConfig.json b/SOL005/VNFPackageManagement-API/schemas/ExternalArtifactsAccessConfig.json
new file mode 100644
index 000000000..a9b43cf0b
--- /dev/null
+++ b/SOL005/VNFPackageManagement-API/schemas/ExternalArtifactsAccessConfig.json
@@ -0,0 +1,65 @@
+{
+    "description": "This type represents the access configuration information for downloading external VNF package artifacts. The NFVO can obtain the external VNF package artifact file through the information provided in this structure, together with information provided in the manifest / VNFD. The data structure shall comply with the provisions defined in Table 9.5.2.10-1. If the data structure is part of a response body, security-sensitive attributes shall be excluded as specified in Table 9.5.2.10-1.\n",
+    "type": "object",
+    "properties": {
+      "artifact": {
+        "description": "Access configuration information for an external artefact.\n",
+        "type": "object",
+        "required": [
+          "artifactUri"
+        ],
+        "properties": {
+          "artifactUri": {
+            "description": "String formatted according to IETF RFC 3986.\n",
+            "type": "string",
+            "format": "uri"
+          },
+          "overrideUri": {
+            "description": "String formatted according to IETF RFC 3986.\n",
+            "type": "string",
+            "format": "uri"
+          },
+          "authType": {
+            "description": "Defines the type of authentication / authorization for downloading the VNF package. Permitted values: - BASIC: Only the \"username\" and \"password\" attributes shall be present. - OAUTH2_CLIENT_CREDENTIAL S: Only the \"paramsOauth2ClientCredentials\" attribute shall be present. This attribute shall not be present if no credentials are provided for the artifact.\n",
+            "type": "string",
+            "enum": [
+              "BASIC",
+              "OAUTH2_CLIENT_CREDENTIALS"
+            ]
+          },
+          "username": {
+            "description": "User name to be used for authentication.\n",
+            "type": "string"
+          },
+          "password": {
+            "description": "Password to be used for authentication. Shall not be present in response bodies.\n",
+            "type": "string"
+          },
+          "paramsOauth2ClientCredentials": {
+            "description": "Parameters for authentication/authorization using OAUTH2_CLIENT_CREDENTIALS.\n",
+            "type": "object",
+            "required": [
+              "clientId",
+              "clientPassword",
+              "tokenEndpoint"
+            ],
+            "properties": {
+              "clientId": {
+                "description": "Client identifier to be used in the access token request of the OAuth 2.0 client credentials grant type.\n",
+                "type": "string"
+              },
+              "clientPassword": {
+                "description": "Client password to be used in the access token request of the OAuth 2.0 client credentials grant type. Shall not be present in response bodies.\n",
+                "type": "string"
+              },
+              "tokenEndpoint": {
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string",
+                "format": "uri"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
\ No newline at end of file
-- 
GitLab


From 25df0c3eb5c9cbf3d32bab170459345e89b27d99 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 4 Nov 2020 18:21:39 +0500
Subject: [PATCH 131/322] majorAPIVersion added

---
 .../VNFPackageManagement-API/ApiVersion.robot |  10 +-
 .../VNFPackageManagementKeywords.robot        | 220 +++++++++---------
 .../environment/variables.txt                 |   2 +-
 3 files changed, 116 insertions(+), 116 deletions(-)

diff --git a/SOL005/VNFPackageManagement-API/ApiVersion.robot b/SOL005/VNFPackageManagement-API/ApiVersion.robot
index 942147599..1af96ffc1 100644
--- a/SOL005/VNFPackageManagement-API/ApiVersion.robot
+++ b/SOL005/VNFPackageManagement-API/ApiVersion.robot
@@ -168,35 +168,35 @@ DELETE API Version
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/v1/api_version
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/v1/api_version
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/v1/api_version
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/v1/api_version
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/v1/api_version
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 2306e97ca..33ac744e2 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -15,7 +15,7 @@ Get all VNF Packages
     Log    Trying to get all VNF Packages present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
 
@@ -47,7 +47,7 @@ GET VNF Packages with attribute-based filter
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages?${POS_FILTER}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?${POS_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -62,7 +62,7 @@ GET VNF Packages with invalid attribute-based filter
     Log    Trying to perform a negative get, filtering by the inexistent filter 'nfvId'
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages?${NEG_FILTER}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?${NEG_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -72,7 +72,7 @@ Get all VNF Packages with malformed authorization token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Authorization": "${BAD_AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -81,7 +81,7 @@ Get all VNF Packages without authorization token
     Log    The GET method queries omitting token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -89,7 +89,7 @@ GET VNF Packages with all_fields attribute selector
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages?all_fields
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?all_fields
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
    
@@ -110,7 +110,7 @@ GET VNF Packages with exclude_default attribute selector
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using exclude_default filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages?exclude_default   
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?exclude_default   
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -129,7 +129,7 @@ GET VNF Packages with fields attribute selector
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages?fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -148,7 +148,7 @@ GET VNF Packages with exclude_fields attribute selector
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages?exclude_fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -166,7 +166,7 @@ GET all VNF Packages with invalid resource endpoint
     Log    Trying to perform a GET on a erroneous URI
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${erroneousVnfPkgId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -176,7 +176,7 @@ Send Post Request to create new VNF Package Resource
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${body}=    Get File    jsons/CreateVnfPkgInfoRequest.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages    ${body}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -184,7 +184,7 @@ Check Postcondition VNF Package Resource Exists
     Log    Checking that nsd info exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${response['body']['id']}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
@@ -194,7 +194,7 @@ Send PUT Request for all VNF Packages
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -202,7 +202,7 @@ Send PATCH Request for all VNF Packages
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -210,7 +210,7 @@ Send DELETE Request for all VNF Packages
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -222,7 +222,7 @@ GET Individual VNF Package
     Log    Trying to get a VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -235,7 +235,7 @@ GET Individual VNF Package with invalid resource identifier
     Log    Trying to perform a negative get, using wrong authorization bearer
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${erroneousVnfPackageId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -243,7 +243,7 @@ Send POST Request for individual VNF Package
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -251,7 +251,7 @@ Send PUT Request for individual VNF Package
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
@@ -261,7 +261,7 @@ Send PATCH to disable Individual VNF Package
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${body}=    Get File    jsons/VnfPkgInfoModificationsDisabled.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}    ${body}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -276,7 +276,7 @@ Send PATCH to enable Individual VNF Package
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${body}=    Get File    jsons/VnfPkgInfoModifications.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}    ${body}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -284,21 +284,21 @@ Send DELETE Request for individual VNF Package
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${disabledVnfPackageId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${disabledVnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Check Postcondition VNF Package is Deleted
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${disabledVnfPackageId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${disabledVnfPackageId}
     Integer    response status    404
 
 Send DELETE Request for Individual VNF Package in operational state ENABLED
     Log    Trying to perform a DELETE nsdInfo in ENABLED operational state
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -310,7 +310,7 @@ Send DELETE Request for Individual VNF Package used for instantiated VNF instanc
     Log    Trying to perform a DELETE nsdInfo in ENABLED operational state
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${instantiatedVnfPackageId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${instantiatedVnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -318,7 +318,7 @@ Get VNFD in Individual VNF Package in Zip Format
     Log    Trying to get a VNFD from a given VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -326,7 +326,7 @@ Get VNFD in Individual VNF Package with security information
     Log    Trying to get a VNFD from a given VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd/include_signatures
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -338,7 +338,7 @@ Get multi file VNFD in Individual VNF Package in Plain Format
     Log    Trying to get a negative case performing a get on a VNFD from a given VNF Package present in the NFVO Catalogue. Accept will be text/plain but VNFD is composed my multiple files.
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -347,7 +347,7 @@ Get VNFD in Individual VNF Package with invalid resource identifier
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${erroneousVnfPkgId}/vnfd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -356,7 +356,7 @@ Get VNFD in Individual VNF Package with conflict due to onboarding state
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${onboardingStateVnfPkgId}/vnfd
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -364,7 +364,7 @@ Send POST Request for VNFD in individual VNF Package
     Log    Trying to perform a POST. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/vnfd
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -372,7 +372,7 @@ Send PUT Request for VNFD in individual VNF Package
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/vnfd
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -380,7 +380,7 @@ Send PATCH Request for VNFD in individual VNF Package
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/vnfd
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -388,7 +388,7 @@ Send DELETE Request for VNFD in individual VNF Package
     Log    Trying to perform a DELETE. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -396,7 +396,7 @@ GET Individual VNF Package Content
     Log    Trying to get a VNF Package Content
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/package_content
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -410,7 +410,7 @@ GET Individual VNF Package Content with Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/package_content
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -432,7 +432,7 @@ GET Individual VNF Package Content with invalid Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/package_content
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -440,7 +440,7 @@ GET Individual VNF Package Content with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${erroneousVnfPkgId}/package_content
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -448,7 +448,7 @@ GET Content for VNF Package in onboarding state different from ONBOARDED
     Log    Trying to get a VNF Package content present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${onboardingStateVnfPkgId}/package_content
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -456,7 +456,7 @@ Send POST Request for individual VNF Package Content
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/package_content
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -464,7 +464,7 @@ Send PUT Request for individual VNF Package Content
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/package_content
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -472,7 +472,7 @@ Send PUT Request to upload VNF Package Content
     Log    Trying to perform a PUT. This method upload the content of a NSD
     Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_ZIP}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
     ${body}=  Get Binary File     files/hackfest_gateway_vnfd-1.0.tar.gz
-    ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${newVnfPackageId}/package_content    data=${body}
+    ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${newVnfPackageId}/package_content    data=${body}
     Should Be Empty     ${response.text}
     ${response}=    Create Dictionary   status=${response.status_code}
     Set Suite Variable      ${response}     ${response}
@@ -482,14 +482,14 @@ Check Postcondition VNF Package Content is uploaded and available in the NFVO
     Log    Trying to get a VNF Package Content
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${newVnfPackageId}/package_content
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${newVnfPackageId}/package_content
     Integer    response status    200
  
 Send PUT Request to upload VNF Package Content with conflict due to onboarding state
     Log    Trying to perform a PUT. This method upload the content of a NSD
     Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_ZIP}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
     ${body}=  Get Binary File     files/hackfest_gateway_vnfd-1.0.tar.gz
-    ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${creatingVnfPackageId}/package_content    data=${body}
+    ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${creatingVnfPackageId}/package_content    data=${body}
     Should Be Empty     ${response.text}
     ${response}=    Create Dictionary   status=${response.status_code}
     Set Suite Variable      ${response}     ${response}
@@ -498,7 +498,7 @@ Send PATCH Request for individual VNF Package Content
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/package_content
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -506,7 +506,7 @@ Send DELETE Request for individual VNF Package Content
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/package_content
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -518,14 +518,14 @@ Check Postcondition VNF Package Content Exist
 GET Individual VNF Package Artifact
     Log    Trying to get a VNF Package Artifact
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 GET Individual VNF Package Artifact in octet stream format  
     Log    Trying to get a VNF Package Artifact
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageOctetStreamId}/artifacts/${artifactPath}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageOctetStreamId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -534,7 +534,7 @@ GET Individual VNF Package Artifact with Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -544,21 +544,21 @@ GET Individual VNF Package Artifact with invalid Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
 GET Individual VNF Package Artifact with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${erroneousVnfPkgId}/artifacts/${artifactPath}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 GET Artifact for VNF Package in onboarding state different from ONBOARDED
     Log    Trying to get a VNF Package artifact present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${onboardingStateVnfPkgId}/artifacts/${artifactPath}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -566,7 +566,7 @@ Send POST Request for individual VNF Package Artifact
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -574,7 +574,7 @@ Send PUT Request for individual VNF Package Artifact
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
@@ -582,7 +582,7 @@ Send PATCH Request for individual VNF Package Artifact
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -590,7 +590,7 @@ Send DELETE Request for individual VNF Package Artifact
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -598,7 +598,7 @@ Check Postcondition VNF Package Artifact Exist
     Log    Checking that vnf pacakge still exists
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
@@ -609,7 +609,7 @@ Send POST Request to upload VNF Package Content from URI
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/UploadVnfPkgFromUriRequest.json
     ${body}=        Format String   ${template}     vnfPkgUri=${vnfPkgUri}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri    ${body}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -619,7 +619,7 @@ Send POST Request to upload VNF Package Content from URI with conflict due to on
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/UploadVnfPkgFromUriRequest.json
     ${body}=        Format String   ${template}     vnfPkgUri=${vnfPkgUri}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${creatingVnfPkgViaUriId}/package_content/upload_from_uri    ${body}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${creatingVnfPkgViaUriId}/package_content/upload_from_uri    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -627,7 +627,7 @@ Send GET Request for individual VNF Package Content from URI
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -635,7 +635,7 @@ Send PUT Request for individual VNF Package Content from URI
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -643,7 +643,7 @@ Send PATCH Request for individual VNF Package Content from URI
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -651,7 +651,7 @@ Send DELETE Request for individual VNF Package Content from URI
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -659,14 +659,14 @@ Check Postcondition VNF Package Content from URI Exist
     Log    Checking that vnf pacakge still exists
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgViaUriId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}
     Integer    response status    200
 
 Get all VNF Package Subscriptions
     Log    Trying to get the list of subscriptions
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -674,7 +674,7 @@ Get VNF Package Subscriptions with attribute-based filters
     Log    Trying to get the list of subscriptions using filters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ok}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ok}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}    
 
@@ -682,7 +682,7 @@ Get VNF Package Subscriptions with invalid attribute-based filters
     Log    Trying to get the list of subscriptions using filters with wrong attribute name
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ko}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ko}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -690,7 +690,7 @@ Get VNF Package Subscriptions with invalid resource endpoint
     Log    Trying to perform a request on a Uri which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscription
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -701,7 +701,7 @@ Send Post Request for VNF Package Subscription
     ${template}=    Get File    jsons/subscriptions.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1
@@ -714,7 +714,7 @@ Send Post Request for Duplicated VNF Package Subscription
     ${template}=    Get File    jsons/subscriptions.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -722,7 +722,7 @@ Send Put Request for VNF Package Subscriptions
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -730,7 +730,7 @@ Send Patch Request for VNF Package Subscriptions
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -738,7 +738,7 @@ Send Delete Request for VNF Package Subscriptions
     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": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -761,7 +761,7 @@ Check Postcondition VNF Package Subscription Is Set
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Run Keyword If    ${location} == Location
-    ...    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${response['body']['id']}
+    ...    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
     Run Keyword If    ${location} == Location
     ...    GET    ${response['headers']['Location']}  
     ${output}=    Output    response
@@ -789,7 +789,7 @@ Get Individual VNF Package Subscription
     Log    Trying to get a single subscription identified by subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -797,7 +797,7 @@ GET individual VNF Package Subscription with invalid resource identifier
     Log    Trying to perform a request on a subscriptionID which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -805,7 +805,7 @@ Send Delete request for individual VNF Package Subscription
     Log    Trying to perform a DELETE on a subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -818,31 +818,31 @@ Send Delete request for individual VNF Package Subscription with invalid resourc
     Log    Trying to perform a DELETE on a subscriptionId which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual VNF Package Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${newSubscriptionId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for individual VNF Package Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Send Patch request for individual VNF Package Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
    
@@ -858,7 +858,7 @@ Check Postcondition VNF Package Subscription is not Created
     Log    Trying to get a new subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${newSubscriptionId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    404
@@ -921,7 +921,7 @@ Check LINK in Header
 
 Get access configuration information for external artifacts
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -929,7 +929,7 @@ Send PUT Request to access configuration information for external artifacts
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${body}=  Get File     jsons/ExternalArtifactsAccessConfig.json
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access    ${body}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -943,7 +943,7 @@ Send POST Request for access configuration for external artifacts
     Log    Trying to perform a POST. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -951,7 +951,7 @@ Send PATCH Request for access configuration for external artifacts
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -959,14 +959,14 @@ Send DELETE Request for Access configuration for external artifacts
     Log    Trying to perform a DELETE. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Get Manifest in Individual VNF Package in plainFormat
         Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/manifest
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -974,14 +974,14 @@ Get Manifest in Individual VNF Package with security information
     Log    Trying to get a manifest from a given VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/manifest/include_signatures
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Get Manifest in Individual VNF Package with unacceptable request
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/manifest/include_signatures
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -989,7 +989,7 @@ Send POST Request for manifest in individual VNF Package
     Log    Trying to perform a POST. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/manifest
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -997,7 +997,7 @@ Send PUT Request for manifest in individual VNF Package
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/manifest
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -1005,7 +1005,7 @@ Send PATCH Request for manifest in individual VNF Package
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/manifest
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1013,7 +1013,7 @@ Send DELETE Request for manifest in individual VNF Package
     Log    Trying to perform a DELETE. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/manifest
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -1021,7 +1021,7 @@ Get Artifact in VNF Package
     Log    Trying to get Artifact in VNF Package
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1029,7 +1029,7 @@ Get Artifact in VNF Package with exclude_all_mano_artifacts parameter
     Log    Trying to get Artifact in VNF Package with exclude_all_mano_artifacts
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_mano_artifacts
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_mano_artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1037,7 +1037,7 @@ Get Artifact in VNF Package with exclude_all_non_mano_artifacts parameter
     Log    Trying to get Artifact in VNF Package with security certificates
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1046,7 +1046,7 @@ Get Artifact in VNF Package with select_non_mano_artifact_sets parameter
     Pass Execution If    ${NFVO_non-MANO_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/select_non_mano_artifact_sets=${non_mano_artifact_sets}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/select_non_mano_artifact_sets=${non_mano_artifact_sets}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1054,7 +1054,7 @@ Get Artifact in VNF Package with include_signatures parameter
     Log    Trying to get Artifact in VNF Package with security certificates
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/include_signatures
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1063,7 +1063,7 @@ Get Artifact in VNF Package with Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1071,7 +1071,7 @@ Get Artifact in VNF Package with exclude_all_non_mano_artifacts and select_non_m
     Log    Trying to get Artifact in VNF Package 
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&select_non_mano_artifact_sets=${non_mano_artifact_sets}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&select_non_mano_artifact_sets=${non_mano_artifact_sets}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1079,14 +1079,14 @@ Get Artifact in VNF Package with exclude_all_non_mano_artifacts and exclude_all_
     Log    Trying to get Artifact in VNF Package 
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&exclude_all_non_mano_artifacts
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&exclude_all_non_mano_artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 GET Artifact of VNF Package in onboarding state different from ONBOARDED
     Log    Trying to get a VNF Package artifact present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${onboardingStateVnfPkgId}/artifacts
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1096,7 +1096,7 @@ GET VNF Package Artifact with invalid Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1104,7 +1104,7 @@ Send POST Request for VNF Package Artifact
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1112,7 +1112,7 @@ Send PUT Request for VNF Package Artifact
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
@@ -1120,7 +1120,7 @@ Send PATCH Request for VNF Package Artifact
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1128,6 +1128,6 @@ Send DELETE Request for VNF Package Artifact
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/artifacts
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/environment/variables.txt b/SOL005/VNFPackageManagement-API/environment/variables.txt
index ceae81c7d..d24c5f559 100644
--- a/SOL005/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFPackageManagement-API/environment/variables.txt
@@ -9,7 +9,7 @@ ${ACCEPT_JSON}    application/json
 ${apiRoot}        /
 ${AUTH_USAGE}     1
 ${NEG_AUTHORIZATION}    Bearer negativetoken
-${apiVersion}     v2
+${apiMajorVersion}     v2
 ${apiName}        vnfpkgm
 ${FIELD_USAGE}    1
 ${NFVO_PLAIN}     1
-- 
GitLab


From 18d1aadcbf0c3e64295e8b5a5f0fc80546615cb9 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 4 Nov 2020 18:32:49 +0500
Subject: [PATCH 132/322] bugs fix added

---
 .../IndividualSubscription.robot              |  1 +
 .../IndividualVNFPackage.robot                |  5 ++-
 .../IndividualVNFPackageArtifacts.robot       |  6 ++--
 .../Subscriptions.robot                       | 11 +++----
 .../VNFPackageContent.robot                   |  4 +--
 .../VNFPackageContentViaURI.robot             |  6 ++--
 .../VNFPackageManagementKeywords.robot        | 33 ++-----------------
 .../VNFPackages.robot                         |  6 ++--
 8 files changed, 19 insertions(+), 53 deletions(-)

diff --git a/SOL005/VNFPackageManagement-API/IndividualSubscription.robot b/SOL005/VNFPackageManagement-API/IndividualSubscription.robot
index 49da09d46..b2b0c155f 100644
--- a/SOL005/VNFPackageManagement-API/IndividualSubscription.robot
+++ b/SOL005/VNFPackageManagement-API/IndividualSubscription.robot
@@ -32,6 +32,7 @@ GET Individual VNF Package Subscription with invalid resource identifier
     ...    Post-Conditions: none
     GET individual VNF Package Subscription with invalid resource identifier
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
 
 DELETE Individual VNF Package Subscription with invalid resource identifier
     [Documentation]    Test ID: 5.3.5.8.3
diff --git a/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot b/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot
index b73e7b250..5a1efdce4 100644
--- a/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot
+++ b/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot
@@ -31,6 +31,7 @@ GET Individual VNF Package with invalid resource identifier
     ...    Post-Conditions: none    
     GET Individual VNF Package with invalid resource identifier
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
 
 POST Individual VNF Package - Method not implemented
     [Documentation]    Test ID: 5.3.5.2.3
@@ -149,6 +150,4 @@ DELETE Individual VNF Package used for instantiated VNF instances
     Send DELETE Request for Individual VNF Package used for instantiated VNF instances
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is   ProblemDetails
-    Check Postcondition VNF Package Exists
-    
-
+    Check Postcondition VNF Package Exists
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot b/SOL005/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot
index 09b951e99..d1e7fecd3 100644
--- a/SOL005/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot
+++ b/SOL005/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot
@@ -80,6 +80,7 @@ GET Individual VNF Package Artifact with invalid resource identifier
     ...    Post-Conditions: none    
     GET Individual VNF Package Artifact with invalid resource identifier
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
 
 GET Individual VNF Package Artifact with conflict due to onboarding state
     [Documentation]    Test ID: 5.3.5.6.7
@@ -138,7 +139,6 @@ DELETE Individual VNF Package Artifact - Method not implemented
     ...    Reference: Clause 9.4.7.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Package artifact is not deleted by the failed operation
+    ...    Post-Conditions: none
     Send DELETE Request for individual VNF Package Artifact
-    Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Package Artifact Exist
\ No newline at end of file
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/Subscriptions.robot b/SOL005/VNFPackageManagement-API/Subscriptions.robot
index 4ea7e9d35..b1ea7ce9b 100644
--- a/SOL005/VNFPackageManagement-API/Subscriptions.robot
+++ b/SOL005/VNFPackageManagement-API/Subscriptions.robot
@@ -24,7 +24,6 @@ Get All VNF Package Subscriptions
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    PkgmSubscriptions
 
-
 Get VNF Package Subscriptions with attribute-based filter
     [Documentation]    Test ID: 5.3.5.7.2
     ...    Test title: Get VNF Package Subscriptions with attribute-based filter
@@ -39,7 +38,6 @@ Get VNF Package Subscriptions with attribute-based filter
     Check HTTP Response Body Json Schema Is    PkgmSubscriptions
     Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filter
 
-
 Get VNF Package Subscriptions with invalid attribute-based filter
     [Documentation]    Test ID: 5.3.5.7.3
     ...    Test title: Get VNF Package Subscriptions with attribute-based filters
@@ -64,6 +62,7 @@ GET VNF Package Subscription with invalid resource endpoint
     ...    Post-Conditions: none    
     Get VNF Package Subscriptions with invalid resource endpoint
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 Create new VNF Package subscription
     [Documentation]    Test ID: 5.3.5.7.5
@@ -135,8 +134,7 @@ PATCH VNF Package Subscriptions - Method not implemented
     ...    Post-Conditions: none
     Send Patch Request for VNF Package Subscriptions
     Check HTTP Response Status Code Is    405
-    
-        
+          
 DELETE VNF Package Subscriptions - Method not implemented
     [Documentation]    Test ID: 5.3.5.7.10
     ...    Test title: DELETE VNF Package Subscriptions - Method not implemented
@@ -144,10 +142,9 @@ DELETE VNF Package Subscriptions - Method not implemented
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The VNF package subscriptions are not deleted by the failed operation 
+    ...    Post-Conditions: none
     Send Delete Request for VNF Package Subscriptions
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Package Subscriptions Exists
     
 Get All VNF Package Subscriptions as Paged Response
     [Documentation]    Test ID: 5.3.5.7.11
@@ -160,7 +157,7 @@ Get All VNF Package Subscriptions as Paged Response
     ...    Post-Conditions: none    
     Get all VNF Package Subscriptions
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contains Location
     
 Get VNF Package Subscriptions - Bad Request Response too Big
     [Documentation]    Test ID: 5.3.5.7.12
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageContent.robot b/SOL005/VNFPackageManagement-API/VNFPackageContent.robot
index ec895526c..1b0c58d4f 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageContent.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageContent.robot
@@ -71,6 +71,7 @@ GET Individual VNF Package Content with invalid resource identifier
     ...    Post-Conditions: none    
     GET Individual VNF Package Content with invalid resource identifier
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 GET Individual VNF Package Content with conflict due to onboarding state
     [Documentation]    Test ID: 5.3.5.4.6
@@ -143,7 +144,6 @@ DELETE Individual VNF Package Content - Method not implemented
     ...    Reference: Clause 9.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Package content is not deleted by the failed operation
+    ...    Post-Conditions: none
     Send DELETE Request for individual VNF Package Content
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Package Content Exist
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageContentViaURI.robot b/SOL005/VNFPackageManagement-API/VNFPackageContentViaURI.robot
index 5a2fd0c8d..0d61fb103 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageContentViaURI.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageContentViaURI.robot
@@ -33,7 +33,6 @@ Upload VNF Package Content from URI with conflict due to onboarding state
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is   ProblemDetails   
 
-
 GET Individual VNF Package Content from URI - Method not implemented
     [Documentation]    Test ID: 5.3.5.5.3
     ...    Test title: GET Individual VNF Package Content from URI - Method not implemented
@@ -78,7 +77,6 @@ DELETE Individual VNF Package Content from URI - Method not implemented
     ...    Reference: Clause 9.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Package content is not deleted by the failed operation
+    ...    Post-Conditions: none
     Send DELETE Request for individual VNF Package Content from URI
-    Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Package Content from URI Exist
\ No newline at end of file
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 33ac744e2..38977de8b 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -214,10 +214,6 @@ Send DELETE Request for all VNF Packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
-Check Postcondition VNF Packages Exist
-    Log    Checking that Pm Job still exists
-    GET all VNF Packages
-
 GET Individual VNF Package
     Log    Trying to get a VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
@@ -509,11 +505,6 @@ Send DELETE Request for individual VNF Package Content
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
-
-Check Postcondition VNF Package Content Exist
-    Log    Checking that vnf pacakge still exists
-    GET Individual VNF Package Content
-    Check HTTP Response Status Code Is    200
     
 GET Individual VNF Package Artifact
     Log    Trying to get a VNF Package Artifact
@@ -594,15 +585,6 @@ Send DELETE Request for individual VNF Package Artifact
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
-Check Postcondition VNF Package Artifact Exist
-    Log    Checking that vnf pacakge still exists
-    Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    Check HTTP Response Status Code Is    200
-
 Send POST Request to upload VNF Package Content from URI
     Log    Trying to perform a POST. The POST method provides the information for the NFVO to get the content of a VNF package.
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
@@ -655,13 +637,6 @@ Send DELETE Request for individual VNF Package Content from URI
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
-Check Postcondition VNF Package Content from URI Exist
-    Log    Checking that vnf pacakge still exists
-    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}
-    Integer    response status    200
-
 Get all VNF Package Subscriptions
     Log    Trying to get the list of subscriptions
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
@@ -740,11 +715,7 @@ Send Delete Request for VNF Package Subscriptions
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output} 
-
-Check Postcondition VNF Package Subscriptions Exists
-    Log    Checking that subscriptions exists
-    Get all VNF Package Subscriptions    
+    Set Suite Variable    ${response}    ${output}    
 
 Check HTTP Response Body PkgmSubscription Attributes Values Match the Issued Subscription
     Log    Check Response matches subscription
@@ -915,7 +886,7 @@ Check HTTP Response Header Contains
     Should Contain    ${response['headers']}    ${CONTENT_TYPE}
     Log    Header is present
     
-Check LINK in Header
+Check HTTP Response Header Contains Location
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
 
diff --git a/SOL005/VNFPackageManagement-API/VNFPackages.robot b/SOL005/VNFPackageManagement-API/VNFPackages.robot
index 6b681ce00..15c5db397 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackages.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackages.robot
@@ -141,6 +141,7 @@ GET all VNF Packages with invalid resource endpoint
     ...    Post-Conditions: none
     GET all VNF Packages with invalid resource endpoint
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 Create new VNF Package Resource
     [Documentation]    Test ID: 5.3.5.1.11
@@ -189,10 +190,9 @@ DELETE all VNF Packages - Method not implemented
     ...    Reference: Clause 9.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The VNF Packages are not deleted by the failed operation
+    ...    Post-Conditions: none
     Send DELETE Request for all VNF Packages
     Check HTTP Response Status Code Is    405
-    Check Postcondition VNF Packages Exist
     
 GET all VNF Packages as Paged Response
     [Documentation]    Test ID: 5.3.5.1.15
@@ -205,7 +205,7 @@ GET all VNF Packages as Paged Response
     ...    Post-Conditions: none
     GET all VNF Packages
     Check HTTP Response Status Code Is    200
-    Check LINK in Header
+    Check HTTP Response Header Contains Location
     
 GET VNF Packages - Bad Request Response too Big
     [Documentation]    Test ID: 5.3.5.1.16
-- 
GitLab


From 356a2954cb39662d721f5423259e0b02390386e4 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Thu, 5 Nov 2020 12:40:17 +0500
Subject: [PATCH 133/322] New Resource NotificationConsumer added

---
 .../NotificationConsumer.robot                | 55 +++++++++++++++++++
 .../VnfLcmOperationKeywords.robot             | 34 +++++++++++-
 .../environment/variables.txt                 |  4 +-
 .../VnfIdentifierCreationNotification.json    |  8 +++
 .../VnfIdentifierDeletionNotification.json    |  8 +++
 ...VnfLcmOperationOccurrenceNotification.json | 13 +++++
 6 files changed, 120 insertions(+), 2 deletions(-)
 create mode 100644 SOL002/VNFLifecycleManagement-API/NotificationConsumer.robot
 create mode 100644 SOL002/VNFLifecycleManagement-API/jsons/VnfIdentifierCreationNotification.json
 create mode 100644 SOL002/VNFLifecycleManagement-API/jsons/VnfIdentifierDeletionNotification.json
 create mode 100644 SOL002/VNFLifecycleManagement-API/jsons/VnfLcmOperationOccurrenceNotification.json

diff --git a/SOL002/VNFLifecycleManagement-API/NotificationConsumer.robot b/SOL002/VNFLifecycleManagement-API/NotificationConsumer.robot
new file mode 100644
index 000000000..6a4fa734b
--- /dev/null
+++ b/SOL002/VNFLifecycleManagement-API/NotificationConsumer.robot
@@ -0,0 +1,55 @@
+*** Settings ***
+Resource    environment/variables.txt 
+Resource    VnfLcmOperationKeywords.robot
+Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
+Library    OperatingSystem
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+VNF LCM Operation Occurrence Notification
+    [Documentation]    Test ID: 6.3.5.20.1
+    ...    Test title: VNF LCM Operation Occurrence Start Notification
+    ...    Test objective:  The objective is to test the POST request to callbackUri trigger VNF LCM Operation Occurrence Start Notification
+    ...    Pre-conditions: A subscription for VNF LCM Operation Occurrence notifications is available in the VNFM.
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF LCM Operation Occurrence Notification
+    Check HTTP Response Status Code Is    204
+
+VNF Identifier Creation Notification
+    [Documentation]    Test ID: 6.3.5.20.2
+    ...    Test title: VNF Identifier Creation Notification
+    ...    Test objective:  The objective is to test the POST request to callbackUri trigger VNF Identifier Creation Notification
+    ...    Pre-conditions: A subscription for VNF Identifier Creation Notification is available in the VNFM.
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF Identifier Creation Notification
+    Check HTTP Response Status Code Is    204
+    
+VNF Identifier Deletion Notification
+    [Documentation]    Test ID: 6.3.5.20.3
+    ...    Test title: VNF Identifier Deletion Notification
+    ...    Test objective:  The objective is to test the POST request to callbackUri trigger VNF Identifier Deletion Notification
+    ...    Pre-conditions: A subscription for VNF Identifier Deletion Notification is available in the VNFM.
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF Identifier Deletion Notification
+    Check HTTP Response Status Code Is    204
+
+*** Keywords ***
+Check resource existence and get CallbackUri
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions	
+    Integer    response status    200
+    Validate Json    response body    Subscriptions.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index f98becf2a..895957386 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -1016,4 +1016,36 @@ Get VNF LCM Operation occurrences with exclude_fields attribute selector
 Check HTTP Response Header Contain Link
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
-    
\ No newline at end of file
+    
+Post VNF LCM Operation Occurrence Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/VnfLcmOperationOccurrenceNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfInstanceId=${vnfInstanceId}    vnfLcmOpOccId=${vnfLcmOpOccId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+	
+Post VNF Identifier Creation Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/VnfIdentifierCreationNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfInstanceId=${vnfInstanceId}  
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+	
+Post VNF Identifier Deletion Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/VnfIdentifierDeletionNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfInstanceId=${vnfInstanceId}  
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/environment/variables.txt b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
index b15172d18..29e211d27 100644
--- a/SOL002/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
@@ -75,4 +75,6 @@ ${healingCause}    healingCause
 
 ${changeStateTo}    STOPPED
 
-${vnfdIds}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
\ No newline at end of file
+${vnfdIds}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
+
+${callbackResp}    localhost
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/VnfIdentifierCreationNotification.json b/SOL002/VNFLifecycleManagement-API/jsons/VnfIdentifierCreationNotification.json
new file mode 100644
index 000000000..678278c5d
--- /dev/null
+++ b/SOL002/VNFLifecycleManagement-API/jsons/VnfIdentifierCreationNotification.json
@@ -0,0 +1,8 @@
+{{
+	"id":"",
+	"notificationType":"VnfIdentifierCreationNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"vnfInstanceId":"{vnfInstanceId}",
+	"_links":""
+}}
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/VnfIdentifierDeletionNotification.json b/SOL002/VNFLifecycleManagement-API/jsons/VnfIdentifierDeletionNotification.json
new file mode 100644
index 000000000..678278c5d
--- /dev/null
+++ b/SOL002/VNFLifecycleManagement-API/jsons/VnfIdentifierDeletionNotification.json
@@ -0,0 +1,8 @@
+{{
+	"id":"",
+	"notificationType":"VnfIdentifierCreationNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"vnfInstanceId":"{vnfInstanceId}",
+	"_links":""
+}}
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/VnfLcmOperationOccurrenceNotification.json b/SOL002/VNFLifecycleManagement-API/jsons/VnfLcmOperationOccurrenceNotification.json
new file mode 100644
index 000000000..21d4b97d6
--- /dev/null
+++ b/SOL002/VNFLifecycleManagement-API/jsons/VnfLcmOperationOccurrenceNotification.json
@@ -0,0 +1,13 @@
+{{
+	"id":"",
+	"notificationType":"VnfLcmOperationOccurrenceNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"notificationStatus":"STRAT",
+	"operationState":"PROCESSING",
+	"vnfInstanceId":"{vnfInstanceId}",
+	"operation":"SCALE",
+	"isAutomaticInvocation":"false",
+	"vnfLcmOpOccId":"{vnfLcmOpOccId}",
+	"_links":""
+}}
\ No newline at end of file
-- 
GitLab


From 6483985641a241c18868c284a2e784262a60e632 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Thu, 5 Nov 2020 15:15:20 +0500
Subject: [PATCH 134/322] New Resource NotificationConsumer added

---
 .../NotificationConsumer.robot                | 71 +++++++++++++++++++
 .../environment/variables.txt                 |  3 +
 ...manceInformationAvaliableNotification.json | 12 ++++
 .../jsons/ThresholdCrossedNotification.json   | 15 ++++
 4 files changed, 101 insertions(+)
 create mode 100644 SOL002/VNFPerformanceManagement-API/NotificationConsumer.robot
 create mode 100644 SOL002/VNFPerformanceManagement-API/jsons/PerformanceInformationAvaliableNotification.json
 create mode 100644 SOL002/VNFPerformanceManagement-API/jsons/ThresholdCrossedNotification.json

diff --git a/SOL002/VNFPerformanceManagement-API/NotificationConsumer.robot b/SOL002/VNFPerformanceManagement-API/NotificationConsumer.robot
new file mode 100644
index 000000000..ede8234f5
--- /dev/null
+++ b/SOL002/VNFPerformanceManagement-API/NotificationConsumer.robot
@@ -0,0 +1,71 @@
+*** Settings ***
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt
+Library           JSONLibrary
+Library           OperatingSystem
+Library           String
+Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+VNF Performance Information Availability Notification
+    [Documentation]    Test ID: 6.3.3.9.1
+    ...    Test title: VNF Performance Information Availability Notification
+    ...    Test objective: The objective is to test the POST request to callbackUri trigger VNF Performance Information Availability Notification
+    ...    Pre-conditions: A VNF performance job is created, and a subscription for information availability notifications is available in the VNFM.
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF Performance Information Availability Notification
+    Check HTTP Response Status Code Is    204
+    
+VNF Threshold Crossed Notification
+    [Documentation]    Test ID: 6.3.3.9.2
+    ...    Test title: VNF Threshold Crossed Notification
+    ...    Test objective: The objective is to test the POST request to callbackUri trigger VNF Threshold Crossed Notification
+    ...    Pre-conditions: A VNF performance job is created, and a subscription for Threshold Crossed Notification is available in the VNFM.
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF Threshold Crossed Notification
+    Check HTTP Response Status Code Is    204
+    
+*** Keywords ***
+Check resource existence and get CallbackUri
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}	
+    Integer    response status    200
+    Validate Json    response body    PmJob.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+    
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}
+    ${status}=    Convert To Integer    ${expected_status}    
+    Should Be Equal    ${response['status']}    ${status} 
+    Log    Status code validated
+    
+Post VNF Performance Information Availability Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/PerformanceInformationAvaliableNotification.json
+    ${body}=        Format String   ${template}    objectInstanceId=${objectInstanceId} 
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+
+Post VNF Threshold Crossed Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/ThresholdCrossedNotification.json
+    ${body}=        Format String   ${template}    thresholdId=${thresholdId}    objectInstanceId=${objectInstanceId} 
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
diff --git a/SOL002/VNFPerformanceManagement-API/environment/variables.txt b/SOL002/VNFPerformanceManagement-API/environment/variables.txt
index 8636509cb..b3453720a 100644
--- a/SOL002/VNFPerformanceManagement-API/environment/variables.txt
+++ b/SOL002/VNFPerformanceManagement-API/environment/variables.txt
@@ -63,3 +63,6 @@ ${filter_ko}      erroneousFilter=erroneous
 ${total_polling_time}   2 min
 ${polling_interval}     10 sec
 
+${callbackResp}    localhost
+
+${objectInstanceId}    
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/jsons/PerformanceInformationAvaliableNotification.json b/SOL002/VNFPerformanceManagement-API/jsons/PerformanceInformationAvaliableNotification.json
new file mode 100644
index 000000000..5ac84f0a4
--- /dev/null
+++ b/SOL002/VNFPerformanceManagement-API/jsons/PerformanceInformationAvaliableNotification.json
@@ -0,0 +1,12 @@
+{{
+	"id":"",
+	"notificationType":"PerformanceInformationAvailableNotification",
+	"timeStamp":"",
+	"objectType":"",
+	"objectInstanceId":"{objectInstanceId}",
+	"_links":{{
+		"objectInstance":"",
+		"pmJob":"",
+		"performanceReport":""
+	}}
+}}
diff --git a/SOL002/VNFPerformanceManagement-API/jsons/ThresholdCrossedNotification.json b/SOL002/VNFPerformanceManagement-API/jsons/ThresholdCrossedNotification.json
new file mode 100644
index 000000000..cb963a101
--- /dev/null
+++ b/SOL002/VNFPerformanceManagement-API/jsons/ThresholdCrossedNotification.json
@@ -0,0 +1,15 @@
+{{
+	"id":"",
+	"notificationType":"ThresholdCrossedNotification",
+	"timeStamp":"",
+	"thresholdId":"{thresholdId}",
+	"crossingDirection":"UP",
+	"objectType":"",
+	"objectInstanceId":"{objectInstanceId}",
+	"performanceMetric":"",
+	"performanceValue":"",
+	"_links":{{
+		"objectInstance":"",
+		"threshold":""
+	}}
+}}
-- 
GitLab


From e88d4a8a415faf04190012086f9831098d33454d Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Thu, 5 Nov 2020 15:17:26 +0500
Subject: [PATCH 135/322] minor bug fix

---
 SOL002/VNFLifecycleManagement-API/NotificationConsumer.robot  | 4 ++--
 .../jsons/VnfIdentifierDeletionNotification.json              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/NotificationConsumer.robot b/SOL002/VNFLifecycleManagement-API/NotificationConsumer.robot
index 6a4fa734b..58ad40cff 100644
--- a/SOL002/VNFLifecycleManagement-API/NotificationConsumer.robot
+++ b/SOL002/VNFLifecycleManagement-API/NotificationConsumer.robot
@@ -49,7 +49,7 @@ Check resource existence and get CallbackUri
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions	
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     Integer    response status    200
-    Validate Json    response body    Subscriptions.schema.json
+    Validate Json    response body    subscription.schema.json
     Set Global Variable    ${callbackResp}    response body callbackUri
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/VnfIdentifierDeletionNotification.json b/SOL002/VNFLifecycleManagement-API/jsons/VnfIdentifierDeletionNotification.json
index 678278c5d..287c30299 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/VnfIdentifierDeletionNotification.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/VnfIdentifierDeletionNotification.json
@@ -1,6 +1,6 @@
 {{
 	"id":"",
-	"notificationType":"VnfIdentifierCreationNotification",
+	"notificationType":"VnfIdentifierDeletionNotification",
 	"subscriptionId":"{subscriptionId}",
 	"timeStamp":"",
 	"vnfInstanceId":"{vnfInstanceId}",
-- 
GitLab


From daee69530781a8726e5cb67b61f2d8c965c568a1 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Thu, 5 Nov 2020 16:00:13 +0500
Subject: [PATCH 136/322] New Resource NotificationConsumer added

---
 .../AlarmListRebuiltNotification.json         | 10 ++
 .../NotificationConsumer.robot                | 93 +++++++++++++++++++
 .../environment/variables.txt                 |  4 +-
 .../jsons/AlarmClearedNotification.json       | 12 +++
 .../jsons/AlarmNotification.json              | 13 +++
 5 files changed, 131 insertions(+), 1 deletion(-)
 create mode 100644 SOL002/VNFFaultManagement-API/AlarmListRebuiltNotification.json
 create mode 100644 SOL002/VNFFaultManagement-API/NotificationConsumer.robot
 create mode 100644 SOL002/VNFFaultManagement-API/jsons/AlarmClearedNotification.json
 create mode 100644 SOL002/VNFFaultManagement-API/jsons/AlarmNotification.json

diff --git a/SOL002/VNFFaultManagement-API/AlarmListRebuiltNotification.json b/SOL002/VNFFaultManagement-API/AlarmListRebuiltNotification.json
new file mode 100644
index 000000000..2c0202371
--- /dev/null
+++ b/SOL002/VNFFaultManagement-API/AlarmListRebuiltNotification.json
@@ -0,0 +1,10 @@
+{{
+	"id":"",
+	"notificationType":"AlarmListRebuiltNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"_links":{{
+		"subscription":"",
+		"alarm":""
+	}}
+}}
diff --git a/SOL002/VNFFaultManagement-API/NotificationConsumer.robot b/SOL002/VNFFaultManagement-API/NotificationConsumer.robot
new file mode 100644
index 000000000..393c41c97
--- /dev/null
+++ b/SOL002/VNFFaultManagement-API/NotificationConsumer.robot
@@ -0,0 +1,93 @@
+*** Settings ***
+Library    String
+Library    OperatingSystem
+Resource    environment/variables.txt 
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}       ssl_verify=false 
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+VNF Fault Alarm Notification
+    [Documentation]    Test ID: 6.3.4.7.1
+    ...    Test title: VNF Fault Alarm Notification
+    ...    Test objective: The objective is to test the POST request to callbackUri trigger VNF Fault Alarm Notification
+    ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm notifications is available in the VNFM.
+    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Alarm Notification
+    Check HTTP Response Status Code Is    204
+    
+VNF Fault Alarm Cleared Notification
+    [Documentation]    Test ID: 6.3.4.7.2
+    ...    Test title: VNF Fault Alarm Cleared Notification
+    ...    Test objective: The objective is to test the POST request to callbackUri trigger VNF Fault Alarm Cleared Notification
+    ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm cleared notifications is available in the VNFM.
+    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Alarm Cleared Notification
+    Check HTTP Response Status Code Is    204
+    
+VNF Fault Alarm List Rebuilt Notification
+    [Documentation]    Test ID: 6.3.4.7.3
+    ...    Test title: VNF Fault List Rebuilt Alarm List Rebuilt Notification
+    ...    Test objective: The objective is to test the POST request to callbackUri trigger VNF Fault Alarm List Rebuilt Notification
+    ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm list rebuilt notifications is available in the VNFM.
+    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Alarm List Rebuilt Notification
+    Check HTTP Response Status Code Is    204
+
+*** Keywords ***
+Check resource existence and get CallbackUri
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}	
+    Integer    response status    200
+    
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+    Validate Json    response body    FmSubscription.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+
+Post Alarm Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/AlarmNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+
+Post Alarm Cleared Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/AlarmClearedNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    alarmId=${alarmId}
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+	
+Post Alarm List Rebuilt Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/AlarmListRebuiltNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
\ No newline at end of file
diff --git a/SOL002/VNFFaultManagement-API/environment/variables.txt b/SOL002/VNFFaultManagement-API/environment/variables.txt
index 88d5888ff..7eb09910b 100644
--- a/SOL002/VNFFaultManagement-API/environment/variables.txt
+++ b/SOL002/VNFFaultManagement-API/environment/variables.txt
@@ -56,4 +56,6 @@ ${faultyResourceType}    COMPUTE
 ${eventType}            COMMUNICATIONS_ALARM
 ${probableCause}
 
-${notification_type}	AlarmNotification
\ No newline at end of file
+${notification_type}	AlarmNotification
+
+${callbackResp}    localhost
\ No newline at end of file
diff --git a/SOL002/VNFFaultManagement-API/jsons/AlarmClearedNotification.json b/SOL002/VNFFaultManagement-API/jsons/AlarmClearedNotification.json
new file mode 100644
index 000000000..f8a50fb3b
--- /dev/null
+++ b/SOL002/VNFFaultManagement-API/jsons/AlarmClearedNotification.json
@@ -0,0 +1,12 @@
+{{
+	"id":"",
+	"notificationType":"AlarmClearedNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"alarmId":"{alarmId}",
+	"alarmCleareTime":"",
+	"_links":{{
+		"subscription":"",
+		"alarm":""
+	}}
+}}
diff --git a/SOL002/VNFFaultManagement-API/jsons/AlarmNotification.json b/SOL002/VNFFaultManagement-API/jsons/AlarmNotification.json
new file mode 100644
index 000000000..2a8e86425
--- /dev/null
+++ b/SOL002/VNFFaultManagement-API/jsons/AlarmNotification.json
@@ -0,0 +1,13 @@
+{{
+	"id":"",
+	"notificationType":"AlarmNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"alarm":{{
+		"id":"",
+		"managedObjectId":""
+	}},
+	"_links":{{
+		"subscription":""
+	}}
+}}
-- 
GitLab


From 7d9a5ac785dcf2dfb648ee8fa2b6adfa00bfde66 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Thu, 5 Nov 2020 16:43:31 +0500
Subject: [PATCH 137/322] objective updated

---
 SOL002/VNFFaultManagement-API/NotificationConsumer.robot    | 6 +++---
 .../{ => jsons}/AlarmListRebuiltNotification.json           | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename SOL002/VNFFaultManagement-API/{ => jsons}/AlarmListRebuiltNotification.json (100%)

diff --git a/SOL002/VNFFaultManagement-API/NotificationConsumer.robot b/SOL002/VNFFaultManagement-API/NotificationConsumer.robot
index 393c41c97..5fea3c86b 100644
--- a/SOL002/VNFFaultManagement-API/NotificationConsumer.robot
+++ b/SOL002/VNFFaultManagement-API/NotificationConsumer.robot
@@ -11,7 +11,7 @@ Suite Setup    Check resource existence and get CallbackUri
 VNF Fault Alarm Notification
     [Documentation]    Test ID: 6.3.4.7.1
     ...    Test title: VNF Fault Alarm Notification
-    ...    Test objective: The objective is to test the POST request to callbackUri trigger VNF Fault Alarm Notification
+    ...    Test objective: The objective is to test that the POST request triggers VNF Fault Alarm Notification
     ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm notifications is available in the VNFM.
     ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
@@ -23,7 +23,7 @@ VNF Fault Alarm Notification
 VNF Fault Alarm Cleared Notification
     [Documentation]    Test ID: 6.3.4.7.2
     ...    Test title: VNF Fault Alarm Cleared Notification
-    ...    Test objective: The objective is to test the POST request to callbackUri trigger VNF Fault Alarm Cleared Notification
+    ...    Test objective: The objective is to test that the POST request triggers VNF Fault Alarm Cleared Notification
     ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm cleared notifications is available in the VNFM.
     ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
@@ -35,7 +35,7 @@ VNF Fault Alarm Cleared Notification
 VNF Fault Alarm List Rebuilt Notification
     [Documentation]    Test ID: 6.3.4.7.3
     ...    Test title: VNF Fault List Rebuilt Alarm List Rebuilt Notification
-    ...    Test objective: The objective is to test the POST request to callbackUri trigger VNF Fault Alarm List Rebuilt Notification
+    ...    Test objective: The objective is to test that the POST request triggers VNF Fault Alarm List Rebuilt Notification
     ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm list rebuilt notifications is available in the VNFM.
     ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
diff --git a/SOL002/VNFFaultManagement-API/AlarmListRebuiltNotification.json b/SOL002/VNFFaultManagement-API/jsons/AlarmListRebuiltNotification.json
similarity index 100%
rename from SOL002/VNFFaultManagement-API/AlarmListRebuiltNotification.json
rename to SOL002/VNFFaultManagement-API/jsons/AlarmListRebuiltNotification.json
-- 
GitLab


From d96ad3637ff48a7604da7780797aa592e3a78259 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Thu, 5 Nov 2020 16:44:51 +0500
Subject: [PATCH 138/322] objective updated

---
 .../VNFLifecycleManagement-API/NotificationConsumer.robot | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/NotificationConsumer.robot b/SOL002/VNFLifecycleManagement-API/NotificationConsumer.robot
index 58ad40cff..e38d09f5d 100644
--- a/SOL002/VNFLifecycleManagement-API/NotificationConsumer.robot
+++ b/SOL002/VNFLifecycleManagement-API/NotificationConsumer.robot
@@ -11,7 +11,7 @@ Suite Setup    Check resource existence and get CallbackUri
 VNF LCM Operation Occurrence Notification
     [Documentation]    Test ID: 6.3.5.20.1
     ...    Test title: VNF LCM Operation Occurrence Start Notification
-    ...    Test objective:  The objective is to test the POST request to callbackUri trigger VNF LCM Operation Occurrence Start Notification
+    ...    Test objective:  The objective is to test that the POST request triggers VNF LCM Operation Occurrence Start Notification
     ...    Pre-conditions: A subscription for VNF LCM Operation Occurrence notifications is available in the VNFM.
     ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
@@ -23,7 +23,7 @@ VNF LCM Operation Occurrence Notification
 VNF Identifier Creation Notification
     [Documentation]    Test ID: 6.3.5.20.2
     ...    Test title: VNF Identifier Creation Notification
-    ...    Test objective:  The objective is to test the POST request to callbackUri trigger VNF Identifier Creation Notification
+    ...    Test objective:  The objective is to test that the POST request triggers VNF Identifier Creation Notification
     ...    Pre-conditions: A subscription for VNF Identifier Creation Notification is available in the VNFM.
     ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
@@ -35,7 +35,7 @@ VNF Identifier Creation Notification
 VNF Identifier Deletion Notification
     [Documentation]    Test ID: 6.3.5.20.3
     ...    Test title: VNF Identifier Deletion Notification
-    ...    Test objective:  The objective is to test the POST request to callbackUri trigger VNF Identifier Deletion Notification
+    ...    Test objective:  The objective is to test that the POST request triggers VNF Identifier Deletion Notification
     ...    Pre-conditions: A subscription for VNF Identifier Deletion Notification is available in the VNFM.
     ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
@@ -52,4 +52,4 @@ Check resource existence and get CallbackUri
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     Integer    response status    200
     Validate Json    response body    subscription.schema.json
-    Set Global Variable    ${callbackResp}    response body callbackUri
+    Set Global Variable    ${callbackResp}    response body callbackUri
\ No newline at end of file
-- 
GitLab


From 1fcd95aaf0d4378feb3b79f694342a5e2691caff Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Thu, 5 Nov 2020 16:46:09 +0500
Subject: [PATCH 139/322] objective updated

---
 .../VNFPerformanceManagement-API/NotificationConsumer.robot   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SOL002/VNFPerformanceManagement-API/NotificationConsumer.robot b/SOL002/VNFPerformanceManagement-API/NotificationConsumer.robot
index ede8234f5..e2fae0d06 100644
--- a/SOL002/VNFPerformanceManagement-API/NotificationConsumer.robot
+++ b/SOL002/VNFPerformanceManagement-API/NotificationConsumer.robot
@@ -11,7 +11,7 @@ Suite Setup    Check resource existence and get CallbackUri
 VNF Performance Information Availability Notification
     [Documentation]    Test ID: 6.3.3.9.1
     ...    Test title: VNF Performance Information Availability Notification
-    ...    Test objective: The objective is to test the POST request to callbackUri trigger VNF Performance Information Availability Notification
+    ...    Test objective: The objective is to test that the POST request triggers VNF Performance Information Availability Notification
     ...    Pre-conditions: A VNF performance job is created, and a subscription for information availability notifications is available in the VNFM.
     ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
@@ -23,7 +23,7 @@ VNF Performance Information Availability Notification
 VNF Threshold Crossed Notification
     [Documentation]    Test ID: 6.3.3.9.2
     ...    Test title: VNF Threshold Crossed Notification
-    ...    Test objective: The objective is to test the POST request to callbackUri trigger VNF Threshold Crossed Notification
+    ...    Test objective: The objective is to test that the POST request triggers VNF Threshold Crossed Notification
     ...    Pre-conditions: A VNF performance job is created, and a subscription for Threshold Crossed Notification is available in the VNFM.
     ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-- 
GitLab


From 8b32d38e4bc9f6960c0471798acc7c1a81ae8257 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Fri, 6 Nov 2020 10:05:55 +0500
Subject: [PATCH 140/322] New Resource NotificationConsumer added

---
 .../NoificationConsumer.robot                 | 46 +++++++++++++++++++
 .../environment/variables.txt                 |  4 +-
 .../jsons/ValueChangeNotification.json        | 12 +++++
 3 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 SOL002/VNFIndicator-API/NoificationConsumer.robot
 create mode 100644 SOL002/VNFIndicator-API/jsons/ValueChangeNotification.json

diff --git a/SOL002/VNFIndicator-API/NoificationConsumer.robot b/SOL002/VNFIndicator-API/NoificationConsumer.robot
new file mode 100644
index 000000000..1f6b1cb25
--- /dev/null
+++ b/SOL002/VNFIndicator-API/NoificationConsumer.robot
@@ -0,0 +1,46 @@
+*** Settings ***
+Library    String
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt    # Generic Parameters
+Library           OperatingSystem
+Library           REST    ${EM-VNF_SCHEMA}://${EM-VNF_HOST}:${EM-VNF_PORT}    ssl_verify=false
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+VNF Indicator Value Change Notification
+    [Documentation]    Test ID: 6.3.2.7.1
+    ...    Test title: VNF Indicator Value Change Notification
+    ...    Test objective: The objective is to test that the POST request triggers VNF Indicator Value Change Notification .
+    ...    Pre-conditions: A VNF is instantiated, and a subscription for indicator value change notifications is available in the VNF.
+    ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNF
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Value Change Notification
+    Check HTTP Response Status Code Is    204
+
+*** Keywords ***
+Check resource existence and get CallbackUri
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}	
+    Integer    response status    200
+    Validate Json    response body    VnfIndicatorSubscription.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+    
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+       
+Post Value Change Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/ValueChangeNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    indicatorId=${indicatorId}    vnfInstanceId=${vnfInstanceId}
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
\ No newline at end of file
diff --git a/SOL002/VNFIndicator-API/environment/variables.txt b/SOL002/VNFIndicator-API/environment/variables.txt
index b08433660..3439ee7c8 100644
--- a/SOL002/VNFIndicator-API/environment/variables.txt
+++ b/SOL002/VNFIndicator-API/environment/variables.txt
@@ -48,4 +48,6 @@ ${NEG_FIELDS}     wrongName=any_value
 
 
 ${vnfIndicators}  =     
-${VAR_SEPERATOR}    &
\ No newline at end of file
+${VAR_SEPERATOR}    &
+
+${callbackResp}    localhost
\ No newline at end of file
diff --git a/SOL002/VNFIndicator-API/jsons/ValueChangeNotification.json b/SOL002/VNFIndicator-API/jsons/ValueChangeNotification.json
new file mode 100644
index 000000000..ee1f63ee3
--- /dev/null
+++ b/SOL002/VNFIndicator-API/jsons/ValueChangeNotification.json
@@ -0,0 +1,12 @@
+{{
+	"id":"",
+	"notificationType":"VnfIndicatorValueChangeNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"vnfIndicatorId":"{indicatorId}",
+	"vnfInstanceId":"{vnfInstanceId}"
+	"_links":{{
+		"subscription":"",
+		"vnfInstance":""
+	}}
+}}
-- 
GitLab


From 03b59d9ea76d1ca648687d7e062102ac1ee27802 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Fri, 6 Nov 2020 10:08:04 +0500
Subject: [PATCH 141/322] bug fix

---
 SOL002/VNFFaultManagement-API/NotificationConsumer.robot | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SOL002/VNFFaultManagement-API/NotificationConsumer.robot b/SOL002/VNFFaultManagement-API/NotificationConsumer.robot
index 5fea3c86b..ae6d726f6 100644
--- a/SOL002/VNFFaultManagement-API/NotificationConsumer.robot
+++ b/SOL002/VNFFaultManagement-API/NotificationConsumer.robot
@@ -51,13 +51,13 @@ Check resource existence and get CallbackUri
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}	
     Integer    response status    200
+    Validate Json    response body    FmSubscription.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
     
 Check HTTP Response Status Code Is
     [Arguments]    ${expected_status}    
     Should Be Equal As Strings    ${response['status']}    ${expected_status}
     Log    Status code validated 
-    Validate Json    response body    FmSubscription.schema.json
-    Set Global Variable    ${callbackResp}    response body callbackUri
 
 Post Alarm Notification
     log    Trying to perform a POST to get notification
-- 
GitLab


From 53550516a91bc55244a71ac5c313f414be4e607c Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Fri, 6 Nov 2020 10:52:25 +0500
Subject: [PATCH 142/322] New Resource NotificationConsumer added

---
 .../NotificationConsumer.robot                | 92 +++++++++++++++++++
 .../environment/variables.txt                 |  5 +-
 .../VnfIdentifierCreationNotification.json    |  8 ++
 .../VnfIdentifierDeletionNotification.json    |  8 ++
 ...VnfLcmOperationOccurrenceNotification.json | 13 +++
 5 files changed, 122 insertions(+), 4 deletions(-)
 create mode 100644 SOL003/VNFLifecycleManagement-API/NotificationConsumer.robot
 create mode 100644 SOL003/VNFLifecycleManagement-API/jsons/VnfIdentifierCreationNotification.json
 create mode 100644 SOL003/VNFLifecycleManagement-API/jsons/VnfIdentifierDeletionNotification.json
 create mode 100644 SOL003/VNFLifecycleManagement-API/jsons/VnfLcmOperationOccurrenceNotification.json

diff --git a/SOL003/VNFLifecycleManagement-API/NotificationConsumer.robot b/SOL003/VNFLifecycleManagement-API/NotificationConsumer.robot
new file mode 100644
index 000000000..9e27f5bc7
--- /dev/null
+++ b/SOL003/VNFLifecycleManagement-API/NotificationConsumer.robot
@@ -0,0 +1,92 @@
+*** Settings ***
+Library    String
+Library    OperatingSystem
+Resource    environment/variables.txt
+Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}        ssl_verify=false
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+VNF LCM Operation Occurrence Notification
+    [Documentation]    Test ID: 7.3.1.36.1
+    ...    Test title: VNF LCM Operation Occurrence Notification
+    ...    Test objective: The objective is to test that the POST request triggers VNF LCM Operation Occurrence Notification.
+    ...    Pre-conditions: A subscription for VNF LCM Operation Occurrence notifications is available in the VNFM.
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF LCM Operation Occurrence Notification
+    Check HTTP Response Status Code Is    204
+    
+VNF Identifier Creation Notification
+    [Documentation]    Test ID: 7.3.1.36.2
+    ...    Test title: VNF Identifier Creation Notification
+    ...    Test objective: The objective is to test that the POST request triggers VNF Identifier Creation Notification.
+    ...    Pre-conditions: A subscription for VNF identifier creation cotification is available in the VNFM.
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF Identifier Creation Notification
+    Check HTTP Response Status Code Is    204
+
+VNF Identifier Deletion Notification
+    [Documentation]    Test ID: 7.3.1.36.3
+    ...    Test title: VNF Identifier Deletion Notification
+    ...    Test objective: The objective is to test that the POST request triggers VNF Identifier Deletion Notification.
+    ...    Pre-conditions: A subscription for VNF identifier deletion notifications is available in the VNFM.
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF LCM Operation Occurrence Notification
+    Check HTTP Response Status Code Is    204
+*** Keywords ***
+Check resource existence and get CallbackUri
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}	
+    Integer    response status    200
+    Validate Json    response body    Subscription.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+    
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+
+Post VNF LCM Operation Occurrence Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/VnfLcmOperationOccurrenceNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfInstanceId=${vnfInstanceId}    vnfLcmOpOccId=${vnfLcmOpOccId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+	
+Post VNF Identifier Creation Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/VnfIdentifierCreationNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfInstanceId=${vnfInstanceId}  
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+	
+Post VNF Identifier Deletion Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/VnfIdentifierDeletionNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfInstanceId=${vnfInstanceId}  
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/environment/variables.txt b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
index 446b1f496..b08bdeff5 100644
--- a/SOL003/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
@@ -16,10 +16,6 @@ ${apiMajorVersion}     v1
 ${CancelMode}    GRACEFUL
 ${VNFM_DUPLICATION}    0
 
-
-
-
-
 ${NFVO_HOST}      localhost    # Hostname of the NFVO
 ${NFVO_PORT}      8081    # Listening port of the NFVO
 ${NFVO_SCHEMA}    https
@@ -101,3 +97,4 @@ ${element}
 ${aspectId}
 ${scaleOutResponse}
 
+${callbackResp}    localhost
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/jsons/VnfIdentifierCreationNotification.json b/SOL003/VNFLifecycleManagement-API/jsons/VnfIdentifierCreationNotification.json
new file mode 100644
index 000000000..dfc860f3d
--- /dev/null
+++ b/SOL003/VNFLifecycleManagement-API/jsons/VnfIdentifierCreationNotification.json
@@ -0,0 +1,8 @@
+{{
+	"id":"",
+	"notificationType":"VnfIdentifierCreationNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"vnfInstanceId":"{vnfInstanceId}",
+	"_links":""
+}}
diff --git a/SOL003/VNFLifecycleManagement-API/jsons/VnfIdentifierDeletionNotification.json b/SOL003/VNFLifecycleManagement-API/jsons/VnfIdentifierDeletionNotification.json
new file mode 100644
index 000000000..3754be2b9
--- /dev/null
+++ b/SOL003/VNFLifecycleManagement-API/jsons/VnfIdentifierDeletionNotification.json
@@ -0,0 +1,8 @@
+{{
+	"id":"",
+	"notificationType":"VnfIdentifierDeletionNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"vnfInstanceId":"{vnfInstanceId}",
+	"_links":""
+}}
diff --git a/SOL003/VNFLifecycleManagement-API/jsons/VnfLcmOperationOccurrenceNotification.json b/SOL003/VNFLifecycleManagement-API/jsons/VnfLcmOperationOccurrenceNotification.json
new file mode 100644
index 000000000..0756a3323
--- /dev/null
+++ b/SOL003/VNFLifecycleManagement-API/jsons/VnfLcmOperationOccurrenceNotification.json
@@ -0,0 +1,13 @@
+{{
+	"id":"",
+	"notificationType":"VnfLcmOperationOccurrenceNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"notificationStatus":"STRAT",
+	"operationState":"PROCESSING",
+	"vnfInstanceId":"{vnfInstanceId}",
+	"operation":"SCALE",
+	"isAutomaticInvocation":"false",
+	"vnfLcmOpOccId":"{vnfLcmOpOccId}",
+	"_links":""
+}}
-- 
GitLab


From b610cf525edddf95e0c36518b13c38dd4c6d14ea Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Fri, 6 Nov 2020 12:15:18 +0500
Subject: [PATCH 143/322] New Resource NotificationConsumer added

---
 .../NotificationConsumer.robot                | 69 +++++++++++++++++++
 .../environment/variables.txt                 |  4 +-
 2 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 SOL003/VNFPerformanceManagement-API/NotificationConsumer.robot

diff --git a/SOL003/VNFPerformanceManagement-API/NotificationConsumer.robot b/SOL003/VNFPerformanceManagement-API/NotificationConsumer.robot
new file mode 100644
index 000000000..55d99d44d
--- /dev/null
+++ b/SOL003/VNFPerformanceManagement-API/NotificationConsumer.robot
@@ -0,0 +1,69 @@
+*** Settings ***
+Library    String
+Library    OperatingSystem
+Library    JSONSchemaLibrary    schemas/
+Resource   environment/variables.txt
+Library    JSONLibrary
+Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+Performance Information Available Notification
+    [Documentation]    Test ID: 7.3.4.10.1
+    ...    Test title: Performance Information Available Notification
+    ...    Test objective: The objective is to test that the POST request triggers Performance Information Available Notification.
+    ...    Pre-conditions: A VNF performance job is created, and a subscription for performance information available notification is available in the VNFM.
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Performance Information Available Notification
+    Check HTTP Response Status Code Is    204
+    
+Threshold Crossed Notification
+    [Documentation]    Test ID: 7.3.4.10.2
+    ...    Test title: Threshold Crossed Notification
+    ...    Test objective: The objective is to test that the POST request triggers Threshold Crossed Notification
+    ...    Pre-conditions: A VNF performance job is created, and a subscription for threshold crossed notification is available in the VNFM.
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Threshold Crossed Notification
+    Check HTTP Response Status Code Is    204
+    
+*** Keywords ***
+Check resource existence and get CallbackUri
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
+    Integer    response status    200
+    Validate Json    response body    PmJob.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+    
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}
+    ${status}=    Convert To Integer    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${status} 
+    Log    Status code validated
+
+Post Performance Information Available Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${body} =    Get File    jsons/PerformanceInformationAvailableNotification.json
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+
+Post Threshold Crossed Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${body} =    Get File    jsons/ThresholdCrossedNotification.json
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
\ No newline at end of file
diff --git a/SOL003/VNFPerformanceManagement-API/environment/variables.txt b/SOL003/VNFPerformanceManagement-API/environment/variables.txt
index 6eaca448f..f61232c97 100644
--- a/SOL003/VNFPerformanceManagement-API/environment/variables.txt
+++ b/SOL003/VNFPerformanceManagement-API/environment/variables.txt
@@ -63,4 +63,6 @@ ${erroneousReportId}    erroneousReportId
 ${newReportId}    newReportId
 
 ${FILTER_OK}      objectInstanceId=${objectInstanceIds}
-${FILTER_KO}      criterias=erroneousFilter
\ No newline at end of file
+${FILTER_KO}      criterias=erroneousFilter
+
+${callbackResp}    localhost
\ No newline at end of file
-- 
GitLab


From 2ff1443d26c2a26ea6c68c9239e2717afda90d64 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Fri, 6 Nov 2020 14:35:58 +0500
Subject: [PATCH 144/322] New Resource NotificationConsumer added

---
 .../NotificationConsumer.robot                | 94 +++++++++++++++++++
 .../environment/variables.txt                 |  4 +-
 .../jsons/AlarmClearedNotification.json       | 12 +++
 .../jsons/AlarmListRebuiltNotification.json   | 10 ++
 .../jsons/AlarmNotification.json              | 13 +++
 5 files changed, 132 insertions(+), 1 deletion(-)
 create mode 100644 SOL003/VNFFaultManagement-API/NotificationConsumer.robot
 create mode 100644 SOL003/VNFFaultManagement-API/jsons/AlarmClearedNotification.json
 create mode 100644 SOL003/VNFFaultManagement-API/jsons/AlarmListRebuiltNotification.json
 create mode 100644 SOL003/VNFFaultManagement-API/jsons/AlarmNotification.json

diff --git a/SOL003/VNFFaultManagement-API/NotificationConsumer.robot b/SOL003/VNFFaultManagement-API/NotificationConsumer.robot
new file mode 100644
index 000000000..b8cb18b90
--- /dev/null
+++ b/SOL003/VNFFaultManagement-API/NotificationConsumer.robot
@@ -0,0 +1,94 @@
+*** Settings ***
+Library    String
+Library    OperatingSystem
+Resource    environment/variables.txt
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}        ssl_verify=false
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+VNF Fault Alarm Notification
+    [Documentation]    Test ID: 7.3.5.7.1
+    ...    Test title: VNF Fault Alarm Notification
+    ...    Test objective: The objective is to test that the POST request triggers VNF Fault Alarm Notification.
+    ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm notifications is available in the VNFM.
+    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Alarm Notification
+    Check HTTP Response Status Code Is    204
+    
+VNF Fault Alarm Cleared Notification
+    [Documentation]    Test ID: 7.3.5.7.2
+    ...    Test title: VNF Fault Alarm Cleared Notification
+    ...    Test objective: The objective is to test that the POST request triggers VNF Fault Alarm Cleared Notification.
+    ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm cleared notifications is available in the VNFM.
+    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Alarm Cleared Notification
+    Check HTTP Response Status Code Is    204
+    
+VNF Fault Alarm List Reulit Notification
+    [Documentation]    Test ID: 7.3.5.7.3
+    ...    Test title: VNF Fault Alarm List Rebuilt Notification
+    ...    Test objective: The objective is to test that the POST request triggers VNF Fault Alarm List Rebuilt Notification.
+    ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm list rebuilt notifications is available in the VNFM.
+    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Alarm List Rebuilt Notification
+    Check HTTP Response Status Code Is    204
+    
+*** Keywords ***
+Check resource existence and get CallbackUri
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    Integer    response status    200
+    Validate Json    response body    FmSubscriptions.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}
+    Log    Validate Status code    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated
+    
+Post Alarm Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/AlarmNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}      
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+
+Post Alarm Cleared Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/AlarmClearedNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}   alarmId=${alarmId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	
+Post Alarm List Rebuilt Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/AlarmListRebuiltNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
\ No newline at end of file
diff --git a/SOL003/VNFFaultManagement-API/environment/variables.txt b/SOL003/VNFFaultManagement-API/environment/variables.txt
index f34b4ec6a..5908e8e4a 100644
--- a/SOL003/VNFFaultManagement-API/environment/variables.txt
+++ b/SOL003/VNFFaultManagement-API/environment/variables.txt
@@ -54,4 +54,6 @@ ${fields}         criteria,objectInstanceIds
 ${callback_uri}  http://127.0.0.1
 ${callback_endpoint}    /subscribe
 
-${vnfdIds}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
\ No newline at end of file
+${vnfdIds}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
+
+${callbackResp}    localhost
\ No newline at end of file
diff --git a/SOL003/VNFFaultManagement-API/jsons/AlarmClearedNotification.json b/SOL003/VNFFaultManagement-API/jsons/AlarmClearedNotification.json
new file mode 100644
index 000000000..f8a50fb3b
--- /dev/null
+++ b/SOL003/VNFFaultManagement-API/jsons/AlarmClearedNotification.json
@@ -0,0 +1,12 @@
+{{
+	"id":"",
+	"notificationType":"AlarmClearedNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"alarmId":"{alarmId}",
+	"alarmCleareTime":"",
+	"_links":{{
+		"subscription":"",
+		"alarm":""
+	}}
+}}
diff --git a/SOL003/VNFFaultManagement-API/jsons/AlarmListRebuiltNotification.json b/SOL003/VNFFaultManagement-API/jsons/AlarmListRebuiltNotification.json
new file mode 100644
index 000000000..8ba773077
--- /dev/null
+++ b/SOL003/VNFFaultManagement-API/jsons/AlarmListRebuiltNotification.json
@@ -0,0 +1,10 @@
+{{
+	"id":"",
+	"notificationType":"AlarmListRebuiltNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"_links":{{
+		"subscription":"",
+		"alarms":""
+	}}
+}}
diff --git a/SOL003/VNFFaultManagement-API/jsons/AlarmNotification.json b/SOL003/VNFFaultManagement-API/jsons/AlarmNotification.json
new file mode 100644
index 000000000..2a8e86425
--- /dev/null
+++ b/SOL003/VNFFaultManagement-API/jsons/AlarmNotification.json
@@ -0,0 +1,13 @@
+{{
+	"id":"",
+	"notificationType":"AlarmNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"alarm":{{
+		"id":"",
+		"managedObjectId":""
+	}},
+	"_links":{{
+		"subscription":""
+	}}
+}}
-- 
GitLab


From 81c1a51fcf84199c64587b8d77c79b55acc069f0 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Fri, 6 Nov 2020 15:28:48 +0500
Subject: [PATCH 145/322] New Resource NotificationConsumer added

---
 SOL003/VNFIndicator-API/environment/variables.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/SOL003/VNFIndicator-API/environment/variables.txt b/SOL003/VNFIndicator-API/environment/variables.txt
index 9fb63250b..5d4253fc2 100644
--- a/SOL003/VNFIndicator-API/environment/variables.txt
+++ b/SOL003/VNFIndicator-API/environment/variables.txt
@@ -60,4 +60,6 @@ ${NEG_FIELDS}     wrongName=any_value
 
 
 ${SEPERATOR}      =
-${VAR_SEPERATOR}    &
\ No newline at end of file
+${VAR_SEPERATOR}    &
+
+${callbackResp}    localhost
\ No newline at end of file
-- 
GitLab


From 62bd77e76b7d876270cde52a4cc2cef968aecb2b Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Fri, 6 Nov 2020 15:33:20 +0500
Subject: [PATCH 146/322] files added

---
 .../NotificationConsumer.robot                | 46 +++++++++++++++++++
 .../VnfIndicatorValueChangeNotification.json  | 13 ++++++
 2 files changed, 59 insertions(+)
 create mode 100644 SOL003/VNFIndicator-API/NotificationConsumer.robot
 create mode 100644 SOL003/VNFIndicator-API/jsons/VnfIndicatorValueChangeNotification.json

diff --git a/SOL003/VNFIndicator-API/NotificationConsumer.robot b/SOL003/VNFIndicator-API/NotificationConsumer.robot
new file mode 100644
index 000000000..fff07559f
--- /dev/null
+++ b/SOL003/VNFIndicator-API/NotificationConsumer.robot
@@ -0,0 +1,46 @@
+*** Settings ***
+Library    String
+Library    JSONSchemaLibrary    schemas/
+Resource   environment/variables.txt
+Library    OperatingSystem
+Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+VNF Indicator Value Change Notification
+    [Documentation]    Test ID: 7.3.6.7.1
+    ...    Test title: VNF Indicator Value Change Notification
+    ...    Test objective: The objective is to test that the POST request triggers VNF Indicator Value Change Notification.
+    ...    Pre-conditions: A VNF is instantiated, and a subscription for indicator value change notifications is available in the VNFM.
+    ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF Indicator Value Change Notification
+    Check HTTP Response Status Code Is    204
+    
+*** Keywords ***
+Check resource existence and get CallbackUri
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    Integer    response status    200
+    Validate Json    response body    VnfIndicatorSubscription.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+    
+Post VNF Indicator Value Change Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/VnfIndicatorValueChangeNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    indicatorId=indicatorId    vnfInstanceId=${vnfInstanceId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
diff --git a/SOL003/VNFIndicator-API/jsons/VnfIndicatorValueChangeNotification.json b/SOL003/VNFIndicator-API/jsons/VnfIndicatorValueChangeNotification.json
new file mode 100644
index 000000000..c6dd2a1cc
--- /dev/null
+++ b/SOL003/VNFIndicator-API/jsons/VnfIndicatorValueChangeNotification.json
@@ -0,0 +1,13 @@
+{{
+	"id":"",
+	"notificationType":"VnfIndicatorValueChangeNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"vnfIndicatorId":"{indicatorId} ",
+	"value":"",
+	"vnfInstanceId":"{vnfInstanceId}",
+	"_links":{{
+		"vnfInstance":"",
+		"subscription":""
+	}}
+}}
-- 
GitLab


From 96e741ac8a44b6cf769ebe7752107f6dbef70c17 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Fri, 6 Nov 2020 15:51:49 +0500
Subject: [PATCH 147/322] New Resource NotificationConsumer added

---
 .../NotificationConsumer.robot                | 70 +++++++++++++++++++
 .../environment/variables.txt                 |  2 +
 .../jsons/VnfPackageChangeNotification.json   | 10 +++
 .../VnfPackageOnboardingNotification.json     |  9 +++
 4 files changed, 91 insertions(+)
 create mode 100644 SOL003/VNFPackageManagement-API/NotificationConsumer.robot
 create mode 100644 SOL003/VNFPackageManagement-API/jsons/VnfPackageChangeNotification.json
 create mode 100644 SOL003/VNFPackageManagement-API/jsons/VnfPackageOnboardingNotification.json

diff --git a/SOL003/VNFPackageManagement-API/NotificationConsumer.robot b/SOL003/VNFPackageManagement-API/NotificationConsumer.robot
new file mode 100644
index 000000000..b61fe1315
--- /dev/null
+++ b/SOL003/VNFPackageManagement-API/NotificationConsumer.robot
@@ -0,0 +1,70 @@
+*** Settings ***
+Library    String
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt
+Library           OperatingSystem
+Library           JSONLibrary
+Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+VNF Package Onboarding Notification
+    [Documentation]    Test ID: 7.3.3.12.1
+    ...    Test title: VNF Package Onboarding Notification
+    ...    Test objective: The objective is to test that the POST request triggers VNF Package Onboarding notification.
+    ...    Pre-conditions: A VNF package subscription for onboarding notifications is available in the NFVO.
+    ...    Reference: Clause 10.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF Package Onboarding Notification
+    Check HTTP Response Status Code Is    204
+    
+VNF Package Change Notification
+    [Documentation]    Test ID: 7.3.3.12.2
+    ...    Test title: VNF Package Change Notification
+    ...    Test objective: The objective is to test that the POST request triggers VNF Package Change notification.
+    ...    Pre-conditions: A VNF package subscription for change notifications is available in the NFVO.
+    ...    Reference: Clause 10.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF Package Change Notification
+    Check HTTP Response Status Code Is    204
+    
+*** Keywords ***
+Check resource existence and get CallbackUri
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    Integer    response status    200
+    Validate Json    response body    PkgmSubscription.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+    
+Post VNF Package Onboarding Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/VnfPackageOnboardingNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPackageId=${vnfPackageId}   vndId=${vndId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+	
+Post VNF Package Change Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/VnfPackageChangeNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPackageId=${vnfPackageId}   vndId=${vndId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/environment/variables.txt b/SOL003/VNFPackageManagement-API/environment/variables.txt
index 659a3e8e3..1bb5c34f5 100644
--- a/SOL003/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL003/VNFPackageManagement-API/environment/variables.txt
@@ -85,3 +85,5 @@ ${POS_FILTER}     vnfdId=41fdd38a-3d4c-465c-83e0-f80e014425f8 ,vnfProvider=NXW
 ${NEG_FILTER}     nfvId=41fdd38a-3d4c-465c-83e0-f80e014425f8    # Negative case, using wrong name of field
 ${fields}         softwareImages,additionalArtifacts
 ${VAR_SEPERATOR}    &
+
+${callbackResp}    localhost
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/jsons/VnfPackageChangeNotification.json b/SOL003/VNFPackageManagement-API/jsons/VnfPackageChangeNotification.json
new file mode 100644
index 000000000..bcea9b7a0
--- /dev/null
+++ b/SOL003/VNFPackageManagement-API/jsons/VnfPackageChangeNotification.json
@@ -0,0 +1,10 @@
+{{
+	"id":"",
+	"notificationType":"VnfPackageChangeNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"vnfPkgId":"{indicatorId} ",
+	"vnfdId":"{vndId}",
+	"changeType":"PKG_DELETE",
+	"_links":""
+}}
diff --git a/SOL003/VNFPackageManagement-API/jsons/VnfPackageOnboardingNotification.json b/SOL003/VNFPackageManagement-API/jsons/VnfPackageOnboardingNotification.json
new file mode 100644
index 000000000..f9b87c055
--- /dev/null
+++ b/SOL003/VNFPackageManagement-API/jsons/VnfPackageOnboardingNotification.json
@@ -0,0 +1,9 @@
+{{
+	"id":"",
+	"notificationType":"VnfPackageOnboardingNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"vnfPkgId":"{indicatorId} ",
+	"vnfdId":"{vndId}",
+	"_links":""
+}}
-- 
GitLab


From 49b652269a77bd5d7ac62ac25c95d54c99a4d081 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Fri, 6 Nov 2020 15:52:53 +0500
Subject: [PATCH 148/322] fix added

---
 SOL003/VNFIndicator-API/NotificationConsumer.robot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SOL003/VNFIndicator-API/NotificationConsumer.robot b/SOL003/VNFIndicator-API/NotificationConsumer.robot
index fff07559f..3fccae93e 100644
--- a/SOL003/VNFIndicator-API/NotificationConsumer.robot
+++ b/SOL003/VNFIndicator-API/NotificationConsumer.robot
@@ -40,7 +40,7 @@ Post VNF Indicator Value Change Notification
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template} =    Get File    jsons/VnfIndicatorValueChangeNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    indicatorId=indicatorId    vnfInstanceId=${vnfInstanceId}   
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    indicatorId=${indicatorId}    vnfInstanceId=${vnfInstanceId}   
     Post    ${callbackResp}    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
-- 
GitLab


From 04d7f1750f4697dc6512dea7c6631c721c92224f Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Mon, 9 Nov 2020 11:10:38 +0500
Subject: [PATCH 149/322] New Resource NotificationConsumer added

---
 .../NotificationConsumer.robot                | 47 +++++++++++++++++++
 .../environment/variables.txt                 |  4 +-
 .../jsons/VrQuotaAvailNotification.json       |  9 ++++
 3 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationConsumer.robot
 create mode 100644 SOL003/VirtualisedResourcesQuotaAvailableNotification-API/jsons/VrQuotaAvailNotification.json

diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationConsumer.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationConsumer.robot
new file mode 100644
index 000000000..47465a390
--- /dev/null
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationConsumer.robot
@@ -0,0 +1,47 @@
+*** Settings ***
+Library    String
+Resource    environment/variables.txt
+Library    OperatingSystem
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+Vr Quota Availibility Notification
+    [Documentation]    Test ID: 7.3.7.4.1
+    ...    Test title: Vr Quota Availibility Notification
+    ...    Test objective: The objective is to test that Vr Quota Availibility Notification is delivered with success to the notification consumer
+    ...    Pre-conditions: The VNF has subscribed to the Vr Quota Availibility resource
+    ...    Reference: Clause 11.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions:  none
+    Post Vr Quota Avail Notification
+    Check HTTP Response Status Code Is    204
+    
+*** Keywords ***
+Check resource existence and get CallbackUri
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    Integer    response status    200
+    Validate Json    response body    VrQuotaAvailSubscription.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+    
+Post Vr Quota Avail Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/VrQuotaAvailNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
\ No newline at end of file
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt
index 7e9f441fc..742e6b3b6 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt
@@ -27,4 +27,6 @@ ${apiMajorVersion}     v1
 ${VrQuotaAvailNotification}    {}
 ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
 
-${response}    {}
\ No newline at end of file
+${response}    {}
+
+${callbackResp}    127.0.0.1
\ No newline at end of file
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/jsons/VrQuotaAvailNotification.json b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/jsons/VrQuotaAvailNotification.json
new file mode 100644
index 000000000..e24fb8108
--- /dev/null
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/jsons/VrQuotaAvailNotification.json
@@ -0,0 +1,9 @@
+ 
+{{
+	"id":"",
+	"notificationType":"VrQuotaAvailNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"resourceGroupId":"",
+	"_links":""
+}}
\ No newline at end of file
-- 
GitLab


From 58ec3e6ad98d9c320a6100010cde837765136262 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Mon, 9 Nov 2020 11:17:15 +0500
Subject: [PATCH 150/322] TD's conflict resoved

---
 SOL005/NSDManagement-API/NSD.robot            | 24 +++++++++----------
 .../NSDArchiveManifest.robot                  | 14 +++++------
 SOL005/NSDManagement-API/PNFD.robot           | 24 +++++++++----------
 .../PNFDArchiveManifest.robot                 | 14 +++++------
 4 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/SOL005/NSDManagement-API/NSD.robot b/SOL005/NSDManagement-API/NSD.robot
index 7e4041b76..2b8d3708f 100644
--- a/SOL005/NSDManagement-API/NSD.robot
+++ b/SOL005/NSDManagement-API/NSD.robot
@@ -8,7 +8,7 @@ Library           OperatingSystem
 
 *** Test Cases ***
 Get single file NSD in Plain Format
-    [Documentation]    Test ID: 5.3.1.10.1
+    [Documentation]    Test ID: 5.3.1.11.1
     ...    Test title: Get single file NSD in Plain Format
     ...    Test objective: The objective is to test the retrieval of the NSD in plain format within a NSD archive and perform a validation that returned content is in plain format
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
@@ -21,7 +21,7 @@ Get single file NSD in Plain Format
     Check HTTP Response Header Content-Type Is    text/plain
 
 Get NSD in Zip Format
-    [Documentation]    Test ID: 5.3.1.10.2
+    [Documentation]    Test ID: 5.3.1.11.2
     ...    Test title: Get NSD in Zip Format
     ...    Test objective: The objective is to test the retrieval of the NSD in zip format within a NSD archive and perform a validation that returned content is in zip format
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
@@ -34,7 +34,7 @@ Get NSD in Zip Format
     Check HTTP Response Header Content-Type Is    application/zip
 
 Get single file NSD in Plain or Zip Format 
-    [Documentation]    Test ID: 5.3.1.10.3
+    [Documentation]    Test ID: 5.3.1.11.3
     ...    Test title: Get single file NSDin Plain or Zip Format
     ...    Test objective: The objective is to test the retrieval of the single file NSD within a NSD archive when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that response is in Plain or Zip format
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
@@ -47,7 +47,7 @@ Get single file NSD in Plain or Zip Format
     Check HTTP Response Header Content-Type Is Any of   text/plain    application/zip
     
 Get multi file NSD in Plain or Zip Format
-    [Documentation]    Test ID: 5.3.1.10.4
+    [Documentation]    Test ID: 5.3.1.11.4
     ...    Test title: Get multi file NSD in Plain or Zip Format
     ...    Test objective: The objective is to test the retrieval of the multi file NSD within a NSD archive when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that returned content is in Zip format
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
@@ -60,7 +60,7 @@ Get multi file NSD in Plain or Zip Format
     Check HTTP Response Header Content-Type Is    application/zip
 
 Get multi file NSD in Plain Format
-    [Documentation]    Test ID: 5.3.1.10.5
+    [Documentation]    Test ID: 5.3.1.11.5
     ...    Test title: Get multi file NSD in Plain Format
     ...    Test objective: The objective is to test that the retrieval of the multi file NSD within a NSD archive fails when requesting it in Plain format, and perform a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
@@ -73,7 +73,7 @@ Get multi file NSD in Plain Format
     Check HTTP Response Body Json Schema Is   ProblemDetails
 
 Get NSD Content with invalid resource identifier
-    [Documentation]    Test ID: 5.3.1.10.6
+    [Documentation]    Test ID: 5.3.1.11.6
     ...    Test title: Get NSD Content with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of the NSD within a NSD archive fails when using an invalid resource identifier
     ...    Pre-conditions: none
@@ -86,7 +86,7 @@ Get NSD Content with invalid resource identifier
     Check HTTP Response Body Json Schema Is   ProblemDetails
 
 Get NSD with conflict due to onboarding state
-    [Documentation]    Test ID: 5.3.1.10.7
+    [Documentation]    Test ID: 5.3.1.11.7
     ...    Test title: Get NSD with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of the NSD within a NSD archive fails due to a conflict when the NSD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the NSD is different from ONBOARDED.
@@ -99,7 +99,7 @@ Get NSD with conflict due to onboarding state
     Check HTTP Response Body Json Schema Is   ProblemDetails    
     
 Get NSD with security information
-    [Documentation]    Test ID: 5.3.1.10.8
+    [Documentation]    Test ID: 5.3.1.11.8
     ...    Test title: Get NSD with security information
     ...    Test objective: The objective is to test the retrieval of the NSD within a NSD archive shall include in the ZIP archive the security information when requested with "include_signature" parameter
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
@@ -112,7 +112,7 @@ Get NSD with security information
     Check HTTP Response Header Content-Type Is    application/zip          
 
 POST NSD - Method not implemented
-    [Documentation]    Test ID: 5.3.1.10.9
+    [Documentation]    Test ID: 5.3.1.11.9
     ...    Test title: POST NSD - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new Network Service Descriptor
     ...    Pre-conditions: none
@@ -124,7 +124,7 @@ POST NSD - Method not implemented
     Check HTTP Response Status Code Is    405
     
 PUT NSD - Method not implemented
-    [Documentation]    Test ID: 5.3.1.10.10
+    [Documentation]    Test ID: 5.3.1.11.10
     ...    Test title: PUT NSD - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor
     ...    Pre-conditions: none
@@ -136,7 +136,7 @@ PUT NSD - Method not implemented
     Check HTTP Response Status Code Is    405
 
 PATCH NSD - Method not implemented
-    [Documentation]    Test ID: 5.3.1.10.11
+    [Documentation]    Test ID: 5.3.1.11.11
     ...    Test title: PATCH NSD - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor
     ...    Pre-conditions: none
@@ -148,7 +148,7 @@ PATCH NSD - Method not implemented
     Check HTTP Response Status Code Is    405
 
 DELETE NSD - Method not implemented
-    [Documentation]    Test ID: 5.3.1.10.12
+    [Documentation]    Test ID: 5.3.1.11.12
     ...    Test title: DELETE NSD - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete Network Service Descriptor
     ...    Pre-conditions: none
diff --git a/SOL005/NSDManagement-API/NSDArchiveManifest.robot b/SOL005/NSDManagement-API/NSDArchiveManifest.robot
index e28a30b3b..cc759e25a 100644
--- a/SOL005/NSDManagement-API/NSDArchiveManifest.robot
+++ b/SOL005/NSDManagement-API/NSDArchiveManifest.robot
@@ -8,7 +8,7 @@ Library           OperatingSystem
 
 *** Test Cases ***
 Get NSD Archive Manifest
-    [Documentation]    Test ID: 5.3.1.11.1
+    [Documentation]    Test ID: 5.3.1.12.1
     ...    Test title: Get NSD Archive Manifest
     ...    Test objective: The objective is to test that GET method reads the content of the manifest file within an NSD archive
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
@@ -21,7 +21,7 @@ Get NSD Archive Manifest
     Check HTTP Response Header Content-Type Is    text/plain
     
 Get NSD Archive Manifest with security information
-    [Documentation]    Test ID: 5.3.1.11.2
+    [Documentation]    Test ID: 5.3.1.12.2
     ...    Test title: Get NSD Archive Manifest with security information
     ...    Test objective: The objective is to test the retrieval of content of the manifest file within an NSD archive shall include in the ZIP archive the security information when requested with "include_signature" parameter
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
@@ -34,7 +34,7 @@ Get NSD Archive Manifest with security information
     Check HTTP Response Header Content-Type Is    application/zip
     
 Get NSD Archive Manifest with conflict due to onboarding state
-    [Documentation]    Test ID: 5.3.1.11.3
+    [Documentation]    Test ID: 5.3.1.12.3
     ...    Test title: Get NSD Archive Manifest with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of content of the manifest file within an NSD archive fails due to a conflict when the NSD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the NSD is different from ONBOARDED.
@@ -47,7 +47,7 @@ Get NSD Archive Manifest with conflict due to onboarding state
     Check HTTP Response Body Json Schema Is   ProblemDetails  
     
 POST NSD Archive Manifest - Method not implemented
-    [Documentation]    Test ID: 5.3.1.11.4
+    [Documentation]    Test ID: 5.3.1.12.4
     ...    Test title: POST NSD Archive Manifest - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new Network Service Descriptor Archive Manifest
     ...    Pre-conditions: none
@@ -59,7 +59,7 @@ POST NSD Archive Manifest - Method not implemented
     Check HTTP Response Status Code Is    405
     
 PUT NSD Archive Manifest - Method not implemented
-    [Documentation]    Test ID: 5.3.1.11.5
+    [Documentation]    Test ID: 5.3.1.12.5
     ...    Test title: PUT NSD Archive Manifest - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor Archive Manifest
     ...    Pre-conditions: none
@@ -71,7 +71,7 @@ PUT NSD Archive Manifest - Method not implemented
     Check HTTP Response Status Code Is    405
 
 PATCH NSD Archive Manifest - Method not implemented
-    [Documentation]    Test ID: 5.3.1.11.6
+    [Documentation]    Test ID: 5.3.1.12.6
     ...    Test title: PATCH NSD Archive Manifest - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor Archive Manifest
     ...    Pre-conditions: none
@@ -83,7 +83,7 @@ PATCH NSD Archive Manifest - Method not implemented
     Check HTTP Response Status Code Is    405
 
 DELETE NSD Archive Manifest - Method not implemented
-    [Documentation]    Test ID: 5.3.1.11.7
+    [Documentation]    Test ID: 5.3.1.12.7
     ...    Test title: DELETE NSD Archive Manifest - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete Network Service Descriptor Archive Manifest
     ...    Pre-conditions: none
diff --git a/SOL005/NSDManagement-API/PNFD.robot b/SOL005/NSDManagement-API/PNFD.robot
index a6fb7b6c8..342fefbcd 100644
--- a/SOL005/NSDManagement-API/PNFD.robot
+++ b/SOL005/NSDManagement-API/PNFD.robot
@@ -9,7 +9,7 @@ Library           OperatingSystem
 
 *** Test Cases ***
 Get single file PNFD in Plain Format
-    [Documentation]    Test ID: 5.3.1.12.1
+    [Documentation]    Test ID: 5.3.1.13.1
     ...    Test title: Get single file PNFD in Plain Format
     ...    Test objective: The objective is to test the retrieval of the PNFD in plain format within a PNFD archive and perform a validation that returned content is in plain format
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
@@ -22,7 +22,7 @@ Get single file PNFD in Plain Format
     Check HTTP Response Header Content-Type Is    text/plain
 
 Get PNFD in Zip Format
-    [Documentation]    Test ID: 5.3.1.12.2
+    [Documentation]    Test ID: 5.3.1.13.2
     ...    Test title: Get PNFD in Zip Format
     ...    Test objective: The objective is to test the retrieval of the PNFD in zip format within a PNFD archive and perform a validation that returned content is in zip format
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
@@ -35,7 +35,7 @@ Get PNFD in Zip Format
     Check HTTP Response Header Content-Type Is    application/zip
 
 Get single file PNFD in Plain or Zip Format 
-    [Documentation]    Test ID: 5.3.1.12.3
+    [Documentation]    Test ID: 5.3.1.13.3
     ...    Test title: Get single file PNFDin Plain or Zip Format
     ...    Test objective: The objective is to test the retrieval of the single file PNFD within a PNFD archive when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that response is in Plain or Zip format
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
@@ -48,7 +48,7 @@ Get single file PNFD in Plain or Zip Format
     Check HTTP Response Header Content-Type Is Any of   text/plain    application/zip
     
 Get multi file PNFD in Plain or Zip Format
-    [Documentation]    Test ID: 5.3.1.12.4
+    [Documentation]    Test ID: 5.3.1.13.4
     ...    Test title: Get multi file PNFD in Plain or Zip Format
     ...    Test objective: The objective is to test the retrieval of the multi file PNFD within a PNFD archive when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that returned content is in Zip format
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
@@ -61,7 +61,7 @@ Get multi file PNFD in Plain or Zip Format
     Check HTTP Response Header Content-Type Is    application/zip
 
 Get multi file PNFD in Plain Format
-    [Documentation]    Test ID: 5.3.1.12.5
+    [Documentation]    Test ID: 5.3.1.13.5
     ...    Test title: Get multi file PNFD in Plain Format
     ...    Test objective: The objective is to test that the retrieval of the multi file PNFD within a PNFD archive fails when requesting it in Plain format, and perform a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
@@ -74,7 +74,7 @@ Get multi file PNFD in Plain Format
     Check HTTP Response Body Json Schema Is   ProblemDetails
 
 Get PNFD Content with invalid resource identifier
-    [Documentation]    Test ID: 5.3.1.12.6
+    [Documentation]    Test ID: 5.3.1.13.6
     ...    Test title: Get PNFD Content with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of the PNFD within a PNFD archive fails when using an invalid resource identifier
     ...    Pre-conditions: none
@@ -87,7 +87,7 @@ Get PNFD Content with invalid resource identifier
     Check HTTP Response Body Json Schema Is   ProblemDetails
 
 Get PNFD with conflict due to onboarding state
-    [Documentation]    Test ID: 5.3.1.12.7
+    [Documentation]    Test ID: 5.3.1.13.7
     ...    Test title: Get PNFD with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of the PNFD within a PNFD archive fails due to a conflict when the PNFD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the PNFD is different from ONBOARDED.
@@ -100,7 +100,7 @@ Get PNFD with conflict due to onboarding state
     Check HTTP Response Body Json Schema Is   ProblemDetails    
     
 Get PNFD with security information
-    [Documentation]    Test ID: 5.3.1.12.8
+    [Documentation]    Test ID: 5.3.1.13.8
     ...    Test title: Get PNFD with security information
     ...    Test objective: The objective is to test the retrieval of the PNFD within a PNFD archive shall include in the ZIP archive the security information when requested with "include_signature" parameter
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
@@ -113,7 +113,7 @@ Get PNFD with security information
     Check HTTP Response Header Content-Type Is    application/zip   
     
 POST PNFD - Method not implemented
-    [Documentation]    Test ID: 5.3.1.12.9
+    [Documentation]    Test ID: 5.3.1.13.9
     ...    Test title: POST PNFD - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new PNFD
     ...    Pre-conditions: none
@@ -125,7 +125,7 @@ POST PNFD - Method not implemented
     Check HTTP Response Status Code Is    405
     
 PUT PNFD - Method not implemented
-    [Documentation]    Test ID: 5.3.1.12.10
+    [Documentation]    Test ID: 5.3.1.13.10
     ...    Test title: PUT PNFD - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update PNFD
     ...    Pre-conditions: none
@@ -137,7 +137,7 @@ PUT PNFD - Method not implemented
     Check HTTP Response Status Code Is    405
 
 PATCH PNFD - Method not implemented
-    [Documentation]    Test ID: 5.3.1.12.11
+    [Documentation]    Test ID: 5.3.1.13.11
     ...    Test title: PATCH PNFD - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update PNFD
     ...    Pre-conditions: none
@@ -149,7 +149,7 @@ PATCH PNFD - Method not implemented
     Check HTTP Response Status Code Is    405
 
 DELETE PNFD - Method not implemented
-    [Documentation]    Test ID: 5.3.1.12.12
+    [Documentation]    Test ID: 5.3.1.13.12
     ...    Test title: DELETE PNFD - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete PNFD
     ...    Pre-conditions: none
diff --git a/SOL005/NSDManagement-API/PNFDArchiveManifest.robot b/SOL005/NSDManagement-API/PNFDArchiveManifest.robot
index 876c862c2..a2adf90a4 100644
--- a/SOL005/NSDManagement-API/PNFDArchiveManifest.robot
+++ b/SOL005/NSDManagement-API/PNFDArchiveManifest.robot
@@ -8,7 +8,7 @@ Library           OperatingSystem
 
 *** Test Cases ***
 Get PNFD Archive Manifest
-    [Documentation]    Test ID: 5.3.1.13.1
+    [Documentation]    Test ID: 5.3.1.14.1
     ...    Test title: Get PNFD Archive Manifest
     ...    Test objective: The objective is to test that GET method reads the content of the manifest file within an PNFD archive
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
@@ -21,7 +21,7 @@ Get PNFD Archive Manifest
     Check HTTP Response Header Content-Type Is    text/plain
     
 Get PNFD Archive Manifest with security information
-    [Documentation]    Test ID: 5.3.1.13.2
+    [Documentation]    Test ID: 5.3.1.14.2
     ...    Test title: Get PNFD Archive Manifest with security information
     ...    Test objective: The objective is to test the retrieval of content of the manifest file within an PNFD archive shall include in the ZIP archive the security information when requested with "include_signature" parameter
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
@@ -34,7 +34,7 @@ Get PNFD Archive Manifest with security information
     Check HTTP Response Header Content-Type Is    application/zip
     
 Get PNFD Archive Manifest with conflict due to onboarding state
-    [Documentation]    Test ID: 5.3.1.13.3
+    [Documentation]    Test ID: 5.3.1.14.3
     ...    Test title: Get PNFD Archive Manifest with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of content of the manifest file within an PNFD archive fails due to a conflict when the PNFD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the PNFD is different from ONBOARDED.
@@ -47,7 +47,7 @@ Get PNFD Archive Manifest with conflict due to onboarding state
     Check HTTP Response Body Json Schema Is   ProblemDetails  
     
 POST PNFD Archive Manifest - Method not implemented
-    [Documentation]    Test ID: 5.3.1.13.4
+    [Documentation]    Test ID: 5.3.1.14.4
     ...    Test title: POST PNFD Archive Manifest - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new Network Service Descriptor Archive Manifest
     ...    Pre-conditions: none
@@ -59,7 +59,7 @@ POST PNFD Archive Manifest - Method not implemented
     Check HTTP Response Status Code Is    405
     
 PUT PNFD Archive Manifest - Method not implemented
-    [Documentation]    Test ID: 5.3.1.13.5
+    [Documentation]    Test ID: 5.3.1.14.5
     ...    Test title: PUT PNFD Archive Manifest - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor Archive Manifest
     ...    Pre-conditions: none
@@ -71,7 +71,7 @@ PUT PNFD Archive Manifest - Method not implemented
     Check HTTP Response Status Code Is    405
 
 PATCH PNFD Archive Manifest - Method not implemented
-    [Documentation]    Test ID: 5.3.1.13.6
+    [Documentation]    Test ID: 5.3.1.14.6
     ...    Test title: PATCH PNFD Archive Manifest - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor Archive Manifest
     ...    Pre-conditions: none
@@ -83,7 +83,7 @@ PATCH PNFD Archive Manifest - Method not implemented
     Check HTTP Response Status Code Is    405
 
 DELETE PNFD Archive Manifest - Method not implemented
-    [Documentation]    Test ID: 5.3.1.13.7
+    [Documentation]    Test ID: 5.3.1.14.7
     ...    Test title: DELETE PNFD Archive Manifest - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete Network Service Descriptor Archive Manifest
     ...    Pre-conditions: none
-- 
GitLab


From ee93c12714f7d2b03058bda4db5f984282769065 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Mon, 9 Nov 2020 12:16:19 +0500
Subject: [PATCH 151/322] New Resource NotificationConsumer added

---
 .../NotificationConsumer.robot                | 185 ++++++++++++++++++
 .../environment/variables.txt                 |   2 +
 .../notifications/NsdChangeNotification.json  |  11 +-
 .../NsdDeletionNotification.json              |  10 +-
 .../NsdOnBoardingFailureNotification.json     |  10 +-
 .../NsdOnBoardingNotification.json            |  17 +-
 .../PnfdDeletionNotification.json             |  10 +-
 .../PnfdOnBoardingFailureNotification.json    |  11 +-
 .../PnfdOnBoardingNotification.json           |  10 +-
 9 files changed, 252 insertions(+), 14 deletions(-)
 create mode 100644 SOL005/NSDManagement-API/NotificationConsumer.robot

diff --git a/SOL005/NSDManagement-API/NotificationConsumer.robot b/SOL005/NSDManagement-API/NotificationConsumer.robot
new file mode 100644
index 000000000..c2be1b866
--- /dev/null
+++ b/SOL005/NSDManagement-API/NotificationConsumer.robot
@@ -0,0 +1,185 @@
+*** Settings ***
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt
+Library           OperatingSystem
+Library           JSONLibrary
+Library           String
+Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+NSD Onboarding Notification
+    [Documentation]    Test ID: 5.3.1.15.1
+    ...    Test title: NSD Onboarding Notification
+    ...    Test objective: The objective is to test that NSD Onboarding Notification is delivered with success to the notification consumer.
+    ...    Pre-conditions: A NSD management subscription for onboarding notification is available in the NFVO.
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post NSD Onboarding Notification
+    Check HTTP Response Status Code Is    204
+    
+NSD Onboarding Failure Notification
+    [Documentation]    Test ID: 5.3.1.15.2
+    ...    Test title: NSD Onboarding Failure Notification
+    ...    Test objective: The objective is to test that NSD Onboarding Failure Notification is delivered with success to the notification consumer.
+    ...    Pre-conditions: A NSD management subscription for onboarding failure notification is available in the NFVO.
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post NSD Onboarding Failure Notification
+    Check HTTP Response Status Code Is    204
+    
+NSD Change Notification
+    [Documentation]    Test ID: 5.3.1.15.3
+    ...    Test title: NSD Change Notification
+    ...    Test objective: The objective is to test that NSD Change Notification is delivered with success to the notification consumer.
+    ...    Pre-conditions: A NSD management subscription for change notification is available in the NFVO.
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post NSD Change Notification
+    Check HTTP Response Status Code Is    204
+    
+NSD Deletion Notification
+    [Documentation]    Test ID: 5.3.1.15.4
+    ...    Test title: NSD Deletion Notification
+    ...    Test objective: The objective is to test that NSD Deletion Notification is delivered with success to the notification consumer.
+    ...    Pre-conditions: A NSD management subscription for deletion notification is available in the NFVO.
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post NSD Deletion Notification
+    Check HTTP Response Status Code Is    204
+    
+Pnfd Onboarding Notification
+    [Documentation]    Test ID: 5.3.1.15.5
+    ...    Test title: Pnfd Onboarding Notification
+    ...    Test objective: The objective is to test that Pnfd Onboarding Notification is delivered with success to the notification consumer.
+    ...    Pre-conditions: A Pnfd management subscription for onboarding notification is available in the NFVO.
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Pnfd Onboarding Notification
+    Check HTTP Response Status Code Is    204
+    
+Pnfd Onboarding Failure Notification
+    [Documentation]    Test ID: 5.3.1.15.6
+    ...    Test title: Pnfd Onboarding Failure Notification
+    ...    Test objective: The objective is to test that Pnfd Onboarding Failure Notification is delivered with success to the notification consumer.
+    ...    Pre-conditions: A Pnfd management subscription for onboarding failure notification is available in the NFVO.
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Pnfd Onboarding Failure Notification
+    Check HTTP Response Status Code Is    204
+    
+Pnfd Deletion Notification
+    [Documentation]    Test ID: 5.3.1.15.7
+    ...    Test title: pnfd Deletion Notification
+    ...    Test objective: The objective is to test that Pnfd Deletion Notification is delivered with success to the notification consumer.
+    ...    Pre-conditions: A Pnfd management subscription for deletion notification is available in the NFVO.
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Pnfd Deletion Notification
+    Check HTTP Response Status Code Is    204
+    
+*** Keywords ***
+Check resource existence and get CallbackUri
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    Integer    response status    200
+    Validate Json    response body    PkgmSubscription.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+    
+Post NSD Onboarding Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/notifications/NsdOnBoardingNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsdInfoId=${nsdInfoId} 
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+
+Post NSD Onboarding Failure Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/notifications/NsdOnBoardingFailureNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsdInfoId=${nsdInfoId} 
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	
+Post NSD Change Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/notifications/NsdChangeNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsdInfoId=${nsdInfoId} 
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	
+Post NSD Deletion Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/notifications/NsdDeletionNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsdInfoId=${nsdInfoId} 
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	
+Post Pnfd Onboarding Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/notifications/PnfdOnBoardingNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    pnfdInfoId=${pnfdInfoId} 
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+
+Post Pnfd Onboarding Failure Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/notifications/PnfdOnBoardingFailureNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    pnfdInfoId=${pnfdInfoId} 
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	
+Post Pnfd Deletion Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/notifications/pnfdDeletionNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    pnfdInfoId=${pnfdInfoId} 
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/environment/variables.txt b/SOL005/NSDManagement-API/environment/variables.txt
index ad6a34beb..b837bc7c5 100644
--- a/SOL005/NSDManagement-API/environment/variables.txt
+++ b/SOL005/NSDManagement-API/environment/variables.txt
@@ -90,3 +90,5 @@ ${userDefinedDataSet}    some
 ${notifCallbackUri}     http://172.22.1.7:9091/nsd/subscriptions
 ${filter_ok}      callbackUri=${notifCallbackUri}
 ${filter_ko}      nfvId=f9f130e4-05eb-4082-a676-4c97d13a883d    # Not existant filter attribute-based
+
+${callbackResp}    127.0.0.1
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/jsons/notifications/NsdChangeNotification.json b/SOL005/NSDManagement-API/jsons/notifications/NsdChangeNotification.json
index 9e26dfeeb..349ca5465 100644
--- a/SOL005/NSDManagement-API/jsons/notifications/NsdChangeNotification.json
+++ b/SOL005/NSDManagement-API/jsons/notifications/NsdChangeNotification.json
@@ -1 +1,10 @@
-{}
\ No newline at end of file
+{{
+	"id":"",
+	"notificationType":"NsdChangeNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"nsdInfoId":"{nsdInfoId}",
+	"nsdId":"",
+	"nsdOperationalState":"ENABLED",
+	"_links":""
+}}
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/jsons/notifications/NsdDeletionNotification.json b/SOL005/NSDManagement-API/jsons/notifications/NsdDeletionNotification.json
index 9e26dfeeb..6909a5c25 100644
--- a/SOL005/NSDManagement-API/jsons/notifications/NsdDeletionNotification.json
+++ b/SOL005/NSDManagement-API/jsons/notifications/NsdDeletionNotification.json
@@ -1 +1,9 @@
-{}
\ No newline at end of file
+{{
+	"id":"",
+	"notificationType":"NsdDeletionNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"nsdInfoId":"{nsdInfoId}",
+	"nsdId":"",
+	"_links":""
+}}
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/jsons/notifications/NsdOnBoardingFailureNotification.json b/SOL005/NSDManagement-API/jsons/notifications/NsdOnBoardingFailureNotification.json
index 9e26dfeeb..80cb4e8b6 100644
--- a/SOL005/NSDManagement-API/jsons/notifications/NsdOnBoardingFailureNotification.json
+++ b/SOL005/NSDManagement-API/jsons/notifications/NsdOnBoardingFailureNotification.json
@@ -1 +1,9 @@
-{}
\ No newline at end of file
+{{
+	"id":"",
+	"notificationType":"NsdOnboardingFailureNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"nsdInfoId":"{nsdInfoId}",
+	"onboardingFailureDetails":"",
+	"_links":""
+}}
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/jsons/notifications/NsdOnBoardingNotification.json b/SOL005/NSDManagement-API/jsons/notifications/NsdOnBoardingNotification.json
index 7266cf06d..5b9b4a221 100644
--- a/SOL005/NSDManagement-API/jsons/notifications/NsdOnBoardingNotification.json
+++ b/SOL005/NSDManagement-API/jsons/notifications/NsdOnBoardingNotification.json
@@ -1,8 +1,9 @@
-{
-"_links": "",
-"id": "",
-"notificationType": "",
-"nsdId": "",
-"nsdInfoId": "",
-"timeStamp": ""
-}
+{{
+	"id":"",
+	"notificationType":"NsdOnboardingNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"nsdInfoId":"{nsdInfoId}",
+	"nsdId":"",
+	"_links":""
+}}
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/jsons/notifications/PnfdDeletionNotification.json b/SOL005/NSDManagement-API/jsons/notifications/PnfdDeletionNotification.json
index 9e26dfeeb..c357d5527 100644
--- a/SOL005/NSDManagement-API/jsons/notifications/PnfdDeletionNotification.json
+++ b/SOL005/NSDManagement-API/jsons/notifications/PnfdDeletionNotification.json
@@ -1 +1,9 @@
-{}
\ No newline at end of file
+{{
+	"id":"",
+	"notificationType":"PnfdDeletionNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"pnfdInfoId":"{pnfdInfoId}",
+	"pnfdId":"",
+	"_links":""
+}}
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/jsons/notifications/PnfdOnBoardingFailureNotification.json b/SOL005/NSDManagement-API/jsons/notifications/PnfdOnBoardingFailureNotification.json
index 9e26dfeeb..57f5fc775 100644
--- a/SOL005/NSDManagement-API/jsons/notifications/PnfdOnBoardingFailureNotification.json
+++ b/SOL005/NSDManagement-API/jsons/notifications/PnfdOnBoardingFailureNotification.json
@@ -1 +1,10 @@
-{}
\ No newline at end of file
+{{
+	"id":"",
+	"notificationType":"PnfdOnboardingFailureNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"pnfdInfoId":"{pnfdInfoId}",
+	"pnfdId":"",
+	"onboardingFailureDetails":"",
+	"_links":""
+}}
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/jsons/notifications/PnfdOnBoardingNotification.json b/SOL005/NSDManagement-API/jsons/notifications/PnfdOnBoardingNotification.json
index 9e26dfeeb..4c2fbbb8b 100644
--- a/SOL005/NSDManagement-API/jsons/notifications/PnfdOnBoardingNotification.json
+++ b/SOL005/NSDManagement-API/jsons/notifications/PnfdOnBoardingNotification.json
@@ -1 +1,9 @@
-{}
\ No newline at end of file
+{{
+	"id":"",
+	"notificationType":"PnfdOnboardingNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"pnfdInfoId":"{pnfdInfoId}",
+	"pnfdId":"",
+	"_links":""
+}}
\ No newline at end of file
-- 
GitLab


From c90050ba7a35778c2f122024a1138a1b0aff4f21 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Mon, 9 Nov 2020 12:59:55 +0500
Subject: [PATCH 152/322] New Resource NotificationConsumer added

---
 .../NotificationConsumer.robot                | 94 +++++++++++++++++++
 .../environment/variables.txt                 |  4 +-
 .../NsIdentifierCreationNotification.json     |  8 ++
 .../NsIdentifierDeletionNotification.json     |  8 ++
 .../NsLcmOperationOccurrenceNotification.json | 13 +++
 5 files changed, 126 insertions(+), 1 deletion(-)
 create mode 100644 SOL005/NSLifecycleManagement-API/NotificationConsumer.robot
 create mode 100644 SOL005/NSLifecycleManagement-API/jsons/NsIdentifierCreationNotification.json
 create mode 100644 SOL005/NSLifecycleManagement-API/jsons/NsIdentifierDeletionNotification.json
 create mode 100644 SOL005/NSLifecycleManagement-API/jsons/NsLcmOperationOccurrenceNotification.json

diff --git a/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot b/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot
new file mode 100644
index 000000000..6cc466661
--- /dev/null
+++ b/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot
@@ -0,0 +1,94 @@
+*** Settings ***
+Library    String
+Resource    environment/variables.txt   
+Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=false
+Library    OperatingSystem
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+Ns Lcm Operation Occurrence Notification
+    [Documentation]    Test ID: 5.3.2.26.1
+    ...    Test title: Ns Lcm Operation Occurrence Notification
+    ...    Test objective: The objective is to test that Ns Lcm Operation Occurrence Notification is delivered with success to the notification consumer.
+    ...    Pre-conditions: A subscription for NS LCM Operation Occurrence notifications is available in the NFVO.
+    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Ns Lcm Operation Occurrence Notification
+    Check HTTP Response Status Code Is    204
+    
+Ns Identifier Creation Notification
+    [Documentation]    Test ID: 5.3.2.26.2
+    ...    Test title: Ns Identifier Creation Notification
+    ...    Test objective: The objective is to test that Ns Identifier Creation Notification is delivered with success to the notification consumer.
+    ...    Pre-conditions: A subscription for Ns Identifier Creation notification is available in the NFVO.
+    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Ns Identifier Creation Notification
+    Check HTTP Response Status Code Is    204
+    
+Ns Identifier Deletion Notification
+    [Documentation]    Test ID: 5.3.2.26.3
+    ...    Test title: Ns Identifier Deletion Notification
+    ...    Test objective: The objective is to test that Ns Identifier Deletion Notification is delivered with success to the notification consumer.
+    ...    Pre-conditions: A subscription for Ns Identifier Deletion notification is available in the NFVO.
+    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Ns Identifier Deletion Notification
+    Check HTTP Response Status Code Is    204
+    
+*** Keywords ***
+Check resource existence and get CallbackUri
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    Integer    response status    200
+    Validate Json    response body    subscription.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+    
+Post Ns Lcm Operation Occurrence Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/NsLcmOperationOccurrenceNotification.json
+    ${body}=        Format String   ${template}    nsInstanceId=${nsInstanceId}    nsLcmOpOccId=${nsLcmOpOccId}    subscriptionId=${subscriptionId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	
+Post Ns Identifier Creation Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/NsIdentifierCreationNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsInstanceId=${nsInstanceId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	
+Post Ns Identifier Deletion Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/NsIdentifierDeletionNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsInstanceId=${nsInstanceId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
diff --git a/SOL005/NSLifecycleManagement-API/environment/variables.txt b/SOL005/NSLifecycleManagement-API/environment/variables.txt
index c9c31a4ce..02b7d79a8 100644
--- a/SOL005/NSLifecycleManagement-API/environment/variables.txt
+++ b/SOL005/NSLifecycleManagement-API/environment/variables.txt
@@ -74,4 +74,6 @@ ${Etag_modified}=    a modified etag
 
 ${NEG_FILTER}    attribute_not_exist=some_value
 ${NEG_SELECTOR}    fields=wrong_field
-${json}    {"notificationStatus": ""}
\ No newline at end of file
+${json}    {"notificationStatus": ""}
+
+${callbackResp}    127.0.0.1
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/jsons/NsIdentifierCreationNotification.json b/SOL005/NSLifecycleManagement-API/jsons/NsIdentifierCreationNotification.json
new file mode 100644
index 000000000..152d85523
--- /dev/null
+++ b/SOL005/NSLifecycleManagement-API/jsons/NsIdentifierCreationNotification.json
@@ -0,0 +1,8 @@
+{{
+	"id":"",
+	"notificationType":"NsIdentifierCreationNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"nsInstanceId":"{nsInstanceId}",
+	"_links":""
+}}
diff --git a/SOL005/NSLifecycleManagement-API/jsons/NsIdentifierDeletionNotification.json b/SOL005/NSLifecycleManagement-API/jsons/NsIdentifierDeletionNotification.json
new file mode 100644
index 000000000..320d5ee3b
--- /dev/null
+++ b/SOL005/NSLifecycleManagement-API/jsons/NsIdentifierDeletionNotification.json
@@ -0,0 +1,8 @@
+{{
+	"id":"",
+	"notificationType":"NsIdentifierDeletionNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"nsInstanceId":"{nsInstanceId}",
+	"_links":""
+}}
diff --git a/SOL005/NSLifecycleManagement-API/jsons/NsLcmOperationOccurrenceNotification.json b/SOL005/NSLifecycleManagement-API/jsons/NsLcmOperationOccurrenceNotification.json
new file mode 100644
index 000000000..d5ed27cba
--- /dev/null
+++ b/SOL005/NSLifecycleManagement-API/jsons/NsLcmOperationOccurrenceNotification.json
@@ -0,0 +1,13 @@
+{{
+	"id":"",
+	"nsInstanceId":"{nsInstanceId}",
+	"nsLcmOpOccId":"{nsLcmOpOccId}"
+	"operation":"INSTANTIATE",
+	"notificationType":"NsLcmOperationOccurrenceNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"notificationStatus":"START",
+	"operationState":"PROCESSING",
+	"isAutomaticInvocation":"True",
+	"_links":""
+}}
-- 
GitLab


From 96b2fe77215d219dd6292b334a3dec5a907162e9 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Mon, 9 Nov 2020 15:39:07 +0500
Subject: [PATCH 153/322] New Resource NotificationConsumer added

---
 .../ApiVersion.robot                          |  2 +-
 .../NotificationConsumer.robot                | 68 +++++++++++++++++++
 .../environment/variables.txt                 |  2 +
 ...manceInformationAvailableNotification.json |  4 +-
 .../jsons/ThresholdCrossedNotification.json   |  3 +-
 5 files changed, 73 insertions(+), 6 deletions(-)
 create mode 100644 SOL005/NSPerformanceManagement-API/NotificationConsumer.robot

diff --git a/SOL005/NSPerformanceManagement-API/ApiVersion.robot b/SOL005/NSPerformanceManagement-API/ApiVersion.robot
index 438bcd408..8e6fa0beb 100644
--- a/SOL005/NSPerformanceManagement-API/ApiVersion.robot
+++ b/SOL005/NSPerformanceManagement-API/ApiVersion.robot
@@ -9,7 +9,7 @@ Library    JSONSchemaLibrary    schemas/
 
 *** Test Cases ***
 POST API Version - Method not implemented
-    [Documentation]    Test ID: 5.3.4.9.1
+    [Documentation]    Test ID: 5.3.4.10.1
     ...    Test title: POST API version - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
diff --git a/SOL005/NSPerformanceManagement-API/NotificationConsumer.robot b/SOL005/NSPerformanceManagement-API/NotificationConsumer.robot
new file mode 100644
index 000000000..d4efbea11
--- /dev/null
+++ b/SOL005/NSPerformanceManagement-API/NotificationConsumer.robot
@@ -0,0 +1,68 @@
+*** Settings ***
+Library    JSONSchemaLibrary    schemas/
+Resource    environment/variables.txt
+Library    JSONLibrary
+Library    OperatingSystem
+Library    String
+Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+NS Performance Information Availability Notification
+    [Documentation]    Test ID: 5.3.4.10.1
+    ...    Test title: NS Performance Information Availability Notification
+    ...    Test objective: The objective is to test that NS Performance Information Availability Notification is delivered with success to the notification consumer
+    ...    Pre-conditions: A NS performance job is created, and information availability notifications is available in the NFVO.
+    ...    Reference: Clause 7.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post NS Performance Information Availability Notification
+    Check HTTP Response Status Code Is    204
+    
+NS Threshold Crossed Notification
+    [Documentation]    Test ID: 5.3.4.10.2
+    ...    Test title: NS Threshold Crossed Notification
+    ...    Test objective: The objective is to test that NS Threshold Crossed Notification is delivered with success to the notification consumer
+    ...    Pre-conditions: A NS performance job is created, and threshold crossed notifications is available in the NFVO.
+    ...    Reference: Clause 7.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post NS Threshold Crossed Notification
+    Check HTTP Response Status Code Is    204
+    
+*** Keywords ***
+Check resource existence and get CallbackUri
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
+    Integer    response status    200
+    Validate Json    response body    PmJob.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+    
+Post NS Performance Information Availability Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${body} =    Get File    jsons/PerformanceInformationAvailableNotification.json  
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	
+Post NS Threshold Crossed Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${body} =    Get File    jsons/ThresholdCrossedNotification.json  
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
\ No newline at end of file
diff --git a/SOL005/NSPerformanceManagement-API/environment/variables.txt b/SOL005/NSPerformanceManagement-API/environment/variables.txt
index 932a511d1..b2e1aacbd 100644
--- a/SOL005/NSPerformanceManagement-API/environment/variables.txt
+++ b/SOL005/NSPerformanceManagement-API/environment/variables.txt
@@ -64,3 +64,5 @@ ${newReportId}    newReportId
 ${FILTER_OK_Threshold}      objectInstanceId=1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
 ${FILTER_KO}      criterias=erroneousFilter
 ${SEPERATOR}      =
+
+${callbackResp}    127.0.0.1
\ No newline at end of file
diff --git a/SOL005/NSPerformanceManagement-API/jsons/PerformanceInformationAvailableNotification.json b/SOL005/NSPerformanceManagement-API/jsons/PerformanceInformationAvailableNotification.json
index cbe45fa78..675d38d77 100644
--- a/SOL005/NSPerformanceManagement-API/jsons/PerformanceInformationAvailableNotification.json
+++ b/SOL005/NSPerformanceManagement-API/jsons/PerformanceInformationAvailableNotification.json
@@ -1,13 +1,11 @@
 {
 	"id": "id",
 	"notificationType" : "PerformanceInformationAvailableNotification",
-	"subscriptionId ": "subscriptionId",
 	"timeStamp": "2012-04-21T18:25:43-05:00",
 	"objectInstanceId": "vnfID",
 	"_links": {
-			"subscription": "link to subscription",
+			"objectInstance": "link to instance",
 			"pmJob" : "link to PMJob",
 			"performanceReport": "link to PerformanceReport"
 	}
-	
 }
\ No newline at end of file
diff --git a/SOL005/NSPerformanceManagement-API/jsons/ThresholdCrossedNotification.json b/SOL005/NSPerformanceManagement-API/jsons/ThresholdCrossedNotification.json
index e2dcdec9f..a92f914d5 100644
--- a/SOL005/NSPerformanceManagement-API/jsons/ThresholdCrossedNotification.json
+++ b/SOL005/NSPerformanceManagement-API/jsons/ThresholdCrossedNotification.json
@@ -1,7 +1,6 @@
 {
 	"id": "id",
 	"notificationType": "ThresholdCrossedNotification",
-	"subscriptionId ": "subscriptionId",
 	"timeStamp": "2012-04-21T18:25:43-05:00",
 	"thresholdId": "thresholdId",
 	"crossingDirection": "UP",
@@ -9,7 +8,7 @@
 	"performanceMetric": "performanceMetric",
 	"performanceValue": 7,
 	"_links": {
-		"subscription": "link to subscription",
+		"objectInstance": "objectInstance",
 		"threshold": "link to threshold"
 	}
 
-- 
GitLab


From c7ee42cc6ffc18874d817eb16a3a642507bd7584 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 10 Nov 2020 12:14:35 +0500
Subject: [PATCH 154/322] New Resource NotificationConsumer added

---
 .../NotificationConsumer.robot                | 93 +++++++++++++++++++
 .../environment/variables.txt                 |  2 +
 .../jsons/AlarmClearedNotification.json       | 12 +++
 .../jsons/AlarmListRebuiltNotification.json   | 10 ++
 .../jsons/AlarmNotification.json              | 13 +++
 5 files changed, 130 insertions(+)
 create mode 100644 SOL005/NSFaultManagement-API/NotificationConsumer.robot
 create mode 100644 SOL005/NSFaultManagement-API/jsons/AlarmClearedNotification.json
 create mode 100644 SOL005/NSFaultManagement-API/jsons/AlarmListRebuiltNotification.json
 create mode 100644 SOL005/NSFaultManagement-API/jsons/AlarmNotification.json

diff --git a/SOL005/NSFaultManagement-API/NotificationConsumer.robot b/SOL005/NSFaultManagement-API/NotificationConsumer.robot
new file mode 100644
index 000000000..eaeb2cc10
--- /dev/null
+++ b/SOL005/NSFaultManagement-API/NotificationConsumer.robot
@@ -0,0 +1,93 @@
+*** Settings ***
+Library    String
+Library    OperatingSystem
+Resource    environment/variables.txt  
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+Library    REST     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}       ssl_verify=false
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+NS Fault Alarm Notification
+    [Documentation]    Test ID: 5.3.3.7.1
+    ...    Test title: NS Fault Alarm Notification
+    ...    Test objective: The objective is to test that NS Fault Alarm Notification is delivered with success to the notification consumer
+    ...    Pre-conditions: A NS instance is instantiated, and a subscription for fault alarm notifications is available in the NFVO.
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Alarm Notification
+    Check HTTP Response Status Code Is    204
+    
+NS Fault Alarm Cleared Notification
+    [Documentation]    Test ID: 5.3.3.7.2
+    ...    Test title: NS Fault Alarm Cleared Notification
+    ...    Test objective: The objective is to test that NS Fault Alarm Cleared Notification is delivered with success to the notification consumer
+    ...    Pre-conditions: A NS instance is instantiated, and a subscription for fault alarm cleared notifications is available in the NFVO.
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Alarm Cleared Notification
+    Check HTTP Response Status Code Is    204
+    
+NS Fault Alarm List Rebuilt Notification
+    [Documentation]    Test ID: 5.3.3.7.3
+    ...    Test title: NS Fault Alarm List Rebuilt Notification
+    ...    Test objective: The objective is to test that NS Fault Alarm List Rebuilt Notification is delivered with success to the notification consumer
+    ...    Pre-conditions: A NS instance is instantiated, and a subscription for fault alarm list rebuilt notifications is available in the NFVO.
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Alarm List Rebuilt Notification
+    Check HTTP Response Status Code Is    204
+    
+*** Keywords ***
+Check resource existence and get CallbackUri
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    Integer    response status    200
+    Validate Json    response body    FmSubscription.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+    
+Post Alarm Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/AlarmNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+
+Post Alarm Cleared Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/AlarmClearedNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    alarmId=${alarmId}
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	
+Post Alarm List Rebuilt Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/AlarmListRebuiltNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
\ No newline at end of file
diff --git a/SOL005/NSFaultManagement-API/environment/variables.txt b/SOL005/NSFaultManagement-API/environment/variables.txt
index 78e923fd0..848b78e97 100644
--- a/SOL005/NSFaultManagement-API/environment/variables.txt
+++ b/SOL005/NSFaultManagement-API/environment/variables.txt
@@ -62,3 +62,5 @@ ${polling_interval}     10 sec
 
 ${notification_request}    []
 ${notification_response}    []
+
+${callbackResp}    127.0.0.1
diff --git a/SOL005/NSFaultManagement-API/jsons/AlarmClearedNotification.json b/SOL005/NSFaultManagement-API/jsons/AlarmClearedNotification.json
new file mode 100644
index 000000000..3ac4bfcce
--- /dev/null
+++ b/SOL005/NSFaultManagement-API/jsons/AlarmClearedNotification.json
@@ -0,0 +1,12 @@
+{{
+	"id":"",
+	"notificationType":"AlarmClearedNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"alarmId":"{alarmId}",
+	"alarmClearedTime":"",
+	"_links":{{
+		"subscription":"",
+		"alarm":""
+	}}
+}}
diff --git a/SOL005/NSFaultManagement-API/jsons/AlarmListRebuiltNotification.json b/SOL005/NSFaultManagement-API/jsons/AlarmListRebuiltNotification.json
new file mode 100644
index 000000000..5babd1166
--- /dev/null
+++ b/SOL005/NSFaultManagement-API/jsons/AlarmListRebuiltNotification.json
@@ -0,0 +1,10 @@
+{{
+	"id":"",
+	"notificationType":"AlarmListRebuiltNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"_links":{{
+		"subscription":"",
+		"alarm":""
+	}}
+}}
\ No newline at end of file
diff --git a/SOL005/NSFaultManagement-API/jsons/AlarmNotification.json b/SOL005/NSFaultManagement-API/jsons/AlarmNotification.json
new file mode 100644
index 000000000..2a8e86425
--- /dev/null
+++ b/SOL005/NSFaultManagement-API/jsons/AlarmNotification.json
@@ -0,0 +1,13 @@
+{{
+	"id":"",
+	"notificationType":"AlarmNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"alarm":{{
+		"id":"",
+		"managedObjectId":""
+	}},
+	"_links":{{
+		"subscription":""
+	}}
+}}
-- 
GitLab


From 4082ae7a7d58d8d992aa1aec1b046c693b44c73a Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 10 Nov 2020 15:56:01 +0500
Subject: [PATCH 155/322] New Resource NotificationConsumer added

---
 .../NotificationConsumer.robot                | 70 +++++++++++++++++++
 .../environment/variables.txt                 |  3 +-
 .../jsons/VnfPackageChangeNotification.json   | 10 +++
 .../VnfPackageOnboardingNotification.json     | 10 +++
 4 files changed, 92 insertions(+), 1 deletion(-)
 create mode 100644 SOL005/VNFPackageManagement-API/NotificationConsumer.robot
 create mode 100644 SOL005/VNFPackageManagement-API/jsons/VnfPackageChangeNotification.json
 create mode 100644 SOL005/VNFPackageManagement-API/jsons/VnfPackageOnboardingNotification.json

diff --git a/SOL005/VNFPackageManagement-API/NotificationConsumer.robot b/SOL005/VNFPackageManagement-API/NotificationConsumer.robot
new file mode 100644
index 000000000..b32b7f822
--- /dev/null
+++ b/SOL005/VNFPackageManagement-API/NotificationConsumer.robot
@@ -0,0 +1,70 @@
+*** Settings ***
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt
+Library           OperatingSystem
+Library           JSONLibrary
+Library           String
+Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+VNF Package Onboarding Notification
+    [Documentation]    Test ID: 5.3.5.13.1
+    ...    Test title: VNF Package Onboarding Notification
+    ...    Test objective: The objective is to test that VNF Package Onboarding Notification is delivered with success to the notification consumer
+    ...    Pre-conditions: A VNF package subscription for onboarding notifications is available in the NFVO.
+    ...    Reference: Clause 9.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF Package Onboarding Notification
+    Check HTTP Response Status Code Is    204
+    
+VNF Package Change Notification
+    [Documentation]    Test ID: 5.3.5.13.2
+    ...    Test title: VNF Package Change Notification
+    ...    Test objective: The objective is to test that VNF Package Change Notification is delivered with success to the notification consumer
+    ...    Pre-conditions: A VNF package subscription for change notifications is available in the NFVO.
+    ...    Reference: Clause 9.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF Package Change Notification
+    Check HTTP Response Status Code Is    204
+
+*** Keywords ***
+Check resource existence and get CallbackUri
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    Integer    response status    200
+    Validate Json    response body    PkgmSubscription.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+    
+Post VNF Package Onboarding Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/VnfPackageOnboardingNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPkgId=${vnfPkgId}
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+
+Post VNF Package Change Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/VnfPackageChangeNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPkgId=${vnfPkgId}
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/environment/variables.txt b/SOL005/VNFPackageManagement-API/environment/variables.txt
index d24c5f559..2bd7dd7e9 100644
--- a/SOL005/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFPackageManagement-API/environment/variables.txt
@@ -83,4 +83,5 @@ ${creatingVnfPkgViaUriId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
 ${vnfPkgUri}        http://localhost/content.zip
 
 ${NFVO_non-MANO_OK}    1    # If 1 means that non-MANO artifacts are supported by the NFVO
-${non_mano_artifact_sets} 
\ No newline at end of file
+${non_mano_artifact_sets} 
+${callbackResp}    127.0.0.1
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/jsons/VnfPackageChangeNotification.json b/SOL005/VNFPackageManagement-API/jsons/VnfPackageChangeNotification.json
new file mode 100644
index 000000000..103545205
--- /dev/null
+++ b/SOL005/VNFPackageManagement-API/jsons/VnfPackageChangeNotification.json
@@ -0,0 +1,10 @@
+{{
+	"id":"",
+	"notificationType":"VnfPackageChangeNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"vnfPkgId":"{vnfPkgId}",
+	"vnfdId":"",
+	"changeType":"PKG_DELETE",
+	"_links":""
+}}
diff --git a/SOL005/VNFPackageManagement-API/jsons/VnfPackageOnboardingNotification.json b/SOL005/VNFPackageManagement-API/jsons/VnfPackageOnboardingNotification.json
new file mode 100644
index 000000000..08fdbf7cd
--- /dev/null
+++ b/SOL005/VNFPackageManagement-API/jsons/VnfPackageOnboardingNotification.json
@@ -0,0 +1,10 @@
+{{
+	"id":"",
+	"notificationType":"VnfPackageOnboardingNotification",
+	"subscriptionId":"{subscriptionId}",
+	"timeStamp":"",
+	"vnfPkgId":"{vnfPkgId}",
+	"vnfdId":"",
+	"vnfmInfo":"",
+	"_links":""
+}}
-- 
GitLab


From 28538b3a12cda2bf1ef8cc1638259e44ba49c0d1 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 11 Nov 2020 12:51:19 +0500
Subject: [PATCH 156/322] objective updated

---
 .../NotificationConsumer.robot                | 56 +++++++++++++++----
 .../VnfLcmOperationKeywords.robot             | 35 +-----------
 2 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/NotificationConsumer.robot b/SOL002/VNFLifecycleManagement-API/NotificationConsumer.robot
index e38d09f5d..2a81c1142 100644
--- a/SOL002/VNFLifecycleManagement-API/NotificationConsumer.robot
+++ b/SOL002/VNFLifecycleManagement-API/NotificationConsumer.robot
@@ -1,4 +1,5 @@
 *** Settings ***
+Library    String
 Resource    environment/variables.txt 
 Resource    VnfLcmOperationKeywords.robot
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
@@ -9,36 +10,36 @@ Suite Setup    Check resource existence and get CallbackUri
 
 *** Test Cases ***
 VNF LCM Operation Occurrence Notification
-    [Documentation]    Test ID: 6.3.5.20.1
+    [Documentation]    Test ID: 6.3.5.21.1
     ...    Test title: VNF LCM Operation Occurrence Start Notification
-    ...    Test objective:  The objective is to test that the POST request triggers VNF LCM Operation Occurrence Start Notification
+    ...    Test objective:  The objective is to test that VNF LCM Operation Occurrence Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A subscription for VNF LCM Operation Occurrence notifications is available in the VNFM.
     ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
+    ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post VNF LCM Operation Occurrence Notification
     Check HTTP Response Status Code Is    204
 
 VNF Identifier Creation Notification
-    [Documentation]    Test ID: 6.3.5.20.2
+    [Documentation]    Test ID: 6.3.5.21.2
     ...    Test title: VNF Identifier Creation Notification
-    ...    Test objective:  The objective is to test that the POST request triggers VNF Identifier Creation Notification
+    ...    Test objective:  The objective is to test that VNF Identifier Creation Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A subscription for VNF Identifier Creation Notification is available in the VNFM.
     ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
+    ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post VNF Identifier Creation Notification
     Check HTTP Response Status Code Is    204
     
 VNF Identifier Deletion Notification
-    [Documentation]    Test ID: 6.3.5.20.3
+    [Documentation]    Test ID: 6.3.5.21.3
     ...    Test title: VNF Identifier Deletion Notification
-    ...    Test objective:  The objective is to test that the POST request triggers VNF Identifier Deletion Notification
+    ...    Test objective:  The objective is to test that VNF Identifier Deletion Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A subscription for VNF Identifier Deletion Notification is available in the VNFM.
     ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
+    ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post VNF Identifier Deletion Notification
@@ -51,5 +52,38 @@ Check resource existence and get CallbackUri
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     Integer    response status    200
-    Validate Json    response body    subscription.schema.json
-    Set Global Variable    ${callbackResp}    response body callbackUri
\ No newline at end of file
+    Validate Json    response body    Subscription.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+    
+Post VNF LCM Operation Occurrence Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/VnfLcmOperationOccurrenceNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfInstanceId=${vnfInstanceId}    vnfLcmOpOccId=${vnfLcmOpOccId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+	
+Post VNF Identifier Creation Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/VnfIdentifierCreationNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfInstanceId=${vnfInstanceId}  
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+	
+Post VNF Identifier Deletion Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template} =    Get File    jsons/VnfIdentifierDeletionNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfInstanceId=${vnfInstanceId}  
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index 895957386..210784c18 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -1015,37 +1015,4 @@ Get VNF LCM Operation occurrences with exclude_fields attribute selector
     
 Check HTTP Response Header Contain Link
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
-    Should Not Be Empty    ${linkURL}
-    
-Post VNF LCM Operation Occurrence Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/VnfLcmOperationOccurrenceNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfInstanceId=${vnfInstanceId}    vnfLcmOpOccId=${vnfLcmOpOccId}   
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}	
-	
-Post VNF Identifier Creation Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/VnfIdentifierCreationNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfInstanceId=${vnfInstanceId}  
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}	
-	
-Post VNF Identifier Deletion Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/VnfIdentifierDeletionNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfInstanceId=${vnfInstanceId}  
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}	
\ No newline at end of file
+    Should Not Be Empty    ${linkURL}
\ No newline at end of file
-- 
GitLab


From c3e0ccfe1fd2b9c6458db75e90ddcb7e6c404f9c Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 11 Nov 2020 12:55:54 +0500
Subject: [PATCH 157/322] TIDs fixed in ApiVersion

---
 .../ApiVersion.robot                          | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/SOL002/VNFPerformanceManagement-API/ApiVersion.robot b/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
index 5832a7af2..2196cd1fc 100644
--- a/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
+++ b/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
@@ -7,7 +7,7 @@ Library    JSONSchemaLibrary    schemas/
 
 *** Test Cases ***
 POST API Version - Method not implemented
-    [Documentation]    Test ID: 6.3.2.7.1
+    [Documentation]    Test ID: 6.3.3.9.1
     ...    Test title: POST API version - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
@@ -19,7 +19,7 @@ POST API Version - Method not implemented
 	Check HTTP Response Status Code Is    405
     
 GET API Version
-    [Documentation]    Test ID: 6.3.2.7.2
+    [Documentation]    Test ID: 6.3.3.9.2
     ...    Test title: GET API Version
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
@@ -32,7 +32,7 @@ GET API Version
 	Check HTTP Response Body Json Schema Is    ApiVersionInformation
 
 PUT API Version - Method not implemented
-    [Documentation]    Test ID: 6.3.2.7.3
+    [Documentation]    Test ID: 6.3.3.9.3
     ...    Test title: PUT API Version - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
@@ -44,7 +44,7 @@ PUT API Version - Method not implemented
 	Check HTTP Response Status Code Is    405
 
 PATCH API Version - Method not implemented
-    [Documentation]    Test ID: 6.3.2.7.4
+    [Documentation]    Test ID: 6.3.3.9.4
     ...    Test title: PATCH API Version - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
@@ -56,7 +56,7 @@ PATCH API Version - Method not implemented
 	Check HTTP Response Status Code Is    405
     
 DELETE API Version - Method not implemented
-    [Documentation]    Test ID: 6.3.2.7.5
+    [Documentation]    Test ID: 6.3.3.9.5
     ...    Test title: DELETE API Version - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
@@ -68,7 +68,7 @@ DELETE API Version - Method not implemented
 	Check HTTP Response Status Code Is    405
 	
 POST API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 6.3.2.7.6
+    [Documentation]    Test ID: 6.3.3.9.6
     ...    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
@@ -80,7 +80,7 @@ POST API Version with apiMajorVerion - Method not implemented
 	Check HTTP Response Status Code Is    405
     
 GET API Version with apiMajorVerion
-    [Documentation]    Test ID: 6.3.2.7.7
+    [Documentation]    Test ID: 6.3.3.9.7
     ...    Test title: GET API Version with apiMajorVerion
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
@@ -93,7 +93,7 @@ GET API Version with apiMajorVerion
 	Check HTTP Response Body Json Schema Is    ApiVersionInformation
 
 PUT API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 6.3.2.7.8
+    [Documentation]    Test ID: 6.3.3.9.8
     ...    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
@@ -105,7 +105,7 @@ PUT API Version with apiMajorVerion - Method not implemented
 	Check HTTP Response Status Code Is    405
 
 PATCH API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 6.3.2.7.9
+    [Documentation]    Test ID: 6.3.3.9.9
     ...    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
@@ -117,7 +117,7 @@ PATCH API Version with apiMajorVerion - Method not implemented
 	Check HTTP Response Status Code Is    405
     
 DELETE API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 6.3.2.7.10
+    [Documentation]    Test ID: 6.3.3.9.10
     ...    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
-- 
GitLab


From 7ab89517115bb11d27a5a400f0ed73919bdc76ba Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 11 Nov 2020 12:58:45 +0500
Subject: [PATCH 158/322] objective updated

---
 .../NotificationConsumer.robot                       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/SOL002/VNFPerformanceManagement-API/NotificationConsumer.robot b/SOL002/VNFPerformanceManagement-API/NotificationConsumer.robot
index e2fae0d06..ed697e43e 100644
--- a/SOL002/VNFPerformanceManagement-API/NotificationConsumer.robot
+++ b/SOL002/VNFPerformanceManagement-API/NotificationConsumer.robot
@@ -9,24 +9,24 @@ Suite Setup    Check resource existence and get CallbackUri
 
 *** Test Cases ***
 VNF Performance Information Availability Notification
-    [Documentation]    Test ID: 6.3.3.9.1
+    [Documentation]    Test ID: 6.3.3.10.1
     ...    Test title: VNF Performance Information Availability Notification
-    ...    Test objective: The objective is to test that the POST request triggers VNF Performance Information Availability Notification
+    ...    Test objective: The objective is to test that VNF Performance Information Availability Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A VNF performance job is created, and a subscription for information availability notifications is available in the VNFM.
     ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
+    ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post VNF Performance Information Availability Notification
     Check HTTP Response Status Code Is    204
     
 VNF Threshold Crossed Notification
-    [Documentation]    Test ID: 6.3.3.9.2
+    [Documentation]    Test ID: 6.3.3.10.2
     ...    Test title: VNF Threshold Crossed Notification
-    ...    Test objective: The objective is to test that the POST request triggers VNF Threshold Crossed Notification
+    ...    Test objective: The objective is to test that VNF Threshold Crossed Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A VNF performance job is created, and a subscription for Threshold Crossed Notification is available in the VNFM.
     ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
+    ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post VNF Threshold Crossed Notification
-- 
GitLab


From e56483bb0b2da4b77296ff89b193239fe52d6aac Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 11 Nov 2020 14:54:10 +0500
Subject: [PATCH 159/322] Object and TID's updated

---
 .../NotificationConsumer.robot                 | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/SOL002/VNFFaultManagement-API/NotificationConsumer.robot b/SOL002/VNFFaultManagement-API/NotificationConsumer.robot
index ae6d726f6..039fcec98 100644
--- a/SOL002/VNFFaultManagement-API/NotificationConsumer.robot
+++ b/SOL002/VNFFaultManagement-API/NotificationConsumer.robot
@@ -9,36 +9,36 @@ Suite Setup    Check resource existence and get CallbackUri
 
 *** Test Cases ***
 VNF Fault Alarm Notification
-    [Documentation]    Test ID: 6.3.4.7.1
+    [Documentation]    Test ID: 6.3.4.8.1
     ...    Test title: VNF Fault Alarm Notification
-    ...    Test objective: The objective is to test that the POST request triggers VNF Fault Alarm Notification
+    ...    Test objective: The objective is to test that VNF Fault Alarm Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm notifications is available in the VNFM.
     ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
+    ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post Alarm Notification
     Check HTTP Response Status Code Is    204
     
 VNF Fault Alarm Cleared Notification
-    [Documentation]    Test ID: 6.3.4.7.2
+    [Documentation]    Test ID: 6.3.4.8.2
     ...    Test title: VNF Fault Alarm Cleared Notification
-    ...    Test objective: The objective is to test that the POST request triggers VNF Fault Alarm Cleared Notification
+    ...    Test objective: The objective is to test that VNF Fault Alarm Cleared Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm cleared notifications is available in the VNFM.
     ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
+    ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post Alarm Cleared Notification
     Check HTTP Response Status Code Is    204
     
 VNF Fault Alarm List Rebuilt Notification
-    [Documentation]    Test ID: 6.3.4.7.3
+    [Documentation]    Test ID: 6.3.4.8.3
     ...    Test title: VNF Fault List Rebuilt Alarm List Rebuilt Notification
-    ...    Test objective: The objective is to test that the POST request triggers VNF Fault Alarm List Rebuilt Notification
+    ...    Test objective: The objective is to test that VNF Fault Alarm List Rebuilt Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm list rebuilt notifications is available in the VNFM.
     ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
+    ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post Alarm List Rebuilt Notification
-- 
GitLab


From 9d5b03c3292ced97394d116668d38c6d8af7668c Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Tue, 20 Oct 2020 13:56:18 +0200
Subject: [PATCH 160/322] Adding dockerized validation test

---
 .jenkins.sh                  | 15 ++++++++++
 scripts/build-container.sh   | 36 ++++++++++++++++++++++++
 scripts/docker/Dockerfile    | 53 ++++++++++++++++++++++++++++++++++++
 scripts/launch-validation.sh |  8 ++++++
 scripts/run-all.bash         | 38 ++++++++++++++++++++++++++
 scripts/run-container.sh     | 14 ++++++++++
 6 files changed, 164 insertions(+)
 create mode 100644 .jenkins.sh
 create mode 100644 scripts/build-container.sh
 create mode 100644 scripts/docker/Dockerfile
 create mode 100644 scripts/launch-validation.sh
 create mode 100644 scripts/run-all.bash
 create mode 100644 scripts/run-container.sh

diff --git a/.jenkins.sh b/.jenkins.sh
new file mode 100644
index 000000000..ea4251e44
--- /dev/null
+++ b/.jenkins.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+# Copyright ETSI 2018
+# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt
+
+#set -vx
+#set -e
+
+cd "$(dirname "$0")"
+
+run_dir="$(pwd)"
+
+./scripts/build-container.sh
+./scripts/run-container.sh "${run_dir}"
+
+exit $?
diff --git a/scripts/build-container.sh b/scripts/build-container.sh
new file mode 100644
index 000000000..3c16489ba
--- /dev/null
+++ b/scripts/build-container.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+# Copyright ETSI 2019
+# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt
+
+#set -e
+set -vx
+
+DOCKER_FILE=./scripts/docker/Dockerfile
+if [ -f ${DOCKER_FILE} ]
+then
+    #check and build stf583-rf-validation image
+    DOCKER_ID=`docker ps -a | grep -e stf583-rf-validation | awk '{ print $1 }'`
+    if [ ! -z "${DOCKER_ID}" ]
+    then
+        docker rm --force stf583-rf-validation
+    fi
+    docker build --tag stf583-rf-validation --force-rm -f ${DOCKER_FILE} .
+    if [ "$?" != "0" ]
+    then
+        echo "Docker build failed: $?"
+        exit -1
+    fi
+    docker image ls -a
+    docker inspect stf583-rf-validation:latest
+    if [ "$?" != "0" ]
+    then
+        echo "Docker inspect failed: $?"
+        exit -2
+    fi
+else
+    exit -3
+fi
+
+# That's all Floks
+exit 0
+
diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
new file mode 100644
index 000000000..e91f0fd85
--- /dev/null
+++ b/scripts/docker/Dockerfile
@@ -0,0 +1,53 @@
+FROM ubuntu:16.04
+
+MAINTAINER ETSI STF 583
+
+LABEL description="SFT583 Robot Framework Docker Image"
+
+ENV TERM=xterm
+ENV HOSTNAME docker-robot-STF583
+
+
+ARG ssh_prv_key
+
+
+
+RUN DEBIAN_FRONTEND=noninteractive apt update \
+	&& apt install python3 git -y \
+	&& apt install python3-pip -y \
+        && apt install openssh-server -y \
+    && DEBIAN_FRONTEND=noninteractive apt-get autoremove --purge -y \
+    && DEBIAN_FRONTEND=noninteractive apt-get autoclean \
+    && rm -rf /var/lib/apt/lists/*
+
+
+RUN echo "docker-robot-STF583" > /etc/hostname \
+    && echo "root:etsi" | chpasswd
+
+RUN useradd --create-home --shell /bin/bash --user-group etsi --groups sudo \
+    && echo "etsi:etsi" | chpasswd \
+    && adduser etsi sudo \
+    && echo "etsi ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
+
+
+RUN DEBIAN_FRONTEND=noninteractive \
+        && mkdir -p /home/etsi/dev/robot \
+        && cd /home/etsi/dev/robot 
+
+
+ADD . /home/etsi/dev/robot
+
+RUN pip3 install robotframework
+
+RUN DEBIAN_FRONTEND=noninteractive \
+	&& cd /home/etsi/dev/robot \
+	&& pip3 install -r requirements.txt \
+	&& chmod +x /home/etsi/dev/robot/scripts/* \
+	&& git clone https://github.com/etsi-cti-admin/robotframework-mockserver \
+	&& cd  robotframework-mockserver \
+	&& patch -p1 < ../extensions/mockserverlibrary.patch \
+	&& python3 -m pip install -e .
+
+CMD tail -f /dev/null
+
+
diff --git a/scripts/launch-validation.sh b/scripts/launch-validation.sh
new file mode 100644
index 000000000..590305776
--- /dev/null
+++ b/scripts/launch-validation.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+echo "Starting check on ROBOT CODE"
+
+for FILE in $(find . -name "*.robot"); do
+	echo "Syntax check on ${FILE}"
+	robot --dryrun -d /tmp ${FILE}
+done
diff --git a/scripts/run-all.bash b/scripts/run-all.bash
new file mode 100644
index 000000000..793febd18
--- /dev/null
+++ b/scripts/run-all.bash
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+## Launch robot tests validator
+
+mkdir logs
+
+/bin/bash scripts/launch-validation.sh > logs/robot_stdout.log 2> logs/robot_stderr.log
+
+## Filter failed Keywords
+grep -r10n "| FAIL |" logs/robot_stdout.log  | grep -v "Output:" | grep -v "Log:" | grep -v "Report:" > logs/failures.log
+rm -f logs/robot_stdout.log
+
+
+## Filter Errors on code
+grep -rn " ERROR " logs/robot_stderr.log | grep -v "File has no tests or tasks" > logs/errors.log
+rm -f logs/robot_stderr.log
+
+
+ERRORS=`awk 'END{print NR}' logs/errors.log logs/failures.log`
+if [ "${ERRORS}" -eq 0 ]; then
+	rm -f logs/errors.log
+	rm -f logs/failures.log
+fi
+
+
+if [ -f logs/errors.log ]; then
+	cat logs/errors.log
+fi
+
+if [ -f logs/failures.log ]; then
+	cat logs/failures.log
+fi
+
+if [ -f logs/erros.log ] || [ -f logs.failures.log ]; then
+	echo "Errors are found. Job failed"
+	exit 1
+fi
+
diff --git a/scripts/run-container.sh b/scripts/run-container.sh
new file mode 100644
index 000000000..1d65d82e1
--- /dev/null
+++ b/scripts/run-container.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+# Copyright ETSI 2019
+# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt
+
+#set -e
+#set -vx
+
+docker run stf583-rf-validation:latest "/bin/bash" \
+	-c  "cd /home/etsi/dev/robot \
+	    && sh scripts/validate.sh "
+
+# That's all Floks
+exit $?
+
-- 
GitLab


From 284499a7694f28a107ad647ef2a80d825548e1e2 Mon Sep 17 00:00:00 2001
From: Michele Carignani <michele.carignani@etsi.org>
Date: Thu, 12 Nov 2020 19:08:09 +0100
Subject: [PATCH 161/322] triggering cicd

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 656dc5202..185d1a400 100644
--- a/README.md
+++ b/README.md
@@ -28,3 +28,5 @@ Please report errors, bugs or other issues [here](https://forge.etsi.org/rep/nfv
 
 ETSI Forge uses Gitlab to manage submissions to the repository.
 For more information on setting up your environment and contributing, you may refer to the [ETSI Forge wiki](https://forge.etsi.org/wiki/index.php/Main_Page).
+
+
-- 
GitLab


From bec991e4a8e915e10d67ad5c2ca3e12e6a72a0d9 Mon Sep 17 00:00:00 2001
From: Michele Carignani <michele.carignani@etsi.org>
Date: Thu, 12 Nov 2020 19:09:06 +0100
Subject: [PATCH 162/322] Update .jenkins.sh

---
 .jenkins.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.jenkins.sh b/.jenkins.sh
index ea4251e44..943fa9721 100644
--- a/.jenkins.sh
+++ b/.jenkins.sh
@@ -9,7 +9,7 @@ cd "$(dirname "$0")"
 
 run_dir="$(pwd)"
 
-./scripts/build-container.sh
-./scripts/run-container.sh "${run_dir}"
+bash ./scripts/build-container.sh
+bash ./scripts/run-container.sh "${run_dir}"
 
 exit $?
-- 
GitLab


From 8f16a87032e883e823d92d465d1f51fcd5ebc71a Mon Sep 17 00:00:00 2001
From: Michele Carignani <michele.carignani@etsi.org>
Date: Thu, 12 Nov 2020 19:15:51 +0100
Subject: [PATCH 163/322] fix shell usage

---
 scripts/run-container.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/run-container.sh b/scripts/run-container.sh
index 1d65d82e1..0e0cbebfa 100644
--- a/scripts/run-container.sh
+++ b/scripts/run-container.sh
@@ -7,7 +7,7 @@
 
 docker run stf583-rf-validation:latest "/bin/bash" \
 	-c  "cd /home/etsi/dev/robot \
-	    && sh scripts/validate.sh "
+	    && bash scripts/validate.sh "
 
 # That's all Floks
 exit $?
-- 
GitLab


From 4226ccd4651399d3b8b8d42ecb7e1b608ee8d676 Mon Sep 17 00:00:00 2001
From: Michele Carignani <michele.carignani@etsi.org>
Date: Thu, 12 Nov 2020 22:11:32 +0100
Subject: [PATCH 164/322] bugfix

---
 .jenkins.sh                |  4 +++-
 scripts/build-container.sh | 28 ++++++++++++++--------------
 scripts/docker/Dockerfile  | 11 +++++------
 scripts/run-container.sh   | 10 +++++-----
 scripts/validate.sh        | 15 +++++++++++----
 5 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/.jenkins.sh b/.jenkins.sh
index 943fa9721..3bad4e68f 100644
--- a/.jenkins.sh
+++ b/.jenkins.sh
@@ -12,4 +12,6 @@ run_dir="$(pwd)"
 bash ./scripts/build-container.sh
 bash ./scripts/run-container.sh "${run_dir}"
 
-exit $?
+ret=$?
+echo "Final validation result: $ret"
+exit $ret
diff --git a/scripts/build-container.sh b/scripts/build-container.sh
index 3c16489ba..f5c825ad9 100644
--- a/scripts/build-container.sh
+++ b/scripts/build-container.sh
@@ -10,25 +10,25 @@ if [ -f ${DOCKER_FILE} ]
 then
     #check and build stf583-rf-validation image
     DOCKER_ID=`docker ps -a | grep -e stf583-rf-validation | awk '{ print $1 }'`
-    if [ ! -z "${DOCKER_ID}" ]
-    then
-        docker rm --force stf583-rf-validation
-    fi
-    docker build --tag stf583-rf-validation --force-rm -f ${DOCKER_FILE} .
+#    if [ ! -z "${DOCKER_ID}" ]
+#    then
+#        docker rm --force stf583-rf-validation
+#    fi
+    docker build --tag stf583-rf-validation -f ${DOCKER_FILE} .
     if [ "$?" != "0" ]
     then
         echo "Docker build failed: $?"
         exit -1
     fi
-    docker image ls -a
-    docker inspect stf583-rf-validation:latest
-    if [ "$?" != "0" ]
-    then
-        echo "Docker inspect failed: $?"
-        exit -2
-    fi
-else
-    exit -3
+#    docker image ls -a
+#    docker inspect stf583-rf-validation:latest
+#    if [ "$?" != "0" ]
+#    then
+#        echo "Docker inspect failed: $?"
+#        exit -2
+#    fi
+#else
+#    exit -3
 fi
 
 # That's all Floks
diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
index e91f0fd85..de313e6db 100644
--- a/scripts/docker/Dockerfile
+++ b/scripts/docker/Dockerfile
@@ -7,11 +7,8 @@ LABEL description="SFT583 Robot Framework Docker Image"
 ENV TERM=xterm
 ENV HOSTNAME docker-robot-STF583
 
-
 ARG ssh_prv_key
 
-
-
 RUN DEBIAN_FRONTEND=noninteractive apt update \
 	&& apt install python3 git -y \
 	&& apt install python3-pip -y \
@@ -34,16 +31,18 @@ RUN DEBIAN_FRONTEND=noninteractive \
         && mkdir -p /home/etsi/dev/robot \
         && cd /home/etsi/dev/robot 
 
+RUN pip3 install robotframework
+
+RUN DEBIAN_FRONTEND=noninteractive \
+        && cd /home/etsi/dev/robot \
+	&& git clone https://github.com/etsi-cti-admin/robotframework-mockserver 
 
 ADD . /home/etsi/dev/robot
 
-RUN pip3 install robotframework
-
 RUN DEBIAN_FRONTEND=noninteractive \
 	&& cd /home/etsi/dev/robot \
 	&& pip3 install -r requirements.txt \
 	&& chmod +x /home/etsi/dev/robot/scripts/* \
-	&& git clone https://github.com/etsi-cti-admin/robotframework-mockserver \
 	&& cd  robotframework-mockserver \
 	&& patch -p1 < ../extensions/mockserverlibrary.patch \
 	&& python3 -m pip install -e .
diff --git a/scripts/run-container.sh b/scripts/run-container.sh
index 0e0cbebfa..089cd2d86 100644
--- a/scripts/run-container.sh
+++ b/scripts/run-container.sh
@@ -5,10 +5,10 @@
 #set -e
 #set -vx
 
-docker run stf583-rf-validation:latest "/bin/bash" \
-	-c  "cd /home/etsi/dev/robot \
-	    && bash scripts/validate.sh "
+docker run stf583-rf-validation:latest "bash" \
+	-c  "/home/etsi/dev/robot/scripts/validate.sh"
 
-# That's all Floks
-exit $?
+ret=$? 
+
+exit $ret
 
diff --git a/scripts/validate.sh b/scripts/validate.sh
index 6d95c3574..ef8b77531 100644
--- a/scripts/validate.sh
+++ b/scripts/validate.sh
@@ -2,12 +2,19 @@
 #
 # Validate syntax and keywords existance in each Robot file
 
+cd /home/etsi/dev/robot/ 
+
 res=0
 for i in */*/*.robot ; do
-	[[ "$i" != *"Keywords.robot"* && "$i" != *"Keyword.robot"* ]] && \
-	(echo "++++ Dryrun $i" && \
-	robot --dryrun --output NONE --report NONE --log NONE $i || \
-	(echo "++++ Issues in file $i" && res=1));
+    if [[ "$i" != *"Keywords.robot"* && "$i" != *"Keyword.robot"* ]] ; then
+	echo "++++ Dryrun file $i"
+	msg=$(robot --dryrun --output NONE --report NONE --log NONE $i 2>&1)
+	if [ $? != 0 ] ; then
+	    echo "++++ Issues found in file $i"
+	    echo "$msg"
+            res=1
+        fi
+    fi
 done
 
 exit $res
-- 
GitLab


From 7b6fbce53057a4bb910096dc315ba28380b4c8e8 Mon Sep 17 00:00:00 2001
From: Najam UI Hassan <najam.hassan@xflowresearch.com>
Date: Tue, 17 Nov 2020 05:24:24 +0100
Subject: [PATCH 165/322] Update ApiVersion

---
 .../ApiVersion.robot                          | 420 +++++++++---------
 1 file changed, 210 insertions(+), 210 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/ApiVersion.robot b/SOL002/VNFLifecycleManagement-API/ApiVersion.robot
index c85fc6ced..2b94beca1 100644
--- a/SOL002/VNFLifecycleManagement-API/ApiVersion.robot
+++ b/SOL002/VNFLifecycleManagement-API/ApiVersion.robot
@@ -1,211 +1,211 @@
-*** Settings ***
-Resource    environment/variables.txt
-Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
-Library    DependencyLibrary
-Library    JSONLibrary
-Library    JSONSchemaLibrary    schemas/
-
-*** Test Cases ***
-POST API Version - Method not implemented
-    [Documentation]    Test ID: 6.3.5.20.1
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version
-    [Documentation]    Test ID: 6.3.5.20.2
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version - Method not implemented
-    [Documentation]    Test ID: 6.3.5.20.3
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version - Method not implemented
-    [Documentation]    Test ID: 6.3.5.20.4
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version - Method not implemented
-    [Documentation]    Test ID: 6.3.5.20.5
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-	
-POST API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 6.3.5.20.6
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version with apiMajorVerion
-    [Documentation]    Test ID: 6.3.5.20.7
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 6.3.5.20.8
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 6.3.5.20.9
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 6.3.5.20.10
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-
-*** Keywords ***
-POST API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-POST API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings   ${response['status']}    ${expected_status}
-    Log    Status code validated 
-
-Check HTTP Response Body Json Schema Is
-    [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
-    Validate Json    ${schema}    ${response['body']}
+*** Settings ***
+Resource    environment/variables.txt
+Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
+Library    DependencyLibrary
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+
+*** Test Cases ***
+POST API Version - Method not implemented
+    [Documentation]    Test ID: 6.3.5.20.1
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version
+    [Documentation]    Test ID: 6.3.5.20.2
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version - Method not implemented
+    [Documentation]    Test ID: 6.3.5.20.3
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version - Method not implemented
+    [Documentation]    Test ID: 6.3.5.20.4
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version - Method not implemented
+    [Documentation]    Test ID: 6.3.5.20.5
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+	
+POST API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 6.3.5.20.6
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version with apiMajorVerion
+    [Documentation]    Test ID: 6.3.5.20.7
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 6.3.5.20.8
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 6.3.5.20.9
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 6.3.5.20.10
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+
+*** Keywords ***
+POST API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+POST API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings   ${response['status']}    ${expected_status}
+    Log    Status code validated 
+
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    ${schema} =    Catenate    ${input}    .schema.json
+    Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
-- 
GitLab


From d0e30f54c795e09c94fdbbaa83147c90229eb0e1 Mon Sep 17 00:00:00 2001
From: Najam UI Hassan <najam.hassan@xflowresearch.com>
Date: Tue, 17 Nov 2020 05:28:03 +0100
Subject: [PATCH 166/322] Update ApiVersion

---
 .../ApiVersion.robot                          | 420 +++++++++---------
 1 file changed, 210 insertions(+), 210 deletions(-)

diff --git a/SOL002/VNFPerformanceManagement-API/ApiVersion.robot b/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
index 2196cd1fc..168033e8d 100644
--- a/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
+++ b/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
@@ -1,211 +1,211 @@
-*** Settings ***
-Resource    environment/variables.txt
-Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
-Library    DependencyLibrary
-Library    JSONLibrary
-Library    JSONSchemaLibrary    schemas/
-
-*** Test Cases ***
-POST API Version - Method not implemented
-    [Documentation]    Test ID: 6.3.3.9.1
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version
-    [Documentation]    Test ID: 6.3.3.9.2
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version - Method not implemented
-    [Documentation]    Test ID: 6.3.3.9.3
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version - Method not implemented
-    [Documentation]    Test ID: 6.3.3.9.4
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version - Method not implemented
-    [Documentation]    Test ID: 6.3.3.9.5
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-	
-POST API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 6.3.3.9.6
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version with apiMajorVerion
-    [Documentation]    Test ID: 6.3.3.9.7
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 6.3.3.9.8
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 6.3.3.9.9
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 6.3.3.9.10
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-
-*** Keywords ***
-POST API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-POST API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal    ${response['status']}    ${expected_status}
-    Log    Status code validated 
-
-Check HTTP Response Body Json Schema Is
-    [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
-    Validate Json    ${schema}    ${response['body']}
+*** Settings ***
+Resource    environment/variables.txt
+Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
+Library    DependencyLibrary
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+
+*** Test Cases ***
+POST API Version - Method not implemented
+    [Documentation]    Test ID: 6.3.3.9.1
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version
+    [Documentation]    Test ID: 6.3.3.9.2
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version - Method not implemented
+    [Documentation]    Test ID: 6.3.3.9.3
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version - Method not implemented
+    [Documentation]    Test ID: 6.3.3.9.4
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version - Method not implemented
+    [Documentation]    Test ID: 6.3.3.9.5
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+	
+POST API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 6.3.3.9.6
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version with apiMajorVerion
+    [Documentation]    Test ID: 6.3.3.9.7
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 6.3.3.9.8
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 6.3.3.9.9
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 6.3.3.9.10
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+
+*** Keywords ***
+POST API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+POST API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    ${schema} =    Catenate    ${input}    .schema.json
+    Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
-- 
GitLab


From 2bbbd4f856742cdc16dd35cdda42a191a9af2116 Mon Sep 17 00:00:00 2001
From: Najam UI Hassan <najam.hassan@xflowresearch.com>
Date: Tue, 17 Nov 2020 05:31:45 +0100
Subject: [PATCH 167/322] Update ApiVersion.robot

---
 .../VNFFaultManagement-API/ApiVersion.robot   | 424 +++++++++---------
 1 file changed, 212 insertions(+), 212 deletions(-)

diff --git a/SOL002/VNFFaultManagement-API/ApiVersion.robot b/SOL002/VNFFaultManagement-API/ApiVersion.robot
index ea7c27ddc..2f4b46c4a 100644
--- a/SOL002/VNFFaultManagement-API/ApiVersion.robot
+++ b/SOL002/VNFFaultManagement-API/ApiVersion.robot
@@ -1,213 +1,213 @@
-*** Settings ***
-
-Resource    environment/variables.txt
-
-Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
-Library    DependencyLibrary
-Library    JSONLibrary
-Library    JSONSchemaLibrary    schemas/
-
-*** Test Cases ***
-POST API Version - Method not implemented
-    [Documentation]    Test ID: 6.3.4.7.1
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version
-    [Documentation]    Test ID: 6.3.4.7.2
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version - Method not implemented
-    [Documentation]    Test ID: 6.3.4.7.3
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version - Method not implemented
-    [Documentation]    Test ID: 6.3.4.7.4
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version - Method not implemented
-    [Documentation]    Test ID: 6.3.4.7.5
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-	
-POST API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 6.3.4.7.6
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version with apiMajorVerion
-    [Documentation]    Test ID: 6.3.4.7.7
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 6.3.4.7.8
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 6.3.4.7.9
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 6.3.4.7.10
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-
-*** Keywords ***
-POST API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-POST API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings   ${response['status']}    ${expected_status}
-    Log    Status code validated 
-
-Check HTTP Response Body Json Schema Is
-    [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
-    Validate Json    ${schema}    ${response['body']}
+*** Settings ***
+
+Resource    environment/variables.txt
+
+Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
+Library    DependencyLibrary
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+
+*** Test Cases ***
+POST API Version - Method not implemented
+    [Documentation]    Test ID: 6.3.4.7.1
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version
+    [Documentation]    Test ID: 6.3.4.7.2
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version - Method not implemented
+    [Documentation]    Test ID: 6.3.4.7.3
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version - Method not implemented
+    [Documentation]    Test ID: 6.3.4.7.4
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version - Method not implemented
+    [Documentation]    Test ID: 6.3.4.7.5
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+	
+POST API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 6.3.4.7.6
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version with apiMajorVerion
+    [Documentation]    Test ID: 6.3.4.7.7
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 6.3.4.7.8
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 6.3.4.7.9
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 6.3.4.7.10
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+
+*** Keywords ***
+POST API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+POST API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings   ${response['status']}    ${expected_status}
+    Log    Status code validated 
+
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    ${schema} =    Catenate    ${input}    .schema.json
+    Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
-- 
GitLab


From e4c596418c81418b03529dc3c2ec5186b6081397 Mon Sep 17 00:00:00 2001
From: Najam UI Hassan <najam.hassan@xflowresearch.com>
Date: Wed, 18 Nov 2020 08:43:53 +0100
Subject: [PATCH 168/322] Update ApiVersion.robot

---
 SOL002/VNFIndicator-API/ApiVersion.robot | 424 +++++++++++------------
 1 file changed, 212 insertions(+), 212 deletions(-)

diff --git a/SOL002/VNFIndicator-API/ApiVersion.robot b/SOL002/VNFIndicator-API/ApiVersion.robot
index 9a9b25f3b..9a60cbe3f 100644
--- a/SOL002/VNFIndicator-API/ApiVersion.robot
+++ b/SOL002/VNFIndicator-API/ApiVersion.robot
@@ -1,213 +1,213 @@
-*** Settings ***
-
-Resource    environment/variables.txt
-
-Library    REST    ${EM-VNF_SCHEMA}://${EM-VNF_HOST}:${EM-VNF_PORT}     ssl_verify=false
-Library    DependencyLibrary
-Library    JSONLibrary
-Library    JSONSchemaLibrary    schemas/
-
-*** Test Cases ***
-POST API Version - Method not implemented
-    [Documentation]    Test ID: 6.3.2.7.1
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version
-    [Documentation]    Test ID: 6.3.2.7.2
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version - Method not implemented
-    [Documentation]    Test ID: 6.3.2.7.3
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version - Method not implemented
-    [Documentation]    Test ID: 6.3.2.7.4
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version - Method not implemented
-    [Documentation]    Test ID: 6.3.2.7.5
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-	
-POST API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 6.3.2.7.6
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version with apiMajorVerion
-    [Documentation]    Test ID: 6.3.2.7.7
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 6.3.2.7.8
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 6.3.2.7.9
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 6.3.2.7.10
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-
-*** Keywords ***
-POST API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-POST API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings   ${response['status']}    ${expected_status}
-    Log    Status code validated 
-
-Check HTTP Response Body Json Schema Is
-    [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
-    Validate Json    ${schema}    ${response['body']}
+*** Settings ***
+
+Resource    environment/variables.txt
+
+Library    REST    ${EM-VNF_SCHEMA}://${EM-VNF_HOST}:${EM-VNF_PORT}     ssl_verify=false
+Library    DependencyLibrary
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+
+*** Test Cases ***
+POST API Version - Method not implemented
+    [Documentation]    Test ID: 6.3.2.7.1
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version
+    [Documentation]    Test ID: 6.3.2.7.2
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version - Method not implemented
+    [Documentation]    Test ID: 6.3.2.7.3
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version - Method not implemented
+    [Documentation]    Test ID: 6.3.2.7.4
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version - Method not implemented
+    [Documentation]    Test ID: 6.3.2.7.5
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+	
+POST API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 6.3.2.7.6
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version with apiMajorVerion
+    [Documentation]    Test ID: 6.3.2.7.7
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 6.3.2.7.8
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 6.3.2.7.9
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 6.3.2.7.10
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+
+*** Keywords ***
+POST API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+POST API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings   ${response['status']}    ${expected_status}
+    Log    Status code validated 
+
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    ${schema} =    Catenate    ${input}    .schema.json
+    Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
-- 
GitLab


From 0639502b0592fcae31d4ece8104e6a2258267f2f Mon Sep 17 00:00:00 2001
From: Najam UI Hassan <najam.hassan@xflowresearch.com>
Date: Wed, 18 Nov 2020 08:44:46 +0100
Subject: [PATCH 169/322] Update ApiVersion.robot

---
 SOL002/VNFConfiguration-API/ApiVersion.robot | 420 +++++++++----------
 1 file changed, 210 insertions(+), 210 deletions(-)

diff --git a/SOL002/VNFConfiguration-API/ApiVersion.robot b/SOL002/VNFConfiguration-API/ApiVersion.robot
index 47abb5a53..43b857994 100644
--- a/SOL002/VNFConfiguration-API/ApiVersion.robot
+++ b/SOL002/VNFConfiguration-API/ApiVersion.robot
@@ -1,211 +1,211 @@
-*** Settings ***
-Resource    environment/variables.txt
-Library    REST    ${EM-VNF_SCHEMA}://${EM-VNF_HOST}:${EM-VNF_PORT}     ssl_verify=false
-Library    DependencyLibrary
-Library    JSONLibrary
-Library    JSONSchemaLibrary    schemas/
-
-*** Test Cases ***
-POST API Version - Method not implemented
-    [Documentation]    Test ID: 6.3.1.2.1
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version
-    [Documentation]    Test ID: 6.3.1.2.2
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version - Method not implemented
-    [Documentation]    Test ID: 6.3.1.2.3
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version - Method not implemented
-    [Documentation]    Test ID: 6.3.1.2.4
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version - Method not implemented
-    [Documentation]    Test ID: 6.3.1.2.5
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-	
-POST API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 6.3.1.2.6
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version with apiMajorVerion
-    [Documentation]    Test ID: 6.3.1.2.7
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 6.3.1.2.8
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 6.3.1.2.9
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 6.3.1.2.10
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-
-*** Keywords ***
-POST API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-POST API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings   ${response['status']}    ${expected_status}
-    Log    Status code validated 
-
-Check HTTP Response Body Json Schema Is
-    [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
-    Validate Json    ${schema}    ${response['body']}
+*** Settings ***
+Resource    environment/variables.txt
+Library    REST    ${EM-VNF_SCHEMA}://${EM-VNF_HOST}:${EM-VNF_PORT}     ssl_verify=false
+Library    DependencyLibrary
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+
+*** Test Cases ***
+POST API Version - Method not implemented
+    [Documentation]    Test ID: 6.3.1.2.1
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version
+    [Documentation]    Test ID: 6.3.1.2.2
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version - Method not implemented
+    [Documentation]    Test ID: 6.3.1.2.3
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version - Method not implemented
+    [Documentation]    Test ID: 6.3.1.2.4
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version - Method not implemented
+    [Documentation]    Test ID: 6.3.1.2.5
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+	
+POST API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 6.3.1.2.6
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version with apiMajorVerion
+    [Documentation]    Test ID: 6.3.1.2.7
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 6.3.1.2.8
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 6.3.1.2.9
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 6.3.1.2.10
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+
+*** Keywords ***
+POST API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+POST API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings   ${response['status']}    ${expected_status}
+    Log    Status code validated 
+
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    ${schema} =    Catenate    ${input}    .schema.json
+    Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
-- 
GitLab


From 04d98519ab034db48f6e1179000ff30c94684c7c Mon Sep 17 00:00:00 2001
From: Najam UI Hassan <najam.hassan@xflowresearch.com>
Date: Wed, 18 Nov 2020 08:46:32 +0100
Subject: [PATCH 170/322] Update ApiVersion.robot

---
 .../ApiVersion.robot                          | 422 +++++++++---------
 1 file changed, 211 insertions(+), 211 deletions(-)

diff --git a/SOL003/VNFLifecycleManagement-API/ApiVersion.robot b/SOL003/VNFLifecycleManagement-API/ApiVersion.robot
index 5c2816ed6..46cba71dd 100644
--- a/SOL003/VNFLifecycleManagement-API/ApiVersion.robot
+++ b/SOL003/VNFLifecycleManagement-API/ApiVersion.robot
@@ -1,212 +1,212 @@
-*** Settings ***
-Resource    environment/variables.txt
-Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
-Library    DependencyLibrary
-Library    JSONLibrary
-Library    JSONSchemaLibrary    schemas/
-
-*** Test Cases ***
-POST API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.1.35.1
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version
-    [Documentation]    Test ID: 7.3.1.35.2
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.1.35.3
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.1.35.4
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.1.35.5
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-	
-POST API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.1.35.6
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version with apiMajorVerion
-    [Documentation]    Test ID: 7.3.1.35.7
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.1.35.8
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.1.35.9
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.1.35.10
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-
-*** Keywords ***
-POST API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-POST API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-	
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings    ${response['status']}    ${expected_status}
-    Log    Status code validated 
-
-Check HTTP Response Body Json Schema Is
-    [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
-    Validate Json    ${schema}    ${response['body']}
+*** Settings ***
+Resource    environment/variables.txt
+Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
+Library    DependencyLibrary
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+
+*** Test Cases ***
+POST API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.1.35.1
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version
+    [Documentation]    Test ID: 7.3.1.35.2
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.1.35.3
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.1.35.4
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.1.35.5
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+	
+POST API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.1.35.6
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version with apiMajorVerion
+    [Documentation]    Test ID: 7.3.1.35.7
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.1.35.8
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.1.35.9
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.1.35.10
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+
+*** Keywords ***
+POST API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+POST API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+	
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    ${schema} =    Catenate    ${input}    .schema.json
+    Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
-- 
GitLab


From cc297a36d68c1cc2ba4ead411fb4620c8613bdf4 Mon Sep 17 00:00:00 2001
From: Najam UI Hassan <najam.hassan@xflowresearch.com>
Date: Wed, 18 Nov 2020 08:47:17 +0100
Subject: [PATCH 171/322] Update ApiVersion.robot

---
 .../ApiVersion.robot                          | 426 +++++++++---------
 1 file changed, 213 insertions(+), 213 deletions(-)

diff --git a/SOL003/VNFPerformanceManagement-API/ApiVersion.robot b/SOL003/VNFPerformanceManagement-API/ApiVersion.robot
index b1cfc474c..b975fc71f 100644
--- a/SOL003/VNFPerformanceManagement-API/ApiVersion.robot
+++ b/SOL003/VNFPerformanceManagement-API/ApiVersion.robot
@@ -1,214 +1,214 @@
-*** Settings ***
-
-Resource    environment/variables.txt
-
-Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
-Library    DependencyLibrary
-Library    JSONLibrary
-Library    JSONSchemaLibrary    schemas/
-
-*** Test Cases ***
-POST API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.4.9.1
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version
-    [Documentation]    Test ID: 7.3.4.9.2
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.4.9.3
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.4.9.4
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.4.9.5
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-	
-POST API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.4.9.6
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version with apiMajorVerion
-    [Documentation]    Test ID: 7.3.4.9.7
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.4.9.8
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.4.9.9
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.4.9.10
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-
-*** Keywords ***
-POST API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-POST API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-	
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings   ${response['status']}    ${expected_status}
-    Log    Status code validated 
-
-Check HTTP Response Body Json Schema Is
-    [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
-    Validate Json    ${schema}    ${response['body']}
+*** Settings ***
+
+Resource    environment/variables.txt
+
+Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
+Library    DependencyLibrary
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+
+*** Test Cases ***
+POST API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.4.9.1
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version
+    [Documentation]    Test ID: 7.3.4.9.2
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.4.9.3
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.4.9.4
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.4.9.5
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+	
+POST API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.4.9.6
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version with apiMajorVerion
+    [Documentation]    Test ID: 7.3.4.9.7
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.4.9.8
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.4.9.9
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.4.9.10
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+
+*** Keywords ***
+POST API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+POST API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+	
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings   ${response['status']}    ${expected_status}
+    Log    Status code validated 
+
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    ${schema} =    Catenate    ${input}    .schema.json
+    Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
-- 
GitLab


From 9b5afbb59ef8fc2c82a26d69079bfce12c7ae21d Mon Sep 17 00:00:00 2001
From: Najam UI Hassan <najam.hassan@xflowresearch.com>
Date: Wed, 18 Nov 2020 08:47:48 +0100
Subject: [PATCH 172/322] Update ApiVersion.robot

---
 .../VNFFaultManagement-API/ApiVersion.robot   | 424 +++++++++---------
 1 file changed, 212 insertions(+), 212 deletions(-)

diff --git a/SOL003/VNFFaultManagement-API/ApiVersion.robot b/SOL003/VNFFaultManagement-API/ApiVersion.robot
index 298ac757e..943898e57 100644
--- a/SOL003/VNFFaultManagement-API/ApiVersion.robot
+++ b/SOL003/VNFFaultManagement-API/ApiVersion.robot
@@ -1,213 +1,213 @@
-*** Settings ***
-
-Resource    environment/variables.txt
-
-Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
-Library    DependencyLibrary
-Library    JSONLibrary
-Library    JSONSchemaLibrary    schemas/
-
-*** Test Cases ***
-POST API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.5.6.1
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version
-    [Documentation]    Test ID: 7.3.5.6.2
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.5.6.3
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.5.6.4
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.5.6.5
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-	
-POST API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.5.6.6
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version with apiMajorVerion
-    [Documentation]    Test ID: 7.3.5.6.7
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.5.6.8
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.5.6.9
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.5.6.10
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-
-*** Keywords ***
-POST API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-POST API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings   ${response['status']}    ${expected_status}
-    Log    Status code validated 
-
-Check HTTP Response Body Json Schema Is
-    [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
-    Validate Json    ${schema}    ${response['body']}
+*** Settings ***
+
+Resource    environment/variables.txt
+
+Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
+Library    DependencyLibrary
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+
+*** Test Cases ***
+POST API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.5.6.1
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version
+    [Documentation]    Test ID: 7.3.5.6.2
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.5.6.3
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.5.6.4
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.5.6.5
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+	
+POST API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.5.6.6
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version with apiMajorVerion
+    [Documentation]    Test ID: 7.3.5.6.7
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.5.6.8
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.5.6.9
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.5.6.10
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+
+*** Keywords ***
+POST API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+POST API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings   ${response['status']}    ${expected_status}
+    Log    Status code validated 
+
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    ${schema} =    Catenate    ${input}    .schema.json
+    Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
-- 
GitLab


From fe61c4c24c1984cb5c9a0248bf97c494bf4a0cd0 Mon Sep 17 00:00:00 2001
From: Najam UI Hassan <najam.hassan@xflowresearch.com>
Date: Wed, 18 Nov 2020 08:48:36 +0100
Subject: [PATCH 173/322] Update ApiVersion.robot

---
 SOL003/VNFIndicator-API/ApiVersion.robot | 424 +++++++++++------------
 1 file changed, 212 insertions(+), 212 deletions(-)

diff --git a/SOL003/VNFIndicator-API/ApiVersion.robot b/SOL003/VNFIndicator-API/ApiVersion.robot
index 7dfc38510..bcb0549b0 100644
--- a/SOL003/VNFIndicator-API/ApiVersion.robot
+++ b/SOL003/VNFIndicator-API/ApiVersion.robot
@@ -1,213 +1,213 @@
-*** Settings ***
-
-Resource    environment/variables.txt
-
-Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
-Library    DependencyLibrary
-Library    JSONLibrary
-Library    JSONSchemaLibrary    schemas/
-
-*** Test Cases ***
-POST API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.6.7.1
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version
-    [Documentation]    Test ID: 7.3.6.7.2
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.6.7.3
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.6.7.4
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.6.7.5
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-	
-POST API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.6.7.6
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version with apiMajorVerion
-    [Documentation]    Test ID: 7.3.6.7.7
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.6.7.8
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.6.7.9
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.6.7.10
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-
-*** Keywords ***
-POST API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-POST API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings    ${response['status']}    ${expected_status}
-    Log    Status code validated 
-
-Check HTTP Response Body Json Schema Is
-    [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
-    Validate Json    ${schema}    ${response['body']}
+*** Settings ***
+
+Resource    environment/variables.txt
+
+Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
+Library    DependencyLibrary
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+
+*** Test Cases ***
+POST API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.6.7.1
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version
+    [Documentation]    Test ID: 7.3.6.7.2
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.6.7.3
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.6.7.4
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.6.7.5
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+	
+POST API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.6.7.6
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version with apiMajorVerion
+    [Documentation]    Test ID: 7.3.6.7.7
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.6.7.8
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.6.7.9
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.6.7.10
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+
+*** Keywords ***
+POST API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+POST API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    ${schema} =    Catenate    ${input}    .schema.json
+    Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
-- 
GitLab


From 88a07486a0ebe9bb365a9976d13a03801056a74f Mon Sep 17 00:00:00 2001
From: Najam UI Hassan <najam.hassan@xflowresearch.com>
Date: Wed, 18 Nov 2020 08:49:10 +0100
Subject: [PATCH 174/322] Update ApiVersion.robot

---
 .../ApiVersion.robot                          | 424 +++++++++---------
 1 file changed, 212 insertions(+), 212 deletions(-)

diff --git a/SOL003/VNFLifecycleOperationGranting-API/ApiVersion.robot b/SOL003/VNFLifecycleOperationGranting-API/ApiVersion.robot
index 273a3d326..0e97091ce 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/ApiVersion.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/ApiVersion.robot
@@ -1,213 +1,213 @@
-*** Settings ***
-
-Resource    environment/variables.txt
-
-Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
-Library    DependencyLibrary
-Library    JSONLibrary
-Library    JSONSchemaLibrary    schemas/
-
-*** Test Cases ***
-POST API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.2.3.1
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version
-    [Documentation]    Test ID: 7.3.2.3.2
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.2.3.3
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.2.3.4
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.2.3.5
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-	
-POST API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.2.3.6
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version with apiMajorVerion
-    [Documentation]    Test ID: 7.3.2.3.7
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.2.3.8
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.2.3.9
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.2.3.10
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-
-*** Keywords ***
-POST API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-POST API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings    ${response['status']}    ${expected_status}
-    Log    Status code validated 
-
-Check HTTP Response Body Json Schema Is
-    [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
-    Validate Json    ${schema}    ${response['body']}
+*** Settings ***
+
+Resource    environment/variables.txt
+
+Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
+Library    DependencyLibrary
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+
+*** Test Cases ***
+POST API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.2.3.1
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version
+    [Documentation]    Test ID: 7.3.2.3.2
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.2.3.3
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.2.3.4
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.2.3.5
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+	
+POST API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.2.3.6
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version with apiMajorVerion
+    [Documentation]    Test ID: 7.3.2.3.7
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.2.3.8
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.2.3.9
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.2.3.10
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+
+*** Keywords ***
+POST API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+POST API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    ${schema} =    Catenate    ${input}    .schema.json
+    Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
-- 
GitLab


From c3824eaf1509342a4ce71d3c3e865f333ff8cea7 Mon Sep 17 00:00:00 2001
From: Najam UI Hassan <najam.hassan@xflowresearch.com>
Date: Wed, 18 Nov 2020 08:50:13 +0100
Subject: [PATCH 175/322] Update ApiVersion.robot

---
 .../VNFPackageManagement-API/ApiVersion.robot | 428 +++++++++---------
 1 file changed, 214 insertions(+), 214 deletions(-)

diff --git a/SOL003/VNFPackageManagement-API/ApiVersion.robot b/SOL003/VNFPackageManagement-API/ApiVersion.robot
index 66e4aeffc..689766575 100644
--- a/SOL003/VNFPackageManagement-API/ApiVersion.robot
+++ b/SOL003/VNFPackageManagement-API/ApiVersion.robot
@@ -1,215 +1,215 @@
-*** Settings ***
-
-Resource    environment/variables.txt
-
-Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=false
-Library    DependencyLibrary
-Library    JSONLibrary
-Library    JSONSchemaLibrary    schemas/
-
-*** Test Cases ***
-POST API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.3.9.1
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version
-    [Documentation]    Test ID: 7.3.3.9.2
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.3.9.3
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.3.9.4
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.3.9.5
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-	
-POST API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.3.9.6
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version with apiMajorVerion
-    [Documentation]    Test ID: 7.3.3.9.7
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.3.9.8
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.3.9.9
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.3.9.10
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-
-*** Keywords ***
-POST API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-POST API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-
-	
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings   ${response['status']}    ${expected_status}
-    Log    Status code validated 
-
-
-Check HTTP Response Body Json Schema Is
-    [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
-    Validate Json    ${schema}    ${response['body']}
+*** Settings ***
+
+Resource    environment/variables.txt
+
+Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=false
+Library    DependencyLibrary
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+
+*** Test Cases ***
+POST API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.3.9.1
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version
+    [Documentation]    Test ID: 7.3.3.9.2
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.3.9.3
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.3.9.4
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.3.9.5
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+	
+POST API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.3.9.6
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version with apiMajorVerion
+    [Documentation]    Test ID: 7.3.3.9.7
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.3.9.8
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.3.9.9
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.3.9.10
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+
+*** Keywords ***
+POST API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+POST API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
+	
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings   ${response['status']}    ${expected_status}
+    Log    Status code validated 
+
+
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    ${schema} =    Catenate    ${input}    .schema.json
+    Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
-- 
GitLab


From fa33b13f767b47c2b085010e5353b0f66e00fe61 Mon Sep 17 00:00:00 2001
From: Najam UI Hassan <najam.hassan@xflowresearch.com>
Date: Wed, 18 Nov 2020 08:50:54 +0100
Subject: [PATCH 176/322] Update ApiVersion.robot

---
 .../ApiVersion.robot                          | 420 +++++++++---------
 1 file changed, 210 insertions(+), 210 deletions(-)

diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/ApiVersion.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/ApiVersion.robot
index c02163dd6..37cd37715 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/ApiVersion.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/ApiVersion.robot
@@ -1,211 +1,211 @@
-*** Settings ***
-Resource    environment/variables.txt
-Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=false
-Library    DependencyLibrary
-Library    JSONLibrary
-Library    JSONSchemaLibrary    schemas/
-
-*** Test Cases ***
-POST API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.7.3.1
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version
-    [Documentation]    Test ID: 7.3.7.3.2
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.7.3.3
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.7.3.4
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version - Method not implemented
-    [Documentation]    Test ID: 7.3.7.3.5
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-	
-POST API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.7.3.6
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version with apiMajorVerion
-    [Documentation]    Test ID: 7.3.7.3.7
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.7.3.8
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.7.3.9
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 7.3.7.3.10
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-
-*** Keywords ***
-POST API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-POST API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings   ${response['status']}    ${expected_status}
-    Log    Status code validated
-    
-Check HTTP Response Body Json Schema Is
-    [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
-    Validate Json    ${schema}    ${response['body']}
+*** Settings ***
+Resource    environment/variables.txt
+Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=false
+Library    DependencyLibrary
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+
+*** Test Cases ***
+POST API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.7.3.1
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version
+    [Documentation]    Test ID: 7.3.7.3.2
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.7.3.3
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.7.3.4
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version - Method not implemented
+    [Documentation]    Test ID: 7.3.7.3.5
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+	
+POST API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.7.3.6
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version with apiMajorVerion
+    [Documentation]    Test ID: 7.3.7.3.7
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.7.3.8
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.7.3.9
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 7.3.7.3.10
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+
+*** Keywords ***
+POST API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+POST API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings   ${response['status']}    ${expected_status}
+    Log    Status code validated
+    
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    ${schema} =    Catenate    ${input}    .schema.json
+    Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
-- 
GitLab


From 33f0f7561e2192c0c23dc778ea2e6a33e361973d Mon Sep 17 00:00:00 2001
From: Najam UI Hassan <najam.hassan@xflowresearch.com>
Date: Thu, 19 Nov 2020 06:32:32 +0100
Subject: [PATCH 177/322] Update ApiVersion.robot

---
 SOL005/NSDManagement-API/ApiVersion.robot | 424 +++++++++++-----------
 1 file changed, 212 insertions(+), 212 deletions(-)

diff --git a/SOL005/NSDManagement-API/ApiVersion.robot b/SOL005/NSDManagement-API/ApiVersion.robot
index 40a46a3a5..0d34a455b 100644
--- a/SOL005/NSDManagement-API/ApiVersion.robot
+++ b/SOL005/NSDManagement-API/ApiVersion.robot
@@ -1,213 +1,213 @@
-*** Settings ***
-
-Resource    environment/variables.txt
-
-Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=false
-Library    DependencyLibrary
-Library    JSONLibrary
-Library    JSONSchemaLibrary    schemas/
-
-*** Test Cases ***
-POST API Version - Method not implemented
-    [Documentation]    Test ID: 5.3.1.10.1
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version
-    [Documentation]    Test ID: 5.3.1.10.2
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version - Method not implemented
-    [Documentation]    Test ID: 5.3.1.10.3
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version - Method not implemented
-    [Documentation]    Test ID: 5.3.1.10.4
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version - Method not implemented
-    [Documentation]    Test ID: 5.3.1.10.5
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-	
-POST API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 5.3.1.10.6
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version with apiMajorVerion
-    [Documentation]    Test ID: 5.3.1.10.7
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 5.3.1.10.8
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 5.3.1.10.9
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 5.3.1.10.10
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-
-*** Keywords ***
-POST API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-POST API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings   ${response['status']}    ${expected_status}
-    Log    Status code validated 
-
-Check HTTP Response Body Json Schema Is
-    [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
-    Validate Json    ${schema}    ${response['body']}
+*** Settings ***
+
+Resource    environment/variables.txt
+
+Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=false
+Library    DependencyLibrary
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+
+*** Test Cases ***
+POST API Version - Method not implemented
+    [Documentation]    Test ID: 5.3.1.10.1
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version
+    [Documentation]    Test ID: 5.3.1.10.2
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version - Method not implemented
+    [Documentation]    Test ID: 5.3.1.10.3
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version - Method not implemented
+    [Documentation]    Test ID: 5.3.1.10.4
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version - Method not implemented
+    [Documentation]    Test ID: 5.3.1.10.5
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+	
+POST API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 5.3.1.10.6
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version with apiMajorVerion
+    [Documentation]    Test ID: 5.3.1.10.7
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 5.3.1.10.8
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 5.3.1.10.9
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 5.3.1.10.10
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+
+*** Keywords ***
+POST API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+POST API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings   ${response['status']}    ${expected_status}
+    Log    Status code validated 
+
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    ${schema} =    Catenate    ${input}    .schema.json
+    Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
-- 
GitLab


From ba8920d0469062679b5f66604fce2f9da47f9521 Mon Sep 17 00:00:00 2001
From: Najam UI Hassan <najam.hassan@xflowresearch.com>
Date: Thu, 19 Nov 2020 06:33:06 +0100
Subject: [PATCH 178/322] Update ApiVersion.robot

---
 .../ApiVersion.robot                          | 426 +++++++++---------
 1 file changed, 213 insertions(+), 213 deletions(-)

diff --git a/SOL005/NSLifecycleManagement-API/ApiVersion.robot b/SOL005/NSLifecycleManagement-API/ApiVersion.robot
index 7fe40a640..76b1e5d1c 100644
--- a/SOL005/NSLifecycleManagement-API/ApiVersion.robot
+++ b/SOL005/NSLifecycleManagement-API/ApiVersion.robot
@@ -1,213 +1,213 @@
-*** Settings ***
-
-Resource    environment/variables.txt
-
-Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=false
-Library    DependencyLibrary
-Library    JSONLibrary
-Library    JSONSchemaLibrary    schemas/
-
-*** Test Cases ***
-POST API Version - Method not implemented
-    [Documentation]    Test ID: 5.3.2.25.1
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version
-    [Documentation]    Test ID: 5.3.2.25.2
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version - Method not implemented
-    [Documentation]    Test ID: 5.3.2.25.3
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version - Method not implemented
-    [Documentation]    Test ID: 5.3.2.25.4
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version - Method not implemented
-    [Documentation]    Test ID: 5.3.2.25.5
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-	
-POST API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 5.3.2.25.6
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version with apiMajorVerion
-    [Documentation]    Test ID: 5.3.2.25.7
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 5.3.2.25.8
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 5.3.2.25.9
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 5.3.2.25.10
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-
-*** Keywords ***
-POST API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-POST API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings    ${response['status']}    ${expected_status}
-    Log    Status code validated 
-
-Check HTTP Response Body Json Schema Is
-    [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
-    Validate Json    ${schema}    ${response['body']}
-    Log    Json Schema Validation OK
+*** Settings ***
+
+Resource    environment/variables.txt
+
+Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=false
+Library    DependencyLibrary
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+
+*** Test Cases ***
+POST API Version - Method not implemented
+    [Documentation]    Test ID: 5.3.2.25.1
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version
+    [Documentation]    Test ID: 5.3.2.25.2
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version - Method not implemented
+    [Documentation]    Test ID: 5.3.2.25.3
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version - Method not implemented
+    [Documentation]    Test ID: 5.3.2.25.4
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version - Method not implemented
+    [Documentation]    Test ID: 5.3.2.25.5
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+	
+POST API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 5.3.2.25.6
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version with apiMajorVerion
+    [Documentation]    Test ID: 5.3.2.25.7
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 5.3.2.25.8
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 5.3.2.25.9
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 5.3.2.25.10
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+
+*** Keywords ***
+POST API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+POST API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    ${schema} =    Catenate    ${input}    .schema.json
+    Validate Json    ${schema}    ${response['body']}
+    Log    Json Schema Validation OK
-- 
GitLab


From a9b5871f389ed6c698e4dc6002dabbaaaad4dbc4 Mon Sep 17 00:00:00 2001
From: Najam UI Hassan <najam.hassan@xflowresearch.com>
Date: Thu, 19 Nov 2020 06:33:30 +0100
Subject: [PATCH 179/322] Update ApiVersion.robot

---
 SOL005/NSFaultManagement-API/ApiVersion.robot | 424 +++++++++---------
 1 file changed, 212 insertions(+), 212 deletions(-)

diff --git a/SOL005/NSFaultManagement-API/ApiVersion.robot b/SOL005/NSFaultManagement-API/ApiVersion.robot
index 47ae5def9..5038878de 100644
--- a/SOL005/NSFaultManagement-API/ApiVersion.robot
+++ b/SOL005/NSFaultManagement-API/ApiVersion.robot
@@ -1,213 +1,213 @@
-*** Settings ***
-
-Resource    environment/variables.txt
-
-Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=false
-Library    DependencyLibrary
-Library    JSONLibrary
-Library    JSONSchemaLibrary    schemas/
-
-*** Test Cases ***
-POST API Version - Method not implemented
-    [Documentation]    Test ID: 5.3.3.6.1
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version
-    [Documentation]    Test ID: 5.3.3.6.2
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version - Method not implemented
-    [Documentation]    Test ID: 5.3.3.6.3
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version - Method not implemented
-    [Documentation]    Test ID: 5.3.3.6.4
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version - Method not implemented
-    [Documentation]    Test ID: 5.3.3.6.5
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-	
-POST API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 5.3.3.6.6
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version with apiMajorVerion
-    [Documentation]    Test ID: 5.3.3.6.7
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 5.3.3.6.8
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 5.3.3.6.9
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 5.3.3.6.10
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-
-*** Keywords ***
-POST API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-POST API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings    ${response['status']}    ${expected_status}
-    Log    Status code validated 
-
-Check HTTP Response Body Json Schema Is
-    [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
-    Validate Json    ${schema}    ${response['body']}
+*** Settings ***
+
+Resource    environment/variables.txt
+
+Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=false
+Library    DependencyLibrary
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+
+*** Test Cases ***
+POST API Version - Method not implemented
+    [Documentation]    Test ID: 5.3.3.6.1
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version
+    [Documentation]    Test ID: 5.3.3.6.2
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version - Method not implemented
+    [Documentation]    Test ID: 5.3.3.6.3
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version - Method not implemented
+    [Documentation]    Test ID: 5.3.3.6.4
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version - Method not implemented
+    [Documentation]    Test ID: 5.3.3.6.5
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+	
+POST API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 5.3.3.6.6
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version with apiMajorVerion
+    [Documentation]    Test ID: 5.3.3.6.7
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 5.3.3.6.8
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 5.3.3.6.9
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 5.3.3.6.10
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+
+*** Keywords ***
+POST API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+POST API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    ${schema} =    Catenate    ${input}    .schema.json
+    Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
-- 
GitLab


From 618f8c1afe404bc3bb5b846d6fe2a85edf1a83ec Mon Sep 17 00:00:00 2001
From: Najam UI Hassan <najam.hassan@xflowresearch.com>
Date: Thu, 19 Nov 2020 06:34:00 +0100
Subject: [PATCH 180/322] Update ApiVersion.robot

---
 .../VNFPackageManagement-API/ApiVersion.robot | 422 +++++++++---------
 1 file changed, 211 insertions(+), 211 deletions(-)

diff --git a/SOL005/VNFPackageManagement-API/ApiVersion.robot b/SOL005/VNFPackageManagement-API/ApiVersion.robot
index 1af96ffc1..640b20e7c 100644
--- a/SOL005/VNFPackageManagement-API/ApiVersion.robot
+++ b/SOL005/VNFPackageManagement-API/ApiVersion.robot
@@ -1,212 +1,212 @@
-*** Settings ***
-
-Resource    environment/variables.txt
-Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=false
-Library    DependencyLibrary
-Library    JSONLibrary
-Library    JSONSchemaLibrary    schemas/
-
-*** Test Cases ***
-POST API Version - Method not implemented
-    [Documentation]    Test ID: 5.3.5.10.1
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version
-    [Documentation]    Test ID: 5.3.5.10.2
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version - Method not implemented
-    [Documentation]    Test ID: 5.3.5.10.3
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version - Method not implemented
-    [Documentation]    Test ID: 5.3.5.10.4
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version - Method not implemented
-    [Documentation]    Test ID: 5.3.5.10.5
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-	
-POST API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 5.3.5.10.6
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version with apiMajorVerion
-    [Documentation]    Test ID: 5.3.5.10.7
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 5.3.5.10.8
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 5.3.5.10.9
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 5.3.5.10.10
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-
-*** Keywords ***
-POST API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-POST API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings   ${response['status']}    ${expected_status}
-    Log    Status code validated 
-
-Check HTTP Response Body Json Schema Is
-    [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
-    Validate Json    ${schema}    ${response['body']}
+*** Settings ***
+
+Resource    environment/variables.txt
+Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=false
+Library    DependencyLibrary
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+
+*** Test Cases ***
+POST API Version - Method not implemented
+    [Documentation]    Test ID: 5.3.5.10.1
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version
+    [Documentation]    Test ID: 5.3.5.10.2
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version - Method not implemented
+    [Documentation]    Test ID: 5.3.5.10.3
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version - Method not implemented
+    [Documentation]    Test ID: 5.3.5.10.4
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version - Method not implemented
+    [Documentation]    Test ID: 5.3.5.10.5
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+	
+POST API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 5.3.5.10.6
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version with apiMajorVerion
+    [Documentation]    Test ID: 5.3.5.10.7
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 5.3.5.10.8
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 5.3.5.10.9
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 5.3.5.10.10
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+
+*** Keywords ***
+POST API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+POST API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings   ${response['status']}    ${expected_status}
+    Log    Status code validated 
+
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    ${schema} =    Catenate    ${input}    .schema.json
+    Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
-- 
GitLab


From de727c025cab7c44635a07edea0d302b4e813247 Mon Sep 17 00:00:00 2001
From: Najam UI Hassan <najam.hassan@xflowresearch.com>
Date: Thu, 19 Nov 2020 06:34:25 +0100
Subject: [PATCH 181/322] Update ApiVersion.robot

---
 .../ApiVersion.robot                          | 424 +++++++++---------
 1 file changed, 212 insertions(+), 212 deletions(-)

diff --git a/SOL005/NSPerformanceManagement-API/ApiVersion.robot b/SOL005/NSPerformanceManagement-API/ApiVersion.robot
index 8e6fa0beb..8b20e5a67 100644
--- a/SOL005/NSPerformanceManagement-API/ApiVersion.robot
+++ b/SOL005/NSPerformanceManagement-API/ApiVersion.robot
@@ -1,213 +1,213 @@
-*** Settings ***
-
-Resource    environment/variables.txt
-
-Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=false
-Library    DependencyLibrary
-Library    JSONLibrary
-Library    JSONSchemaLibrary    schemas/
-
-*** Test Cases ***
-POST API Version - Method not implemented
-    [Documentation]    Test ID: 5.3.4.10.1
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version
-    [Documentation]    Test ID: 5.3.4.9.2
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version - Method not implemented
-    [Documentation]    Test ID: 5.3.4.9.3
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version - Method not implemented
-    [Documentation]    Test ID: 5.3.4.9.4
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version - Method not implemented
-    [Documentation]    Test ID: 5.3.4.9.5
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-	
-POST API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 5.3.4.9.6
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none    
-    POST API Version
-	Check HTTP Response Status Code Is    405
-    
-GET API Version with apiMajorVerion
-    [Documentation]    Test ID: 5.3.4.9.7
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    GET API Version
-	Check HTTP Response Status Code Is    200
-	Check HTTP Response Body Json Schema Is    ApiVersionInformation
-
-PUT API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 5.3.4.9.8
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PUT API Version
-	Check HTTP Response Status Code Is    405
-
-PATCH API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 5.3.4.9.9
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    PATCH API Version
-	Check HTTP Response Status Code Is    405
-    
-DELETE API Version with apiMajorVerion - Method not implemented
-    [Documentation]    Test ID: 5.3.4.9.10
-    ...    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
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    DELETE API Version
-	Check HTTP Response Status Code Is    405
-
-*** Keywords ***
-POST API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-POST API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-GET API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PUT API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-PATCH API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-DELETE API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse} 
-	
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings    ${response['status']}    ${expected_status}
-    Log    Status code validated 
-
-Check HTTP Response Body Json Schema Is
-    [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
-    Validate Json    ${schema}    ${response['body']}
+*** Settings ***
+
+Resource    environment/variables.txt
+
+Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=false
+Library    DependencyLibrary
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+
+*** Test Cases ***
+POST API Version - Method not implemented
+    [Documentation]    Test ID: 5.3.4.10.1
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version
+    [Documentation]    Test ID: 5.3.4.9.2
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version - Method not implemented
+    [Documentation]    Test ID: 5.3.4.9.3
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version - Method not implemented
+    [Documentation]    Test ID: 5.3.4.9.4
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version - Method not implemented
+    [Documentation]    Test ID: 5.3.4.9.5
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+	
+POST API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 5.3.4.9.6
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    POST API Version
+	Check HTTP Response Status Code Is    405
+    
+GET API Version with apiMajorVerion
+    [Documentation]    Test ID: 5.3.4.9.7
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET API Version
+	Check HTTP Response Status Code Is    200
+	Check HTTP Response Body Json Schema Is    ApiVersionInformation
+
+PUT API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 5.3.4.9.8
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT API Version
+	Check HTTP Response Status Code Is    405
+
+PATCH API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 5.3.4.9.9
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH API Version
+	Check HTTP Response Status Code Is    405
+    
+DELETE API Version with apiMajorVerion - Method not implemented
+    [Documentation]    Test ID: 5.3.4.9.10
+    ...    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
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE API Version
+	Check HTTP Response Status Code Is    405
+
+*** Keywords ***
+POST API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+POST API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+GET API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PUT API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+PATCH API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+DELETE API Version with apiMajorVersion
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    ${schema} =    Catenate    ${input}    .schema.json
+    Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
-- 
GitLab


From bede9ed180a6f7eed868544d021cfe2d33b28097 Mon Sep 17 00:00:00 2001
From: uihassan <uihassan@etsi.org>
Date: Mon, 23 Nov 2020 17:41:56 +0500
Subject: [PATCH 182/322] Descriptors for 7.3.1.2.2

---
 .../IndividualVNFInstance.robot               |   1 +
 .../VnfLcmMntOperationKeywords.robot          |  30 ++++
 .../descriptors/vnf-b-1_VNF.yaml              | 169 ++++++++++++++++++
 .../environment/variables.txt                 |   5 +-
 4 files changed, 204 insertions(+), 1 deletion(-)
 create mode 100644 SOL003/VNFLifecycleManagement-API/descriptors/vnf-b-1_VNF.yaml

diff --git a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index cca928c20..cca0474cb 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
@@ -35,6 +35,7 @@ Get Information about an individual VNF Instance
     GET individual vnfInstance
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    vnfInstance
+    Check HTTP Response Body vnfInstance content against VNF Descriptor
     
 PUT Individual VNFInstance - Method not implemented 
     [Documentation]    Test ID: 7.3.1.2.3
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index f01d3b2d9..3daaa3131 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -8,6 +8,7 @@ Library    BuiltIn
 Library    JSONLibrary
 Library    Collections
 Library    JSONSchemaLibrary    schemas/
+Variables    descriptors/vnf-b-1_VNF.yaml
 
 *** Keywords ***
 Get Vnf Instance 
@@ -1180,3 +1181,32 @@ GET test endpoint
 Check HTTP Response Header Contain Link
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
+    
+Check HTTP Response Body vnfInstance content against VNF Descriptor
+    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001    ELSE    Parse SOL006
+    
+Parse SOL001
+    FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
+        Log    ${key}
+        ${check1}=    Run Keyword And Return Status    Should End With    ${key}    VNF
+        Run Keyword If     ${check1}     Set Global Variable    ${vnfKey}    ${key}   
+    END
+    
+    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
+    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
+    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
+    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
+    ${configurable_properties}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.configurable_properties}
+    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
+    
+    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${descriptor_id}
+    Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${provider}
+    Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${product_name}
+    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}
+    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
+    Should Be Equal As Strings    ${response['body']['vnfConfigurableProperties']}    ${configurable_properties}
+    Should Be Equal As Strings    ${response['body']['flavourId']}    ${flavour_id}
+    
+Parse SOL006
+    Log    SOL006 code
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/descriptors/vnf-b-1_VNF.yaml b/SOL003/VNFLifecycleManagement-API/descriptors/vnf-b-1_VNF.yaml
new file mode 100644
index 000000000..357d2b351
--- /dev/null
+++ b/SOL003/VNFLifecycleManagement-API/descriptors/vnf-b-1_VNF.yaml
@@ -0,0 +1,169 @@
+tosca_definitions_version: tosca_simple_yaml_1_2
+description: "TST010 reference VNF-B"
+metadata:
+  descriptor_id: "VNF-B"
+  vendor: "ETSI TST WG"
+  version: "2.0"
+topology_template:
+  substitution_mappings:
+    node_type: "tosca.nodes.nfv.VNF"
+    requirements:
+      virtual_link_management:
+        [management, virtual_link_management]
+      virtual_link_left:
+        [left, virtual_link_left]
+      virtual_link_right:
+        [right, virtual_link_right]
+  node_templates:
+    VDU-B-1:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-1-vcd"
+        descriptor: "Description of VDU-B-1"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 2
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 4096
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-1-vsd"
+    VDU-B-2:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-2-vcd"
+        descriptor: "Description of VDU-B-2"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 4
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 6144
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-2-vsd"
+    right:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 1
+      requirements:
+        virtual_link_right:
+        virtual_binding: VDU-B-2
+    management:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 0
+      requirements:
+        virtual_link_management:
+        virtual_binding: VDU-B-1
+    left:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 2
+      requirements:
+        virtual_link_left:
+        virtual_binding: VDU-B-1
+    internal_vl:
+      type: tosca.nodes.nfv.VnfVirtualLink
+      properties:
+        connectivity_type:
+          layer_protocols: [ ipv4 ]
+        description: Internal Virtual link in the VNF
+        vl_profile:
+          max_bitrate_requirements:
+            root: 100000
+            leaf: 20000
+          min_bitrate_requirements:
+            root: 10000
+            leaf: 10000
+    internal_vdu_b_1_cp:
+      type: tosca.nodes.nfv.VduCp
+      properties:
+        order: 2
+      requirements:
+        - virtual_binding: VDU-B-1
+        - virtual_link: internal_vl
+    internal_vdu_b_2_cp:
+      type: tosca.nodes.nfv.VduCp
+      properties:
+        order: 0
+      requirements:
+        - virtual_binding: VDU-B-2
+        - virtual_link: internal_vl
+    vdu-b-1-vsd:
+      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
+      properties:
+        virtual_block_storage_data:
+          size_of_storage: 20
+          rdma_enabled: false
+        sw_image_data:
+          name: "vdu-b-1 image"
+          version: "1.1"
+          checksum: 
+            algorithm: "sha-224"
+            hash: "somehashfortst010"
+          container_format: "bare"
+          disk-format: qcow2
+          min-disk: '1'
+          min-ram: '2'
+          size: '1'
+      artifacts:
+        sw_image:
+          type: tosca.artifacts.nfv.SwImage
+          file: vdu-b-1.qcow2
+    vdu-b-1-vsd:
+      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
+      properties:
+        virtual_block_storage_data:
+          size_of_storage: 20
+          rdma_enabled: false
+        sw_image_data:
+          name: "vdu-b-1 image"
+          version: "1.1"
+          checksum: 
+            algorithm: "sha-224"
+            hash: "somehashfortst010"
+          container_format: "bare"
+          disk-format: qcow2
+          min-disk: '1'
+          min-ram: '2'
+          size: '1'
+      artifacts:
+        sw_image:
+          type: tosca.artifacts.nfv.SwImage
+          file: vdu-b-2.qcow2
+    vnf_b_1_VNF:
+      type: "tosca.nodes.nfv.VNF"
+      properties:
+        descriptor_id: "VNF-B-2VDUs"
+        descriptor_version: "2.0"
+        provider: "ETSI TST WG"
+        product_name: "VNF-B-2VDUs"
+        software_version: "2.0"
+        product_info_name: "VNF-B-2VDUs"
+        product_info_description: "TST010 reference VNF-B with 2 VDUs"
+        flavour_id: "VNF-B-2VDU_flavor"
+        flavour_description: "VNF-B with 2 VDUs flavor"
+        vnfm_info: 
+          etsivnfm: 
+          - v2.3.1 
+        interfaces:
+            Vnflcm:
+              scale:
+                implementation: scale-example.yaml
+              terminate:
+                implementation: terminate-example.yaml
+              operate:
+                implementation: operate-example.yaml
+
diff --git a/SOL003/VNFLifecycleManagement-API/environment/variables.txt b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
index b08bdeff5..439c951a9 100644
--- a/SOL003/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
@@ -97,4 +97,7 @@ ${element}
 ${aspectId}
 ${scaleOutResponse}
 
-${callbackResp}    localhost
\ No newline at end of file
+${callbackResp}    localhost
+
+${descriptorType}    SOL001
+${vnfKey}    {}
\ No newline at end of file
-- 
GitLab


From 94a29637a68af60f86d66b973ca7b73d850b84d8 Mon Sep 17 00:00:00 2001
From: uihassan <uihassan@etsi.org>
Date: Wed, 25 Nov 2020 12:01:59 +0500
Subject: [PATCH 183/322] descriptors templating for 7.3.1.1.1 added

---
 .../VnfLcmMntOperationKeywords.robot          | 38 ++++++++++++++-----
 .../jsons/createVnfRequest.json               | 11 +++++-
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index 3daaa3131..68ffc12f2 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -124,7 +124,16 @@ Send VNF Instance Resource Create Request
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/createVnfRequest.json
+    Get key for VNF Descriptor
+    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
+    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
+    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
+    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
+    ${configurable_properties}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.configurable_properties}
+    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
+    ${template}=    Get File    jsons/createVnfRequest.json
+    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfProvider=${provider}    vnfProductName=${product_name}    vnfSoftwareVersion=${software_version}    vnfdVersion= ${descriptor_version}    vnfConfigurableProperties=${configurable_properties}    flavourId=${flavour_id}
     ${response}=    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances    ${body}
 
 Send VNF Instance Resource Delete Request
@@ -361,8 +370,16 @@ POST Create a new vnfInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get key for VNF Descriptor
+    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
+    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
+    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
+    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
+    ${configurable_properties}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.configurable_properties}
+    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
     ${template}=    Get File    jsons/createVnfRequest.json
-    ${body}=        Format String   ${template}     vnfdId=${vnfdId} 
+    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfProvider=${provider}    vnfProductName=${product_name}    vnfSoftwareVersion=${software_version}    vnfdVersion= ${descriptor_version}    vnfConfigurableProperties=${configurable_properties}    flavourId=${flavour_id}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
@@ -1186,11 +1203,7 @@ Check HTTP Response Body vnfInstance content against VNF Descriptor
     Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001    ELSE    Parse SOL006
     
 Parse SOL001
-    FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
-        Log    ${key}
-        ${check1}=    Run Keyword And Return Status    Should End With    ${key}    VNF
-        Run Keyword If     ${check1}     Set Global Variable    ${vnfKey}    ${key}   
-    END
+    Get key for VNF Descriptor
     
     ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
     ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
@@ -1206,7 +1219,14 @@ Parse SOL001
     Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}
     Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
     Should Be Equal As Strings    ${response['body']['vnfConfigurableProperties']}    ${configurable_properties}
-    Should Be Equal As Strings    ${response['body']['flavourId']}    ${flavour_id}
+    Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['flavourId']}    ${flavour_id}
     
 Parse SOL006
-    Log    SOL006 code
\ No newline at end of file
+    Log    SOL006 code
+    
+Get key for VNF Descriptor
+    FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
+        Log    ${key}
+        ${check1}=    Run Keyword And Return Status    Should End With    ${key}    VNF
+        Run Keyword If     ${check1}     Set Global Variable    ${vnfKey}    ${key}   
+    END
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/jsons/createVnfRequest.json b/SOL003/VNFLifecycleManagement-API/jsons/createVnfRequest.json
index 64ab8e55c..35c7f6f4a 100644
--- a/SOL003/VNFLifecycleManagement-API/jsons/createVnfRequest.json
+++ b/SOL003/VNFLifecycleManagement-API/jsons/createVnfRequest.json
@@ -1,6 +1,15 @@
 {{
-  "vnfdId": "{vnfdId}",
   "vnfInstanceName": "string",
   "vnfInstanceDescription": "string",
+  "vnfdId": "{vnfdId}",
+  "vnfProvider":"{vnfProvider}",
+  "vnfProductName":"{vnfProductName}",
+  "vnfSoftwareVersion":"{vnfSoftwareVersion}",
+  "vnfdVersion":"{vnfdVersion}",
+  "vnfConfigurableProperties":"{vnfConfigurableProperties}",
+  "instantiatedVnfInfo":{{
+  	"flavourId":"{flavourId}",
+  	"vnfState":"STARTED"
+  }}
   "metadata":{{}}
 }}
\ No newline at end of file
-- 
GitLab


From 65e0564d70c08c0183ab1e6218d95ab510077845 Mon Sep 17 00:00:00 2001
From: uihassan <uihassan@etsi.org>
Date: Wed, 25 Nov 2020 15:40:29 +0500
Subject: [PATCH 184/322] descriptor key check updated

---
 .../VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index 68ffc12f2..874fd3bba 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -1227,6 +1227,6 @@ Parse SOL006
 Get key for VNF Descriptor
     FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
         Log    ${key}
-        ${check1}=    Run Keyword And Return Status    Should End With    ${key}    VNF
+        ${check1}=    Run Keyword And Return Status    Should Be Equal As Strings    ${topology_template.node_templates.${key}.type}    tosca.nodes.nfv.VNF
         Run Keyword If     ${check1}     Set Global Variable    ${vnfKey}    ${key}   
     END
\ No newline at end of file
-- 
GitLab


From 9b34a0cf4e45b4692896ba19bb41b88d4514b295 Mon Sep 17 00:00:00 2001
From: uihassan <uihassan@etsi.org>
Date: Wed, 25 Nov 2020 17:43:47 +0500
Subject: [PATCH 185/322] optional descriptor attribute removed

---
 .../VnfLcmMntOperationKeywords.robot                         | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index 874fd3bba..eef1c2420 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -376,10 +376,9 @@ POST Create a new vnfInstance
     ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
     ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
     ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
-    ${configurable_properties}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.configurable_properties}
     ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
     ${template}=    Get File    jsons/createVnfRequest.json
-    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfProvider=${provider}    vnfProductName=${product_name}    vnfSoftwareVersion=${software_version}    vnfdVersion= ${descriptor_version}    vnfConfigurableProperties=${configurable_properties}    flavourId=${flavour_id}
+    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfProvider=${provider}    vnfProductName=${product_name}    vnfSoftwareVersion=${software_version}    vnfdVersion= ${descriptor_version}    flavourId=${flavour_id}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
@@ -1210,7 +1209,6 @@ Parse SOL001
     ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
     ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
     ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
-    ${configurable_properties}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.configurable_properties}
     ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
     
     Should Be Equal As Strings    ${response['body']['vnfdId']}    ${descriptor_id}
@@ -1218,7 +1216,6 @@ Parse SOL001
     Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${product_name}
     Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}
     Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
-    Should Be Equal As Strings    ${response['body']['vnfConfigurableProperties']}    ${configurable_properties}
     Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['flavourId']}    ${flavour_id}
     
 Parse SOL006
-- 
GitLab


From d76bd1e030cc41a357b48bce11e9839cdd57494d Mon Sep 17 00:00:00 2001
From: uihassan <uihassan@etsi.org>
Date: Fri, 27 Nov 2020 12:55:42 +0500
Subject: [PATCH 186/322] descriptors for SOL006 added

---
 .../VnfLcmMntOperationKeywords.robot          |  15 ++-
 .../descriptors/{ => SOL001}/vnf-b-1_VNF.yaml |   0
 .../reference_tst010_vnf_b_2df_SOL006.yaml    | 105 ++++++++++++++++++
 SOL003/VNFLifecycleManagement-API/validate.sh |   8 ++
 4 files changed, 126 insertions(+), 2 deletions(-)
 rename SOL003/VNFLifecycleManagement-API/descriptors/{ => SOL001}/vnf-b-1_VNF.yaml (100%)
 create mode 100644 SOL003/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
 create mode 100644 SOL003/VNFLifecycleManagement-API/validate.sh

diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index eef1c2420..78c7f4dcc 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -8,7 +8,7 @@ Library    BuiltIn
 Library    JSONLibrary
 Library    Collections
 Library    JSONSchemaLibrary    schemas/
-Variables    descriptors/vnf-b-1_VNF.yaml
+Variables    descriptors/SOL001/vnf-b-1_VNF.yaml
 
 *** Keywords ***
 Get Vnf Instance 
@@ -1219,7 +1219,18 @@ Parse SOL001
     Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['flavourId']}    ${flavour_id}
     
 Parse SOL006
-    Log    SOL006 code
+    #Log    SOL006 code
+     ${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}
+     ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
+     ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}
+     
+    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${descriptor_id}
+    Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${provider}
+    Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${product_name}
+    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}
+    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
     
 Get key for VNF Descriptor
     FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
diff --git a/SOL003/VNFLifecycleManagement-API/descriptors/vnf-b-1_VNF.yaml b/SOL003/VNFLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
similarity index 100%
rename from SOL003/VNFLifecycleManagement-API/descriptors/vnf-b-1_VNF.yaml
rename to SOL003/VNFLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
diff --git a/SOL003/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml b/SOL003/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
new file mode 100644
index 000000000..fe0909358
--- /dev/null
+++ b/SOL003/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
@@ -0,0 +1,105 @@
+nfv:
+  vnfd:
+    - id: VNF-B-2df
+      provider: ETSI TST WG
+      product-name: TST010 reference VNF-B with 2 DFs
+      software-version: '2.1'
+      version: '2.1'
+      vnfm-info: ETSI VNFM
+      vdu:
+        id: vdu-b-1
+        name: VNF-B VDU 1
+        int-cpd:
+          - id: left
+            layer-protocol: ethernet
+          - id: management
+            layer-protocol: ethernet
+          - id: right
+            layer-protocol: ethernet
+        virtual-compute-desc: vdu-b-1-vcd
+        virtual-storage-desc: vdu-b-1-vsd
+        sw-image-desc: vdu-b-1-image
+      virtual-compute-desc:
+        id: vdu-b-1-vcd
+        virtual-memory:
+          size: '4.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-1-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-1-image
+        name: VNF-B image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B.qcow2'
+      ext-cpd:
+        - id: ext-b-left
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: left
+          layer-protocol: ethernet
+        - id: management
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: management
+          layer-protocol: ethernet
+        - id: ext-b-right
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: right
+          layer-protocol: ethernet
+      df:
+        - id: small
+          vdu-profile:
+            id: vdu-b-1
+            min-number-of-instances: '1'
+            max-number-of-instances: '2'
+          instantiation-level:
+            - id: double
+              vdu-level:
+                vdu-id: vdu-b-1
+                number-of-instances: '2'
+            - id: single
+              vdu-level:
+                vdu-id: vdu-b-1
+                number-of-instances: '1'
+          default-instantiation-level: single
+          lcm-operations-configuration:
+            scale-vnf-to-level-op-config:
+              arbitrary-target-levels-supported: 'true'
+            terminate-vnf-op-config:
+              min-graceful-termination: '1'
+            operate-vnf-op-config:
+              min-graceful-stop-timeout: '1'
+        - id: big
+          vdu-profile:
+            id: vdu-b-1
+            min-number-of-instances: '1'
+            max-number-of-instances: '4'
+          instantiation-level:
+            - id: double
+              vdu-level:
+                vdu-id: vdu-b-1
+                number-of-instances: '2'
+            - id: triple
+              vdu-level:
+                vdu-id: vdu-b-1
+                number-of-instances: '3'
+          default-instantiation-level: double
+          lcm-operations-configuration:
+            scale-vnf-to-level-op-config:
+              arbitrary-target-levels-supported: 'true'
+            terminate-vnf-op-config:
+              min-graceful-termination: '1'
+            operate-vnf-op-config:
+              min-graceful-stop-timeout: '1'
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/validate.sh b/SOL003/VNFLifecycleManagement-API/validate.sh
new file mode 100644
index 000000000..5da698b57
--- /dev/null
+++ b/SOL003/VNFLifecycleManagement-API/validate.sh
@@ -0,0 +1,8 @@
+str=Keywords.robot;
+for i in *.robot ; do
+	[[ "$i" != *"$str"* ]] && \
+	echo "++++ Dryrun $i" && \
+	robot --dryrun --output NONE --report NONE --log NONE $i || \
+	echo "++++ Issues in file $i";
+done
+read  -n 1 -p "Input Selection:" mainmenuinput
\ No newline at end of file
-- 
GitLab


From b48988912795f3325a57e79a7fd1f1930f2fa24b Mon Sep 17 00:00:00 2001
From: uihassan <uihassan@etsi.org>
Date: Fri, 27 Nov 2020 12:56:31 +0500
Subject: [PATCH 187/322] validate.sh removed

---
 SOL003/VNFLifecycleManagement-API/validate.sh | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 SOL003/VNFLifecycleManagement-API/validate.sh

diff --git a/SOL003/VNFLifecycleManagement-API/validate.sh b/SOL003/VNFLifecycleManagement-API/validate.sh
deleted file mode 100644
index 5da698b57..000000000
--- a/SOL003/VNFLifecycleManagement-API/validate.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-str=Keywords.robot;
-for i in *.robot ; do
-	[[ "$i" != *"$str"* ]] && \
-	echo "++++ Dryrun $i" && \
-	robot --dryrun --output NONE --report NONE --log NONE $i || \
-	echo "++++ Issues in file $i";
-done
-read  -n 1 -p "Input Selection:" mainmenuinput
\ No newline at end of file
-- 
GitLab


From 4d92e1e26803b18ab14f3e81636f89a31d0242c7 Mon Sep 17 00:00:00 2001
From: uihassan <uihassan@etsi.org>
Date: Mon, 30 Nov 2020 18:05:53 +0500
Subject: [PATCH 188/322] added postcondition

---
 .../VNFPackageManagement-API/IndividualSubscription.robot  | 5 +++--
 .../VNFPackageManagementKeywords.robot                     | 7 ++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/SOL003/VNFPackageManagement-API/IndividualSubscription.robot b/SOL003/VNFPackageManagement-API/IndividualSubscription.robot
index 346b954dc..2219974bc 100644
--- a/SOL003/VNFPackageManagement-API/IndividualSubscription.robot
+++ b/SOL003/VNFPackageManagement-API/IndividualSubscription.robot
@@ -89,6 +89,7 @@ DELETE Individual VNF Package Subscription
     ...    Reference: Clause 10.4.8.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: none   
+    ...    Post-Conditions: The VNF Package Subscription is not available anymore in the NFVO      
     Send Delete request for individual VNF Package Subscription
-    Check HTTP Response Status Code Is    204
\ No newline at end of file
+    Check HTTP Response Status Code Is    204
+    Check Postcondition VNF Package Subscription is Deleted
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index dc0f8ccf4..88032d975 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -1519,4 +1519,9 @@ GET OnBoarded VNF Packages with fields and exclude_default attribute selector
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages?fields=${fields}&exclude_default
     ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
\ No newline at end of file
+    Set Suite Variable    ${response}    ${output}
+    
+Check Postcondition VNF Package Subscription is Deleted
+    Log    Check Postcondition Subscription is deleted
+    GET individual VNF Package Subscription
+    Check HTTP Response Status Code Is    404 
\ No newline at end of file
-- 
GitLab


From 20381ed63b36067099a1c6e67b1bef0959aba6c9 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Thu, 3 Dec 2020 15:27:22 +0100
Subject: [PATCH 189/322] fix variables

---
 .../IndividualReport.robot                       | 14 +++++++-------
 .../IndividualThreshold.robot                    | 16 ++++++++--------
 .../Thresholds.robot                             | 10 +++++-----
 .../VNFPerformanceManagementKeywords.robot       |  8 ++++----
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
index 89ad7952d..9f038e8bb 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
@@ -84,7 +84,7 @@ Get Individual Performance Report
     Log    Trying to get a performance report present in the VNFM
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -92,21 +92,21 @@ Get Individual Performance Report with invalid resource endpoint
     Log    Trying to get a performance report with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${erroneousReportId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${erroneousReportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for Individual Performance Report
     Log    Trying to create new performance report
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for Individual Performance Report
     Log    Trying to update performance report
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
@@ -116,7 +116,7 @@ Send Put request for Individual Performance Report
 Send Patch request for Individual Performance Report
     Log    Trying to update performance report
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
@@ -126,7 +126,7 @@ Send Patch request for Individual Performance Report
 Send Delete request for Individual Performance Report
     Log    Trying to delete performance report   
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -138,7 +138,7 @@ Check Postcondition VNF Individual Performance Report is not Created
     Log    Trying to get a new report
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
index 1a29cd867..d0e7bc390 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -115,7 +115,7 @@ GET Individual VNF Performance Threshold
     Log    Trying to get a Threhsold present in the VNFM
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -123,28 +123,28 @@ GET individual VNF Performance Threshold with invalid resource identifier
     Log    Trying to get a Threhsold with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${erroneousThresholdId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${erroneousThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual VNF Performance Threshold
     Log    Trying to delete a Threhsold in the VNFM
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual VNF Performance Threshold with invalid resource identifier
     Log    Trying to delete a Threhsold in the VNFM with invalid id
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${erroneousThresholdId}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${erroneousThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual VNF Performance Threshold
     Log    Trying to create new threshold
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${newThresholdId}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${newThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -152,7 +152,7 @@ Send Put request for individual VNF Performance Threshold
     Log    Trying to PUT threshold
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
@@ -163,10 +163,10 @@ Send Patch request for individual VNF Performance Threshold
     Log    Trying to PUT threshold
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PATCH    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
diff --git a/SOL002/VNFPerformanceManagement-API/Thresholds.robot b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
index e2618357b..5ed05061c 100644
--- a/SOL002/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
@@ -142,7 +142,7 @@ GET all Performance Thresholds
     Log    Trying to get all thresholds present in the VNFM    
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -150,7 +150,7 @@ GET Performance Thresholds with attribute-based filter
     Log    Trying to get thresholds present in the VNFM with filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds?${FILTER_OK}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds?${FILTER_OK}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -158,7 +158,7 @@ GET Performance Thresholds with invalid attribute-based filter
     Log    Trying to get thresholds present in the VNFM with invalid filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/thresholds?${FILTER_KO}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds?${FILTER_KO}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -166,7 +166,7 @@ GET VNF Performance Thresholds with invalid resource endpoint
     Log    Trying to get thresholds present in the VNFM with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/threshold
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/threshold
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -202,7 +202,7 @@ Send PATCH Request for all Performance Thresholds
 Send DELETE Request for all Performance Thresholds
     Log    DELETE THresholds
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/thresholds
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
diff --git a/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
index 564519f56..f7468404c 100644
--- a/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
+++ b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
@@ -21,7 +21,7 @@ Get all VNF Performance Subscriptions
     Set headers    {"Accept": "application/json"}
     Set headers    {"Content-Type": "application/json"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     # Integer    response status    200
@@ -40,7 +40,7 @@ Get all VNF Performance Subscriptions
     ...    request and response data structures, and response codes.
     Set headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ok}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ok}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     # Integer    response status    200
@@ -60,7 +60,7 @@ Get VNF Performance Subscriptions with invalid attribute-based filters
     ...    request and response data structures, and response codes.
     Set headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ko}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ko}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     # Integer    response status    400
@@ -79,7 +79,7 @@ Get VNF Performance Subscriptions with invalid resource endpoint
     ...    request and response data structures, and response codes.
     Set headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscription
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     # Integer    response status    404
-- 
GitLab


From 231f303450dbb57d4d766071668dfa99dd9b4d4d Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Thu, 3 Dec 2020 15:46:06 +0100
Subject: [PATCH 190/322] updated indexes

---
 indexes/sol_002_index.csv | 3 +++
 indexes/sol_003_index.csv | 6 ++++++
 indexes/sol_005_index.csv | 5 +++++
 3 files changed, 14 insertions(+)

diff --git a/indexes/sol_002_index.csv b/indexes/sol_002_index.csv
index 746258166..185a58417 100644
--- a/indexes/sol_002_index.csv
+++ b/indexes/sol_002_index.csv
@@ -18,6 +18,7 @@
 "6.3.3.5,	Individual Threshold Resource Endpoint	, IndividualThreshold.robot  "
 "6.3.3.8,	Notification Endpoint	, ../VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot    "
 6.3.3.9,API Version Resource Endpoint, ApiVersion.robot
+6.3.3.10, Notification Consumer Endpoint , ../VNFPerformanceManagement-API/NotificationConsumer.robot
 "6.3.4,	VNF Fault Management interface	, VNFFaultManagement-API"
 "6.3.4.1,	Alarms	, Alarms.robot  "
 "6.3.4.2,	Individual Alarm	, IndividualAlarm.robot"
@@ -26,6 +27,7 @@
 "6.3.4.5,	Individual Subscription	, IndividualSubscription.robot"
 "6.3.4.6,	Notification Endpoint	, NotificationEndpoint.robot"
 6.3.4.7,API Version Resource Endpoint, ApiVersion.robot
+6.3.4.8, Notification Consumer Endpoint , NotificationConsumer.robot
 "6.3.5,	VNF Lifecycle Management interface	, VNFLifecycleManagement-API"
 "6.3.5.1,	VNF Instances	, VNFInstances.robot"
 "6.3.5.2,	Individual VNFInstance	, IndividualVNFInstance.robot "
@@ -47,3 +49,4 @@
 "6.3.5.18,	Individual Subscription	, IndividualSubscription.robot"
 "6.3.5.19,	Notification Endpoint	, NotificationEndpoint.robot"
 6.3.5.20,API Version Resource Endpoint, ApiVersion.robot
+6.3.5.21, Notification Consumer Endpoint , NotificationConsumer.robot
diff --git a/indexes/sol_003_index.csv b/indexes/sol_003_index.csv
index b862493eb..5b4e3ab92 100644
--- a/indexes/sol_003_index.csv
+++ b/indexes/sol_003_index.csv
@@ -35,6 +35,7 @@
 7.3.1.33,Terminate a VNF Instance, TerminateVNFWorkflow.robot
 7.3.1.34,Notification Endpoint, NotificationEndpoint.robot
 7.3.1.35,API Version Resource Endpoint, ApiVersion.robot
+7.3.1.36,Notification Consumer Endpoint, NotificationConsumer.robot
 7.3.2,VNF Lifecycle Operation Granting Interface, VNFLifecycleOperationGranting-API
 7.3.2.1,Grants, Grants.robot
 7.3.2.2,Individual Grant, IndividualGrant.robot
@@ -49,6 +50,7 @@
 7.3.3.7,Individual Subscription Resource Endpoint, IndividualSubscription.robot
 7.3.3.8,Notification Endpoint, PackageManagementNotification.robot
 7.3.3.9,API Version Resource Endpoint, ApiVersion.robot
+7.3.3.10,Notification Consumer Endpoint, NotificationConsumer.robot
 7.3.4,VNF Performance Management Interface, VNFPerformanceManagement-API
 7.3.4.1,PM Jobs Resource Endpoint, PMJobs.robot
 7.3.4.2,Individual Pm Job Resource Endpoint, IndividualPmJob.robot
@@ -57,6 +59,7 @@
 7.3.4.5,Individual Threshold Resource Endpoint, IndividualThreshold.robot
 7.3.4.8,Notification Endpoint,  PerformanceManagementNotification.robot 
 7.3.4.9,API Version Resource Endpoint, ApiVersion.robot
+7.3.4.10,Notification Consumer Endpoint,  NotificationConsumer.robot 
 7.3.5,VNF Fault Management interface, VNFFaultManagement-API
 7.3.5.1,Alarms, Alarms.robot
 7.3.5.2,Individual Alarm, IndividualAlarm.robot 
@@ -64,6 +67,7 @@
 7.3.5.4,Individual Subscription, IndividualSubscription.robot
 7.3.5.5,Notification Endpoint, ../VNFFaultManagementNotification-API/NotificationEndpoint.robot
 7.3.5.6,API Version Resource Endpoint, ApiVersion.robot
+7.3.5.7,Notification Consumer Endpoint, NotificationConsumer.robot
 7.3.6,VNF Indicator Interface, VNFIndicator-API
 7.3.6.1,VNF Indicators Resource Endpoint, VNFIndicators.robot
 7.3.6.2,VNF Indicators Related to a VNF Instance Resource Endpoint, VnfIndicatorsInVnfInstanceId.robot
@@ -72,7 +76,9 @@
 7.3.6.5,Individual Subscription Resource Endpoint, IndividualSubscription.robot
 7.3.6.6,Notification Endpoint, VnfIndicatorNotification.robot
 7.3.6.7,API Version Resource Endpoint, ApiVersion.robot
+7.3.6.8,Notification Endpoint, NotificationConsumer.robot
 7.3.7,Virtualised Resources Quota Available Notification interface, VirtualisedResourcesQuotaAvailableNotification-API
 7.3.7.1,Subscriptions, Subscriptions.robot
 7.3.7.2,Individual Subscription, IndividualSubscription.robot
 7.3.7.3,API Version Resource Endpoint, ApiVersion.robot
+7.3.7.4,Notification Consumer Endpoint, NotificationConsumer.robot
diff --git a/indexes/sol_005_index.csv b/indexes/sol_005_index.csv
index cc95f0ea7..97b601390 100644
--- a/indexes/sol_005_index.csv
+++ b/indexes/sol_005_index.csv
@@ -10,6 +10,7 @@
 5.3.1.8,Individual Subscription Resource Endpoint, IndividualSubscription.robot
 5.3.1.9,Notifications Endpoint, NSDManagementNotification.robot
 5.3.1.10,API Version Resource Endpoint, ApiVersion.robot
+5.3.1.11,Notifications Consumer Endpoint, NotificationConsumer.robot
 5.3.2,NS Lifecycle Management interface, NSLifecycleManagement-API
 5.3.2.1,NsInstances, NSInstances.robot
 5.3.2.2,Individual NSInstance, IndividualNSInstance.robot
@@ -36,6 +37,7 @@
 5.3.2.23, Terminate Flow of NS lifecycle management operations, TerminateNSTaskWorkflow.robot
 5.3.2.24, Update Flow of NS lifecycle management operations, UpdateNSTaskWorkflow.robot
 5.3.2.25,API Version Resource Endpoint, ApiVersion.robot
+5.3.2.26,Notification Consumer Endpoint, NotificationConsumer.robot
 5.3.3,NS Fault Management interface, NSFaultManagement-API
 5.3.3.1,Alarms, Alarms.robot
 5.3.3.2,Individual Alarm, IndividualAlarm.robot
@@ -43,6 +45,7 @@
 5.3.3.4,Individual Subscription, IndividualSubscription.robot
 5.3.3.5,Notification Endpoint, NotificationEndpoint.robot
 5.3.3.6,API Version Resource Endpoint, ApiVersion.robot
+5.3.3.7,Notification Consumer Endpoint, NotificationConsumer.robot
 5.3.4,NS Performance Management interface, NSPerformanceManagement-API
 5.3.4.1,PM Jobs Resource Endpoint, PMJobs.robot
 5.3.4.2,Individual PM Job Resource Endpoint, IndividualPmJob.robot
@@ -53,6 +56,7 @@
 5.3.4.7,Individual Subscription Resource Endpoint, IndividualSubscription.robot
 5.3.4.8,Notifications Endpoint, Notifications.robot
 5.3.4.9,API Version Resource Endpoint, ApiVersion.robot
+5.3.4.10,Notifications Consumer Endpoint, NotificationConsumer.robot
 5.3.5,VNF Package Management interface, VNFPackageManagement-API
 5.3.5.1,VNF Packages Resource Endpoint, VNFPackages.robot
 5.3.5.2,Individual VNF Package Resource Endpoint, IndividualVNFPackage.robot
@@ -64,3 +68,4 @@
 5.3.5.8,Individual Subscription Resource Endpoint, IndividualSubscription.robot
 5.3.5.9,Notifications Endpoint, Notifications.robot
 5.3.5.10,API Version Resource Endpoint, ApiVersion.robot
+5.3.5.11,Notifications Consumer Endpoint, NotificationConsumer.robot
-- 
GitLab


From 1f334ee8f1b9f7cbaa87afc9233df6602abe0bff Mon Sep 17 00:00:00 2001
From: uihassan <uihassan@etsi.org>
Date: Sun, 6 Dec 2020 08:15:08 +0500
Subject: [PATCH 191/322] Descriptors for 7.3.1.2.4 added

---
 .../VnfLcmMntOperationKeywords.robot                  |  7 ++++++-
 .../jsons/createVnfRequest.json                       |  1 -
 .../jsons/patchBodyRequest.json                       | 11 +++++++----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index 78c7f4dcc..306f854c0 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -508,10 +508,15 @@ PATCH individual vnfInstance
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE_PATCH}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/patchBodyRequest.json
+    Get key for VNF Descriptor
+    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
+    ${template}=    Get File    jsons/patchBodyRequest.json
+    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfdVersion= ${descriptor_version}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}    ${body}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
+	
 DELETE individual vnfInstance
     log    Trying to delete an individual VNF instance
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
diff --git a/SOL003/VNFLifecycleManagement-API/jsons/createVnfRequest.json b/SOL003/VNFLifecycleManagement-API/jsons/createVnfRequest.json
index 35c7f6f4a..fddfd7911 100644
--- a/SOL003/VNFLifecycleManagement-API/jsons/createVnfRequest.json
+++ b/SOL003/VNFLifecycleManagement-API/jsons/createVnfRequest.json
@@ -6,7 +6,6 @@
   "vnfProductName":"{vnfProductName}",
   "vnfSoftwareVersion":"{vnfSoftwareVersion}",
   "vnfdVersion":"{vnfdVersion}",
-  "vnfConfigurableProperties":"{vnfConfigurableProperties}",
   "instantiatedVnfInfo":{{
   	"flavourId":"{flavourId}",
   	"vnfState":"STARTED"
diff --git a/SOL003/VNFLifecycleManagement-API/jsons/patchBodyRequest.json b/SOL003/VNFLifecycleManagement-API/jsons/patchBodyRequest.json
index 0c8845c21..679cc4c7f 100644
--- a/SOL003/VNFLifecycleManagement-API/jsons/patchBodyRequest.json
+++ b/SOL003/VNFLifecycleManagement-API/jsons/patchBodyRequest.json
@@ -1,4 +1,7 @@
-{
-  "vnfInstanceName": "vnf new name",
-  "vnfInstanceDescription": "new description"
-}
\ No newline at end of file
+{{
+  "vnfInstanceName": "vnf string",
+  "vnfInstanceDescription": "string",
+  "vnfdId": "{vnfdId}",
+  "vnfdVersion":"{vnfdVersion}",
+  "metadata":{{}}
+}}
\ No newline at end of file
-- 
GitLab


From 14efcd9e34ec9d1072ef1bbe2d4242fec0c6c2ce Mon Sep 17 00:00:00 2001
From: Michele Carignani <michele.carignani@etsi.org>
Date: Sun, 6 Dec 2020 18:02:46 +0100
Subject: [PATCH 192/322] extend build script with generation of document
 annexes

---
 scripts/docker/Dockerfile | 21 ++++++++++++++++-----
 scripts/run-container.sh  |  4 +++-
 scripts/validate.sh       |  9 ++++++++-
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
index de313e6db..e6130d455 100644
--- a/scripts/docker/Dockerfile
+++ b/scripts/docker/Dockerfile
@@ -12,12 +12,10 @@ ARG ssh_prv_key
 RUN DEBIAN_FRONTEND=noninteractive apt update \
 	&& apt install python3 git -y \
 	&& apt install python3-pip -y \
-        && apt install openssh-server -y \
     && DEBIAN_FRONTEND=noninteractive apt-get autoremove --purge -y \
     && DEBIAN_FRONTEND=noninteractive apt-get autoclean \
     && rm -rf /var/lib/apt/lists/*
 
-
 RUN echo "docker-robot-STF583" > /etc/hostname \
     && echo "root:etsi" | chpasswd
 
@@ -26,7 +24,6 @@ RUN useradd --create-home --shell /bin/bash --user-group etsi --groups sudo \
     && adduser etsi sudo \
     && echo "etsi ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
 
-
 RUN DEBIAN_FRONTEND=noninteractive \
         && mkdir -p /home/etsi/dev/robot \
         && cd /home/etsi/dev/robot 
@@ -37,16 +34,30 @@ RUN DEBIAN_FRONTEND=noninteractive \
         && cd /home/etsi/dev/robot \
 	&& git clone https://github.com/etsi-cti-admin/robotframework-mockserver 
 
-ADD . /home/etsi/dev/robot
+ADD requirements.txt /home/etsi/dev/robot/
+ADD extensions /home/etsi/dev/robot/extensions
+
+RUN ls /home/etsi/dev/robot
 
 RUN DEBIAN_FRONTEND=noninteractive \
 	&& cd /home/etsi/dev/robot \
 	&& pip3 install -r requirements.txt \
-	&& chmod +x /home/etsi/dev/robot/scripts/* \
 	&& cd  robotframework-mockserver \
 	&& patch -p1 < ../extensions/mockserverlibrary.patch \
 	&& python3 -m pip install -e .
 
+RUN DEBIAN_FRONTED=noninteractive \
+	cd /home/etsi/dev/ \
+	mkdir -p build \
+	&& git clone https://forge.etsi.org/rep/forge-tools/robot2doc.git \
+	&& cd robot2doc \
+	&& pip3 install -r requirements.txt \
+	&& python3 -m pip install -e .
+
+ADD . /home/etsi/dev/robot
+
+RUN	chmod +x /home/etsi/dev/robot/scripts/*
+
 CMD tail -f /dev/null
 
 
diff --git a/scripts/run-container.sh b/scripts/run-container.sh
index 089cd2d86..3baa3169c 100644
--- a/scripts/run-container.sh
+++ b/scripts/run-container.sh
@@ -5,7 +5,9 @@
 #set -e
 #set -vx
 
-docker run stf583-rf-validation:latest "bash" \
+mkdir -p build
+
+docker run -v $(pwd)/build:/home/etsi/dev/build stf583-rf-validation:latest "bash" \
 	-c  "/home/etsi/dev/robot/scripts/validate.sh"
 
 ret=$? 
diff --git a/scripts/validate.sh b/scripts/validate.sh
index ef8b77531..ae06e2ea0 100644
--- a/scripts/validate.sh
+++ b/scripts/validate.sh
@@ -17,4 +17,11 @@ for i in */*/*.robot ; do
     fi
 done
 
-exit $res
+cd /home/etsi/dev/robot2doc/robot2doc
+
+mkdir -p /home/etsi/dev/build
+
+python3 create_sols.py ../../robot 'local' ../../build
+res2=$?
+
+exit $res && $res2
-- 
GitLab


From 5d7a4377727c856d1080516c81d50e857c19b03f Mon Sep 17 00:00:00 2001
From: Michele Carignani <michele.carignani@etsi.org>
Date: Sun, 6 Dec 2020 18:16:43 +0100
Subject: [PATCH 193/322] escape mounted dir for container

---
 scripts/run-container.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/run-container.sh b/scripts/run-container.sh
index 3baa3169c..c0ea09699 100644
--- a/scripts/run-container.sh
+++ b/scripts/run-container.sh
@@ -7,7 +7,7 @@
 
 mkdir -p build
 
-docker run -v $(pwd)/build:/home/etsi/dev/build stf583-rf-validation:latest "bash" \
+docker run -v "$(pwd)/build:/home/etsi/dev/build" stf583-rf-validation:latest "bash" \
 	-c  "/home/etsi/dev/robot/scripts/validate.sh"
 
 ret=$? 
-- 
GitLab


From 25c4d86e713cefcb3d6a46ab0b45acd25fda502d Mon Sep 17 00:00:00 2001
From: bernini <g.bernini@nextworks.it>
Date: Mon, 7 Dec 2020 12:51:46 +0100
Subject: [PATCH 194/322] Update sol_002_index.csv

---
 indexes/sol_002_index.csv | 88 +++++++++++++++++++--------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/indexes/sol_002_index.csv b/indexes/sol_002_index.csv
index 185a58417..8bc2ee497 100644
--- a/indexes/sol_002_index.csv
+++ b/indexes/sol_002_index.csv
@@ -1,52 +1,52 @@
-"6,	Ve-Vnfm Reference Point, SOL002 "
-"6.3.1,	VNF Configuration Interface	, VNFConfiguration-API    "
-"6.3.1.1,	Configuration Resource Endpoint	, Configuration.robot"
+6,	Ve-Vnfm Reference Point, SOL002
+6.3.1,	VNF Configuration Interface	, VNFConfiguration-API
+6.3.1.1,	Configuration Resource Endpoint	, Configuration.robot
 6.3.1.2,API Version Resource Endpoint, ApiVersion.robot
-"6.3.2,	VNF Indicator Interface	, VNFIndicator-API"
-"6.3.2.1,	VNF Indicators Resource Endpoint	, VNFIndicators.robot"
-"6.3.2.2,	VNF Indicators related to a VNF Instance Resource Endpoint	, VnfIndicatorsInVnfInstanceId.robot "
-"6.3.2.3,	Individual VNF Indicator Resource Endpoit,IndividualVNFindicator.robot"
-"6.3.2.4,	Subscriptions Resource Endpoint	, Subscriptions.robot"
-"6.3.2.5,	Individual Subscription Resource Endpoint	, IndividualSubscription.robot"
-"6.3.2.6,	Notification Endpoint	, ../VNFIndicatorNotification-API/VnfIndicatorNotification.robot"
+6.3.2,	VNF Indicator Interface	, VNFIndicator-API
+6.3.2.1,	VNF Indicators Resource Endpoint	, VNFIndicators.robot
+6.3.2.2,	VNF Indicators related to a VNF Instance Resource Endpoint	, VnfIndicatorsInVnfInstanceId.robot 
+6.3.2.3,	Individual VNF Indicator Resource Endpoit,IndividualVNFindicator.robot
+6.3.2.4,	Subscriptions Resource Endpoint	, Subscriptions.robot
+6.3.2.5,	Individual Subscription Resource Endpoint	, IndividualSubscription.robot
+6.3.2.6,	Notification Endpoint	, ../VNFIndicatorNotification-API/VnfIndicatorNotification.robot
 6.3.2.7,API Version Resource Endpoint, ApiVersion.robot
-"6.3.3,	VNF Performance Management Interface	, VNFPerformanceManagement-API"
-"6.3.3.1,	PM Jobs Resource Endpoint	, PMJobs.robot   "
-"6.3.3.2,	Individual PM Job Resource Endpoint	, IndividualPmJob.robot "
-"6.3.3.3,	Individual Performance Report Resource Endpoint	, IndividualReport.robot"
-"6.3.3.4,	Thresholds Resource Endpoint	, Thresholds.robot"
-"6.3.3.5,	Individual Threshold Resource Endpoint	, IndividualThreshold.robot  "
-"6.3.3.8,	Notification Endpoint	, ../VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot    "
+6.3.3,	VNF Performance Management Interface	, VNFPerformanceManagement-API
+6.3.3.1,	PM Jobs Resource Endpoint	, PMJobs.robot   
+6.3.3.2,	Individual PM Job Resource Endpoint	, IndividualPmJob.robot 
+6.3.3.3,	Individual Performance Report Resource Endpoint	, IndividualReport.robot
+6.3.3.4,	Thresholds Resource Endpoint	, Thresholds.robot
+6.3.3.5,	Individual Threshold Resource Endpoint	, IndividualThreshold.robot  
+6.3.3.8,	Notification Endpoint	, ../VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot    
 6.3.3.9,API Version Resource Endpoint, ApiVersion.robot
 6.3.3.10, Notification Consumer Endpoint , ../VNFPerformanceManagement-API/NotificationConsumer.robot
-"6.3.4,	VNF Fault Management interface	, VNFFaultManagement-API"
-"6.3.4.1,	Alarms	, Alarms.robot  "
-"6.3.4.2,	Individual Alarm	, IndividualAlarm.robot"
-"6.3.4.3,	Escalate the perceived severity	, EscalatePerceivedSeverityTask.robot"
-"6.3.4.4,	Subscriptions	, Subscriptions.robot"
-"6.3.4.5,	Individual Subscription	, IndividualSubscription.robot"
-"6.3.4.6,	Notification Endpoint	, NotificationEndpoint.robot"
+6.3.4,	VNF Fault Management interface	, VNFFaultManagement-API
+6.3.4.1,	Alarms	, Alarms.robot  
+6.3.4.2,	Individual Alarm	, IndividualAlarm.robot
+6.3.4.3,	Escalate the perceived severity	, EscalatePerceivedSeverityTask.robot
+6.3.4.4,	Subscriptions	, Subscriptions.robot
+6.3.4.5,	Individual Subscription	, IndividualSubscription.robot
+6.3.4.6,	Notification Endpoint	, NotificationEndpoint.robot
 6.3.4.7,API Version Resource Endpoint, ApiVersion.robot
 6.3.4.8, Notification Consumer Endpoint , NotificationConsumer.robot
-"6.3.5,	VNF Lifecycle Management interface	, VNFLifecycleManagement-API"
-"6.3.5.1,	VNF Instances	, VNFInstances.robot"
-"6.3.5.2,	Individual VNFInstance	, IndividualVNFInstance.robot "
-"6.3.5.3,	Instantiate VNF Task	, InstantiateVNFTask.robot"
-"6.3.5.4,	Scale VNF Task	, ScaleVNFTask.robot  "
-"6.3.5.5,	Scale a VNF to level Task	, ScaleVNFToLevelTask.robot    "
-"6.3.5.6,	Change VNF deployment flavour Task	, ChangeVNFFlavourTask.robot "
-"6.3.5.7,	Terminate VNF Task	, TerminateVNFTask.robot"
-"6.3.5.8,	Heal VNF Task	, HealVNFTask.robot "
-"6.3.5.9,	Operate VNF Task	, OperateVNFTask.robot"
-"6.3.5.10,	Change external VNF connectivity	, ChangeExternalVNFConnectivityTask.robot  "
-"6.3.5.11,	VNF LCM OP occurrences	, VnfLcmOperationOccurences.robot"
-"6.3.5.12,	Individual VNF LCM OP occurrence	, IndividualVnfLcmOperationOccurence.robot  "
-"6.3.5.13,	Retry operation task	, RetryOperationTask.robot"
-"6.3.5.14,	Rollback operation task	, RollbackOperationTask.robot  "
-"6.3.5.15,	Fail operation task	, FailOperationTask.robot "
-"6.3.5.16,	Cancel operation task	, CancelOperationTask.robot"
-"6.3.5.17,	Subscriptions	, Subscriptions.robot"
-"6.3.5.18,	Individual Subscription	, IndividualSubscription.robot"
-"6.3.5.19,	Notification Endpoint	, NotificationEndpoint.robot"
+6.3.5,	VNF Lifecycle Management interface	, VNFLifecycleManagement-API
+6.3.5.1,	VNF Instances	, VNFInstances.robot
+6.3.5.2,	Individual VNFInstance	, IndividualVNFInstance.robot 
+6.3.5.3,	Instantiate VNF Task	, InstantiateVNFTask.robot
+6.3.5.4,	Scale VNF Task	, ScaleVNFTask.robot  
+6.3.5.5,	Scale a VNF to level Task	, ScaleVNFToLevelTask.robot    
+6.3.5.6,	Change VNF deployment flavour Task	, ChangeVNFFlavourTask.robot 
+6.3.5.7,	Terminate VNF Task	, TerminateVNFTask.robot
+6.3.5.8,	Heal VNF Task	, HealVNFTask.robot 
+6.3.5.9,	Operate VNF Task	, OperateVNFTask.robot
+6.3.5.10,	Change external VNF connectivity	, ChangeExternalVNFConnectivityTask.robot
+6.3.5.11,	VNF LCM OP occurrences	, VnfLcmOperationOccurences.robot
+6.3.5.12,	Individual VNF LCM OP occurrence	, IndividualVnfLcmOperationOccurence.robot
+6.3.5.13,	Retry operation task	, RetryOperationTask.robot
+6.3.5.14,	Rollback operation task	, RollbackOperationTask.robot
+6.3.5.15,	Fail operation task	, FailOperationTask.robot
+6.3.5.16,	Cancel operation task	, CancelOperationTask.robot
+6.3.5.17,	Subscriptions	, Subscriptions.robot
+6.3.5.18,	Individual Subscription	, IndividualSubscription.robot
+6.3.5.19,	Notification Endpoint	, NotificationEndpoint.robot
 6.3.5.20,API Version Resource Endpoint, ApiVersion.robot
 6.3.5.21, Notification Consumer Endpoint , NotificationConsumer.robot
-- 
GitLab


From 02e0910d3d39dfb9af62798050443b7c783dc303 Mon Sep 17 00:00:00 2001
From: bernini <g.bernini@nextworks.it>
Date: Mon, 7 Dec 2020 12:55:07 +0100
Subject: [PATCH 195/322] Update sol_002_index.csv

---
 indexes/sol_002_index.csv | 104 +++++++++++++++++++-------------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/indexes/sol_002_index.csv b/indexes/sol_002_index.csv
index 8bc2ee497..f3f3a78f3 100644
--- a/indexes/sol_002_index.csv
+++ b/indexes/sol_002_index.csv
@@ -1,52 +1,52 @@
-6,	Ve-Vnfm Reference Point, SOL002
-6.3.1,	VNF Configuration Interface	, VNFConfiguration-API
-6.3.1.1,	Configuration Resource Endpoint	, Configuration.robot
-6.3.1.2,API Version Resource Endpoint, ApiVersion.robot
-6.3.2,	VNF Indicator Interface	, VNFIndicator-API
-6.3.2.1,	VNF Indicators Resource Endpoint	, VNFIndicators.robot
-6.3.2.2,	VNF Indicators related to a VNF Instance Resource Endpoint	, VnfIndicatorsInVnfInstanceId.robot 
-6.3.2.3,	Individual VNF Indicator Resource Endpoit,IndividualVNFindicator.robot
-6.3.2.4,	Subscriptions Resource Endpoint	, Subscriptions.robot
-6.3.2.5,	Individual Subscription Resource Endpoint	, IndividualSubscription.robot
-6.3.2.6,	Notification Endpoint	, ../VNFIndicatorNotification-API/VnfIndicatorNotification.robot
-6.3.2.7,API Version Resource Endpoint, ApiVersion.robot
-6.3.3,	VNF Performance Management Interface	, VNFPerformanceManagement-API
-6.3.3.1,	PM Jobs Resource Endpoint	, PMJobs.robot   
-6.3.3.2,	Individual PM Job Resource Endpoint	, IndividualPmJob.robot 
-6.3.3.3,	Individual Performance Report Resource Endpoint	, IndividualReport.robot
-6.3.3.4,	Thresholds Resource Endpoint	, Thresholds.robot
-6.3.3.5,	Individual Threshold Resource Endpoint	, IndividualThreshold.robot  
-6.3.3.8,	Notification Endpoint	, ../VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot    
-6.3.3.9,API Version Resource Endpoint, ApiVersion.robot
-6.3.3.10, Notification Consumer Endpoint , ../VNFPerformanceManagement-API/NotificationConsumer.robot
-6.3.4,	VNF Fault Management interface	, VNFFaultManagement-API
-6.3.4.1,	Alarms	, Alarms.robot  
-6.3.4.2,	Individual Alarm	, IndividualAlarm.robot
-6.3.4.3,	Escalate the perceived severity	, EscalatePerceivedSeverityTask.robot
-6.3.4.4,	Subscriptions	, Subscriptions.robot
-6.3.4.5,	Individual Subscription	, IndividualSubscription.robot
-6.3.4.6,	Notification Endpoint	, NotificationEndpoint.robot
-6.3.4.7,API Version Resource Endpoint, ApiVersion.robot
-6.3.4.8, Notification Consumer Endpoint , NotificationConsumer.robot
-6.3.5,	VNF Lifecycle Management interface	, VNFLifecycleManagement-API
-6.3.5.1,	VNF Instances	, VNFInstances.robot
-6.3.5.2,	Individual VNFInstance	, IndividualVNFInstance.robot 
-6.3.5.3,	Instantiate VNF Task	, InstantiateVNFTask.robot
-6.3.5.4,	Scale VNF Task	, ScaleVNFTask.robot  
-6.3.5.5,	Scale a VNF to level Task	, ScaleVNFToLevelTask.robot    
-6.3.5.6,	Change VNF deployment flavour Task	, ChangeVNFFlavourTask.robot 
-6.3.5.7,	Terminate VNF Task	, TerminateVNFTask.robot
-6.3.5.8,	Heal VNF Task	, HealVNFTask.robot 
-6.3.5.9,	Operate VNF Task	, OperateVNFTask.robot
-6.3.5.10,	Change external VNF connectivity	, ChangeExternalVNFConnectivityTask.robot
-6.3.5.11,	VNF LCM OP occurrences	, VnfLcmOperationOccurences.robot
-6.3.5.12,	Individual VNF LCM OP occurrence	, IndividualVnfLcmOperationOccurence.robot
-6.3.5.13,	Retry operation task	, RetryOperationTask.robot
-6.3.5.14,	Rollback operation task	, RollbackOperationTask.robot
-6.3.5.15,	Fail operation task	, FailOperationTask.robot
-6.3.5.16,	Cancel operation task	, CancelOperationTask.robot
-6.3.5.17,	Subscriptions	, Subscriptions.robot
-6.3.5.18,	Individual Subscription	, IndividualSubscription.robot
-6.3.5.19,	Notification Endpoint	, NotificationEndpoint.robot
-6.3.5.20,API Version Resource Endpoint, ApiVersion.robot
-6.3.5.21, Notification Consumer Endpoint , NotificationConsumer.robot
+6,Ve-Vnfm Reference Point, SOL002
+6.3.1,VNF Configuration Interface,VNFConfiguration-API
+6.3.1.1,Configuration Resource Endpoint,Configuration.robot
+6.3.1.2,API Version Resource Endpoint,ApiVersion.robot
+6.3.2,	VNF Indicator Interface,VNFIndicator-API
+6.3.2.1,VNF Indicators Resource Endpoint,VNFIndicators.robot
+6.3.2.2,VNF Indicators related to a VNF Instance Resource Endpoint,VnfIndicatorsInVnfInstanceId.robot 
+6.3.2.3,Individual VNF Indicator Resource Endpoit,IndividualVNFindicator.robot
+6.3.2.4,Subscriptions Resource Endpoint,Subscriptions.robot
+6.3.2.5,Individual Subscription Resource Endpoint,IndividualSubscription.robot
+6.3.2.6,Notification Endpoint,../VNFIndicatorNotification-API/VnfIndicatorNotification.robot
+6.3.2.7,API Version Resource Endpoint,ApiVersion.robot
+6.3.3,VNF Performance Management Interface,VNFPerformanceManagement-API
+6.3.3.1,PM Jobs Resource Endpoint,PMJobs.robot   
+6.3.3.2,Individual PM Job Resource Endpoint,IndividualPmJob.robot 
+6.3.3.3,Individual Performance Report Resource Endpoint,IndividualReport.robot
+6.3.3.4,Thresholds Resource Endpoint,Thresholds.robot
+6.3.3.5,Individual Threshold Resource Endpoint,IndividualThreshold.robot  
+6.3.3.8,Notification Endpoint,../VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot    
+6.3.3.9,API Version Resource Endpoint,ApiVersion.robot
+6.3.3.10, Notification Consumer Endpoint,../VNFPerformanceManagement-API/NotificationConsumer.robot
+6.3.4,VNF Fault Management interface,VNFFaultManagement-API
+6.3.4.1,Alarms,Alarms.robot  
+6.3.4.2,Individual Alarm,IndividualAlarm.robot
+6.3.4.3,Escalate the perceived severity,EscalatePerceivedSeverityTask.robot
+6.3.4.4,Subscriptions,Subscriptions.robot
+6.3.4.5,Individual Subscription,IndividualSubscription.robot
+6.3.4.6,Notification Endpoint,NotificationEndpoint.robot
+6.3.4.7,API Version Resource Endpoint,ApiVersion.robot
+6.3.4.8,Notification Consumer Endpoint,NotificationConsumer.robot
+6.3.5,VNF Lifecycle Management interface,VNFLifecycleManagement-API
+6.3.5.1,VNF Instances,VNFInstances.robot
+6.3.5.2,Individual VNFInstance,IndividualVNFInstance.robot 
+6.3.5.3,Instantiate VNF Task,InstantiateVNFTask.robot
+6.3.5.4,Scale VNF Task,ScaleVNFTask.robot  
+6.3.5.5,Scale a VNF to level Task,ScaleVNFToLevelTask.robot    
+6.3.5.6,Change VNF deployment flavour Task,ChangeVNFFlavourTask.robot 
+6.3.5.7,Terminate VNF Task,TerminateVNFTask.robot
+6.3.5.8,Heal VNF Task,HealVNFTask.robot 
+6.3.5.9,Operate VNF Task,OperateVNFTask.robot
+6.3.5.10,Change external VNF connectivity,ChangeExternalVNFConnectivityTask.robot
+6.3.5.11,VNF LCM OP occurrences,VnfLcmOperationOccurences.robot
+6.3.5.12,Individual VNF LCM OP occurrence,IndividualVnfLcmOperationOccurence.robot
+6.3.5.13,Retry operation task,RetryOperationTask.robot
+6.3.5.14,Rollback operation task,RollbackOperationTask.robot
+6.3.5.15,Fail operation task,FailOperationTask.robot
+6.3.5.16,Cancel operation task,CancelOperationTask.robot
+6.3.5.17,Subscriptions,Subscriptions.robot
+6.3.5.18,Individual Subscription,IndividualSubscription.robot
+6.3.5.19,Notification Endpoint,NotificationEndpoint.robot
+6.3.5.20,API Version Resource Endpoint,ApiVersion.robot
+6.3.5.21,Notification Consumer Endpoint,NotificationConsumer.robot
-- 
GitLab


From 5e1bc164993fb5c1edb025263a83d548e50dd6a4 Mon Sep 17 00:00:00 2001
From: bernini <g.bernini@nextworks.it>
Date: Mon, 7 Dec 2020 13:01:45 +0100
Subject: [PATCH 196/322] Update sol_005_index.csv

---
 indexes/sol_005_index.csv | 146 ++++++++++++++++++++------------------
 1 file changed, 75 insertions(+), 71 deletions(-)

diff --git a/indexes/sol_005_index.csv b/indexes/sol_005_index.csv
index 97b601390..f727f54bd 100644
--- a/indexes/sol_005_index.csv
+++ b/indexes/sol_005_index.csv
@@ -1,71 +1,75 @@
-5,Os-Ma-Nfvo Reference Point, SOL005
-5.3.1,NSD Management interface, NSDManagement-API 
-5.3.1.1,Network Service Descriptors Resource Endpoint, NSDescriptors.robot
-5.3.1.2,Individual NS Descriptor Resource Endpoint , IndividualNSDescriptor.robot
-5.3.1.3,NSD Content Resource Endpoint, NSDContent.robot
-5.3.1.4,PNF Descriptors Resource Endpoint, PNFDescriptors.robot
-5.3.1.5,Individual PNF Descriptor Resource Endpoint, IndividualPnfDescriptor.robot
-5.3.1.6,PNFD Content Resource Endpoint, PNFDContent.robot
-5.3.1.7,Subscriptions Resource Endpoint, Subscriptions.robot
-5.3.1.8,Individual Subscription Resource Endpoint, IndividualSubscription.robot
-5.3.1.9,Notifications Endpoint, NSDManagementNotification.robot
-5.3.1.10,API Version Resource Endpoint, ApiVersion.robot
-5.3.1.11,Notifications Consumer Endpoint, NotificationConsumer.robot
-5.3.2,NS Lifecycle Management interface, NSLifecycleManagement-API
-5.3.2.1,NsInstances, NSInstances.robot
-5.3.2.2,Individual NSInstance, IndividualNSInstance.robot
-5.3.2.3,Instantiate NS Task, InstantiateNSTask.robot
-5.3.2.4,Scale a nsInstance, ScaleNSTask.robot
-5.3.2.5,Update a NSInstance, UpdateNSTask.robot
-5.3.2.6,Heal a NSInstance, HealNSTask.robot
-5.3.2.7,Terminate a NSInstance, TerminateNSTask.robot
-5.3.2.8,NS LCM occurrences, NSLCMOccurences.robot
-5.3.2.9,Individual NS LCM Occurences, IndividualNSLCMOccurences.robot
-5.3.2.10, Retry operation task, RetryOperationTask.robot
-5.3.2.11, Rollback operation task, RollbackOperationTask.robot
-5.3.2.12,Continue operation task, ContinueOperationTask.robot
-5.3.2.13,Fail operation task, FailOperationTask.robot
-5.3.2.14,Cancel operation task, CancelOperationTask.robot
-5.3.2.15,Subscriptions, Subscriptions.robot
-5.3.2.16,Individual Subscription, IndividualSubscription.robot
-5.3.2.17,Notification Endpoint, NotificationEndpoint.robot
-5.3.2.18,NS Instance Creation Workflow, CreateNSInstanceWorkflow.robot
-5.3.2.19, NS Instance Deletion, DeleteNSInstanceWorkflow.robot
-5.3.2.20, Heal Flow of NS lifecycle management operations, HealNSTaskWorkflow.robot
-5.3.2.21, Instantiate Flow of NS lifecycle management operations, InstanciateNSTaskWorkflow.robot
-5.3.2.22, Scale Flow of NS lifecycle management operations, ScaleNSTaskWorkflow.robot
-5.3.2.23, Terminate Flow of NS lifecycle management operations, TerminateNSTaskWorkflow.robot
-5.3.2.24, Update Flow of NS lifecycle management operations, UpdateNSTaskWorkflow.robot
-5.3.2.25,API Version Resource Endpoint, ApiVersion.robot
-5.3.2.26,Notification Consumer Endpoint, NotificationConsumer.robot
-5.3.3,NS Fault Management interface, NSFaultManagement-API
-5.3.3.1,Alarms, Alarms.robot
-5.3.3.2,Individual Alarm, IndividualAlarm.robot
-5.3.3.3,Subscriptions, Subscriptions.robot
-5.3.3.4,Individual Subscription, IndividualSubscription.robot
-5.3.3.5,Notification Endpoint, NotificationEndpoint.robot
-5.3.3.6,API Version Resource Endpoint, ApiVersion.robot
-5.3.3.7,Notification Consumer Endpoint, NotificationConsumer.robot
-5.3.4,NS Performance Management interface, NSPerformanceManagement-API
-5.3.4.1,PM Jobs Resource Endpoint, PMJobs.robot
-5.3.4.2,Individual PM Job Resource Endpoint, IndividualPmJob.robot
-5.3.4.3,Individual Performance Report Resource Endpoint, IndividualReport.robot
-5.3.4.4,Thresholds Resource Endpoint, Thresholds.robot
-5.3.4.5,Individual Threshold Resource Endpoint, IndividualThreshold.robot
-5.3.4.6,Subscriptions Resource Endpoint, Subscriptions.robot
-5.3.4.7,Individual Subscription Resource Endpoint, IndividualSubscription.robot
-5.3.4.8,Notifications Endpoint, Notifications.robot
-5.3.4.9,API Version Resource Endpoint, ApiVersion.robot
-5.3.4.10,Notifications Consumer Endpoint, NotificationConsumer.robot
-5.3.5,VNF Package Management interface, VNFPackageManagement-API
-5.3.5.1,VNF Packages Resource Endpoint, VNFPackages.robot
-5.3.5.2,Individual VNF Package Resource Endpoint, IndividualVNFPackage.robot
-5.3.5.3,VNFD In Individual VNF Package Resource Endpoint, VNFDInIndividualVNFPackage.robot
-5.3.5.4,VNF Package Content Resource Endpoint, VNFPackageContent.robot
-5.3.5.5,Upload VNF Package From URI Resource Endpoint, VNFPackageContentViaURI.robot
-5.3.5.6,Individual VNF Package Artifact Resource Endpoint, VNFPackageArtifacts.robot
-5.3.5.7,Subscriptions Resource Endpoint, Subscriptions.robot
-5.3.5.8,Individual Subscription Resource Endpoint, IndividualSubscription.robot
-5.3.5.9,Notifications Endpoint, Notifications.robot
-5.3.5.10,API Version Resource Endpoint, ApiVersion.robot
-5.3.5.11,Notifications Consumer Endpoint, NotificationConsumer.robot
+5,Os-Ma-Nfvo Reference Point, SOL005
+5.3.1,NSD Management interface, NSDManagement-API 
+5.3.1.1,Network Service Descriptors Resource Endpoint, NSDescriptors.robot
+5.3.1.2,Individual NS Descriptor Resource Endpoint , IndividualNSDescriptor.robot
+5.3.1.3,NSD Content Resource Endpoint, NSDArchiveContent.robot
+5.3.1.4,PNF Descriptors Resource Endpoint, PNFDescriptors.robot
+5.3.1.5,Individual PNF Descriptor Resource Endpoint, IndividualPnfDescriptor.robot
+5.3.1.6,PNFD Content Resource Endpoint, PNFDContent.robot
+5.3.1.7,Subscriptions Resource Endpoint, Subscriptions.robot
+5.3.1.8,Individual Subscription Resource Endpoint, IndividualSubscription.robot
+5.3.1.9,Notifications Endpoint, NSDManagementNotification.robot
+5.3.1.10,API Version Resource Endpoint, ApiVersion.robot
+5.3.1.11,NSD Resource Endpoint, NSD.robot
+5.3.1.12,NSD Archive Manifest Resource Endpoint, NSDArchiveManifest.robot
+5.3.1.13,PNFD Resource Endpoint, PNFD.robot
+5.3.1.14,PNFD Archive Manifest Resource Endpoint, PNFDArchiveManifest.robot
+5.3.1.15,Notifications Consumer Endpoint, NotificationConsumer.robot
+5.3.2,NS Lifecycle Management interface, NSLifecycleManagement-API
+5.3.2.1,NsInstances, NSInstances.robot
+5.3.2.2,Individual NSInstance, IndividualNSInstance.robot
+5.3.2.3,Instantiate NS Task, InstantiateNSTask.robot
+5.3.2.4,Scale a nsInstance, ScaleNSTask.robot
+5.3.2.5,Update a NSInstance, UpdateNSTask.robot
+5.3.2.6,Heal a NSInstance, HealNSTask.robot
+5.3.2.7,Terminate a NSInstance, TerminateNSTask.robot
+5.3.2.8,NS LCM occurrences, NSLCMOccurences.robot
+5.3.2.9,Individual NS LCM Occurences, IndividualNSLCMOccurences.robot
+5.3.2.10, Retry operation task, RetryOperationTask.robot
+5.3.2.11, Rollback operation task, RollbackOperationTask.robot
+5.3.2.12,Continue operation task, ContinueOperationTask.robot
+5.3.2.13,Fail operation task, FailOperationTask.robot
+5.3.2.14,Cancel operation task, CancelOperationTask.robot
+5.3.2.15,Subscriptions, Subscriptions.robot
+5.3.2.16,Individual Subscription, IndividualSubscription.robot
+5.3.2.17,Notification Endpoint, NotificationEndpoint.robot
+5.3.2.18,NS Instance Creation Workflow, CreateNSInstanceWorkflow.robot
+5.3.2.19, NS Instance Deletion, DeleteNSInstanceWorkflow.robot
+5.3.2.20, Heal Flow of NS lifecycle management operations, HealNSTaskWorkflow.robot
+5.3.2.21, Instantiate Flow of NS lifecycle management operations, InstanciateNSTaskWorkflow.robot
+5.3.2.22, Scale Flow of NS lifecycle management operations, ScaleNSTaskWorkflow.robot
+5.3.2.23, Terminate Flow of NS lifecycle management operations, TerminateNSTaskWorkflow.robot
+5.3.2.24, Update Flow of NS lifecycle management operations, UpdateNSTaskWorkflow.robot
+5.3.2.25,API Version Resource Endpoint, ApiVersion.robot
+5.3.2.26,Notification Consumer Endpoint, NotificationConsumer.robot
+5.3.3,NS Fault Management interface, NSFaultManagement-API
+5.3.3.1,Alarms, Alarms.robot
+5.3.3.2,Individual Alarm, IndividualAlarm.robot
+5.3.3.3,Subscriptions, Subscriptions.robot
+5.3.3.4,Individual Subscription, IndividualSubscription.robot
+5.3.3.5,Notification Endpoint, NotificationEndpoint.robot
+5.3.3.6,API Version Resource Endpoint, ApiVersion.robot
+5.3.3.7,Notification Consumer Endpoint, NotificationConsumer.robot
+5.3.4,NS Performance Management interface, NSPerformanceManagement-API
+5.3.4.1,PM Jobs Resource Endpoint, PMJobs.robot
+5.3.4.2,Individual PM Job Resource Endpoint, IndividualPmJob.robot
+5.3.4.3,Individual Performance Report Resource Endpoint, IndividualReport.robot
+5.3.4.4,Thresholds Resource Endpoint, Thresholds.robot
+5.3.4.5,Individual Threshold Resource Endpoint, IndividualThreshold.robot
+5.3.4.6,Subscriptions Resource Endpoint, Subscriptions.robot
+5.3.4.7,Individual Subscription Resource Endpoint, IndividualSubscription.robot
+5.3.4.8,Notifications Endpoint, Notifications.robot
+5.3.4.9,API Version Resource Endpoint, ApiVersion.robot
+5.3.4.10,Notifications Consumer Endpoint, NotificationConsumer.robot
+5.3.5,VNF Package Management interface, VNFPackageManagement-API
+5.3.5.1,VNF Packages Resource Endpoint, VNFPackages.robot
+5.3.5.2,Individual VNF Package Resource Endpoint, IndividualVNFPackage.robot
+5.3.5.3,VNFD In Individual VNF Package Resource Endpoint, VNFDInIndividualVNFPackage.robot
+5.3.5.4,VNF Package Content Resource Endpoint, VNFPackageContent.robot
+5.3.5.5,Upload VNF Package From URI Resource Endpoint, VNFPackageContentViaURI.robot
+5.3.5.6,Individual VNF Package Artifact Resource Endpoint, VNFPackageArtifacts.robot
+5.3.5.7,Subscriptions Resource Endpoint, Subscriptions.robot
+5.3.5.8,Individual Subscription Resource Endpoint, IndividualSubscription.robot
+5.3.5.9,Notifications Endpoint, Notifications.robot
+5.3.5.10,API Version Resource Endpoint, ApiVersion.robot
+5.3.5.11,Notifications Consumer Endpoint, NotificationConsumer.robot
-- 
GitLab


From b897b22fe46579815ac6a65d41b4d6f993eed1aa Mon Sep 17 00:00:00 2001
From: bernini <g.bernini@nextworks.it>
Date: Mon, 7 Dec 2020 13:05:49 +0100
Subject: [PATCH 197/322] re-update sol_005_index.csv

---
 indexes/sol_005_index.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indexes/sol_005_index.csv b/indexes/sol_005_index.csv
index f727f54bd..13f7fa146 100644
--- a/indexes/sol_005_index.csv
+++ b/indexes/sol_005_index.csv
@@ -5,7 +5,7 @@
 5.3.1.3,NSD Content Resource Endpoint, NSDArchiveContent.robot
 5.3.1.4,PNF Descriptors Resource Endpoint, PNFDescriptors.robot
 5.3.1.5,Individual PNF Descriptor Resource Endpoint, IndividualPnfDescriptor.robot
-5.3.1.6,PNFD Content Resource Endpoint, PNFDContent.robot
+5.3.1.6,PNFD Content Resource Endpoint, PNFDArchiveContent.robot
 5.3.1.7,Subscriptions Resource Endpoint, Subscriptions.robot
 5.3.1.8,Individual Subscription Resource Endpoint, IndividualSubscription.robot
 5.3.1.9,Notifications Endpoint, NSDManagementNotification.robot
-- 
GitLab


From a2df1dea1cb354361bea582ebe42ca71151e306d Mon Sep 17 00:00:00 2001
From: bernini <g.bernini@nextworks.it>
Date: Mon, 7 Dec 2020 13:13:18 +0100
Subject: [PATCH 198/322] fix sol_005_index.csv

---
 indexes/sol_005_index.csv | 2 --
 1 file changed, 2 deletions(-)

diff --git a/indexes/sol_005_index.csv b/indexes/sol_005_index.csv
index 13f7fa146..31fcb08ef 100644
--- a/indexes/sol_005_index.csv
+++ b/indexes/sol_005_index.csv
@@ -56,8 +56,6 @@
 5.3.4.3,Individual Performance Report Resource Endpoint, IndividualReport.robot
 5.3.4.4,Thresholds Resource Endpoint, Thresholds.robot
 5.3.4.5,Individual Threshold Resource Endpoint, IndividualThreshold.robot
-5.3.4.6,Subscriptions Resource Endpoint, Subscriptions.robot
-5.3.4.7,Individual Subscription Resource Endpoint, IndividualSubscription.robot
 5.3.4.8,Notifications Endpoint, Notifications.robot
 5.3.4.9,API Version Resource Endpoint, ApiVersion.robot
 5.3.4.10,Notifications Consumer Endpoint, NotificationConsumer.robot
-- 
GitLab


From 11e7f8ea9151780cbc9ae06b87a75056715bad14 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Mon, 7 Dec 2020 13:46:17 +0100
Subject: [PATCH 199/322] updated docker file and requirements

---
 requirements.txt          | 2 +-
 scripts/docker/Dockerfile | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index f6c9c6d5d..d7793f479 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@
 # pip -r requirements.txt
 
 
-robotframework==3.1
+robotframework==3.2.2
 RESTinstance==1.0.0rc4
 robotframework-dependencylibrary==1.0.0.post1
 robotframework-jsonlibrary==0.3
diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
index e6130d455..3aa854031 100644
--- a/scripts/docker/Dockerfile
+++ b/scripts/docker/Dockerfile
@@ -28,8 +28,6 @@ RUN DEBIAN_FRONTEND=noninteractive \
         && mkdir -p /home/etsi/dev/robot \
         && cd /home/etsi/dev/robot 
 
-RUN pip3 install robotframework
-
 RUN DEBIAN_FRONTEND=noninteractive \
         && cd /home/etsi/dev/robot \
 	&& git clone https://github.com/etsi-cti-admin/robotframework-mockserver 
-- 
GitLab


From 853737b10a79a81a4411abe686826e3dda939d90 Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Fri, 11 Dec 2020 15:19:36 +0100
Subject: [PATCH 200/322] Fix issue #20

---
 .../Subscriptions.robot                       | 110 ++++++++++--------
 .../NSFMOperationKeywords.robot               |  49 ++++----
 .../NSFaultManagement-API/Subscriptions.robot |  52 ++++++---
 .../environment/variables.txt                 |   2 -
 4 files changed, 124 insertions(+), 89 deletions(-)

diff --git a/SOL002/VNFFaultManagement-API/Subscriptions.robot b/SOL002/VNFFaultManagement-API/Subscriptions.robot
index 3c6434819..7885715f0 100644
--- a/SOL002/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL002/VNFFaultManagement-API/Subscriptions.robot
@@ -22,33 +22,46 @@ Create a new subscription
     Check HTTP Response Header Contain Link
     Check Postcondition resource exists
 
-Create a new Subscription - DUPLICATION
-     [Documentation]    Test ID: 6.3.4.4.2
-    ...    Test title: Create a new Subscription - DUPLICATION
-    ...    Test objective: The objective is to create a duplicate subscription.
-    ...    Pre-conditions: subscription with the same filter and callbackUri exists
-    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: the VNFM does not allow creation of a subscription resource if another subscription resource with the same filter and callbackUri already exists
-    ...    Post-Conditions: duplicated subscription is created
-    Post Create subscription - DUPLICATION
-    Check HTTP Response Status Code Is    201
-    Check HTTP Response Body Json Schema Is    FmSubscription
-    Check HTTP Response Header Contain Link
-    Check Postcondition Duplicate Subscription exsist
+# Create a new Subscription - DUPLICATION
+     # [Documentation]    Test ID: 6.3.4.4.2
+    # ...    Test title: Create a new Subscription - DUPLICATION
+    # ...    Test objective: The objective is to create a duplicate subscription.
+    # ...    Pre-conditions: subscription with the same filter and callbackUri exists
+    # ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    # ...    Config ID: Config_prod_VNFM
+    # ...    Applicability: the VNFM does not allow creation of a subscription resource if another subscription resource with the same filter and callbackUri already exists
+    # ...    Post-Conditions: duplicated subscription is created
+    # Post Create subscription - DUPLICATION
+    # Check HTTP Response Status Code Is    201
+    # Check HTTP Response Body Json Schema Is    FmSubscription
+    # Check HTTP Response Header Contain Link
+    # Check Postcondition Duplicate Subscription exsist
     
-Create a new Subscription - NO-DUPLICATION
-    [Documentation]    Test ID: 6.3.4.4.3
-    ...    Test title: Create a new Subscription - NO-DUPLICATION
-    ...    Test objective: The objective is to create a subscription in case of not allowed DUPLICATION.
+# Create a new Subscription - NO-DUPLICATION
+    # [Documentation]    Test ID: 6.3.4.4.3
+    # ...    Test title: Create a new Subscription - NO-DUPLICATION
+    # ...    Test objective: The objective is to create a subscription in case of not allowed DUPLICATION.
+    # ...    Pre-conditions: subscription with the same filter and callbackUri exists
+    # ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    # ...    Config ID: Config_prod_VNFM
+    # ...    Applicability: the VNFM does not allow creation of a duplicate subscription resource 
+    # ...    Post-Conditions: duplicated subscription is not created
+    # Post Create subscription - DUPLICATION
+    # Check HTTP Response Status Code Is    303
+    # Check HTTP Response Header Contain Link
+
+Create a duplicated Subscription
+     [Documentation]    Test ID: 6.3.4.4.2a
+    ...    Test title: Create a duplicated Subscription
+    ...    Test objective: The objective is to create a duplicate subscription.
     ...    Pre-conditions: subscription with the same filter and callbackUri exists
     ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: the VNFM does not allow creation of a duplicate subscription resource 
-    ...    Post-Conditions: duplicated subscription is not created
-    Post Create subscription - DUPLICATION
-    Check HTTP Response Status Code Is    303
-    Check HTTP Response Header Contain Link
+    ...    Applicability: 
+    ...    Post-Conditions: duplicated subscription is created if the IUT allows duplications, otherwise the duplicated subscription is not created
+    Post Create subscription
+    Check Response for duplicated subscription
+
 
 GET Subscriptions
     [Documentation]    Test ID: 6.3.4.4.4
@@ -311,28 +324,28 @@ Post Create subscription
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}				
-Post Create subscription - DUPLICATION
-    Log    Trying to create a subscription with an already created content
-    Pass Execution If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 0    NVFO is not permitting duplication. Skipping the test
-    Set Headers    {"Accept": "${ACCEPT}"}
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${template}=    Get File    jsons/fmSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}		
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}			
-Post Create subscription - NO-DUPLICATION	
-    Log    Trying to create a subscription with an already created content
-    Pass Execution If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 1    VNFM permits duplication. Skipping the test
-    Set Headers    {"Accept": "${ACCEPT}"}
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${template}=    Get File    jsons/fmSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}		
+# Post Create subscription - DUPLICATION
+    # Log    Trying to create a subscription with an already created content
+    # Pass Execution If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 0    NVFO is not permitting duplication. Skipping the test
+    # Set Headers    {"Accept": "${ACCEPT}"}
+    # Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
+    # Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    # ${template}=    Get File    jsons/fmSubscriptionRequest.json
+    # ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    # Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}		
+    # ${outputResponse}=    Output    response
+	# Set Global Variable    ${response}    ${outputResponse}			
+# Post Create subscription - NO-DUPLICATION	
+    # Log    Trying to create a subscription with an already created content
+    # Pass Execution If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 1    VNFM permits duplication. Skipping the test
+    # Set Headers    {"Accept": "${ACCEPT}"}
+    # Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
+    # Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    # ${template}=    Get File    jsons/fmSubscriptionRequest.json
+    # ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    # Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
+    # ${outputResponse}=    Output    response
+	# Set Global Variable    ${response}    ${outputResponse}		
 Get subscriptions
     Log    Get the list of active subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
@@ -505,4 +518,9 @@ Check Postcondition resource exists
     Integer    response status    200
 
 Check Postcondition Duplicate Subscription exsist
-    Should Not Be Equal As Strings    ${response['body']['callbackUri']}    ${subscriptionId} 
\ No newline at end of file
+    Should Not Be Equal As Strings    ${response['body']['callbackUri']}    ${subscriptionId} 
+   
+Check Response for duplicated subscription
+    Run Keyword If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 1    Check HTTP Response Status Code Is    201
+    Run Keyword If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 1    Check HTTP Response Body Json Schema Is    FmSubscription
+    Run Keyword If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 0    Check HTTP Response Status Code Is    303
diff --git a/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot b/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
index ab113914a..4d9893ce8 100644
--- a/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
+++ b/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
@@ -219,29 +219,29 @@ POST Subscription
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
 
-Post Create subscription - DUPLICATION
-    Log    Trying to create a subscription with an already created content
-    Pass Execution If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 0    NVFO is not permitting duplication. Skipping the test
-    Set Headers    {"Accept": "${ACCEPT}"}
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${template}=    Get File    jsons/fmSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}		
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}	
+# Post Create subscription - DUPLICATION
+    # Log    Trying to create a subscription with an already created content
+    # Pass Execution If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 0    NVFO is not permitting duplication. Skipping the test
+    # Set Headers    {"Accept": "${ACCEPT}"}
+    # Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
+    # Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    # ${template}=    Get File    jsons/fmSubscriptionRequest.json
+    # ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    # Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}		
+    # ${outputResponse}=    Output    response
+	# Set Global Variable    ${response}    ${outputResponse}	
 	
-Post Create subscription - NO-DUPLICATION	
-    Log    Trying to create a subscription with an already created content
-    Pass Execution If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 1    NVFO permits duplication. Skipping the test
-    Set Headers    {"Accept": "${ACCEPT}"}
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${template}=    Get File    jsons/fmSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}	
+# Post Create subscription - NO-DUPLICATION	
+    # Log    Trying to create a subscription with an already created content
+    # Pass Execution If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 1    NVFO permits duplication. Skipping the test
+    # Set Headers    {"Accept": "${ACCEPT}"}
+    # Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
+    # Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    # ${template}=    Get File    jsons/fmSubscriptionRequest.json
+    # ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    # Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
+    # ${outputResponse}=    Output    response
+	# Set Global Variable    ${response}    ${outputResponse}	
 	
 GET Subscriptions
     Log    Get the list of active subscriptions
@@ -617,3 +617,8 @@ Check PostCondition HTTP Response Body Subscriptions Matches the requested attri
     :FOR   ${item}   IN  @{response['body']}
     Should Contain Match    ${item['filter']['probableCauses']}   ${probableCause}    case_insensitive=True
     END
+
+Check Response for duplicated subscription
+    Run Keyword If    ${NFVO_ALLOWS_DUPLICATE_SUBS} == 1    Check HTTP Response Status Code Is    201
+    Run Keyword If    ${NFVO_ALLOWS_DUPLICATE_SUBS} == 1    Check HTTP Response Body Json Schema Is    FmSubscription
+    Run Keyword If    ${NFVO_ALLOWS_DUPLICATE_SUBS} == 0    Check HTTP Response Status Code Is    303
diff --git a/SOL005/NSFaultManagement-API/Subscriptions.robot b/SOL005/NSFaultManagement-API/Subscriptions.robot
index 4b7e352fa..b8e00065e 100644
--- a/SOL005/NSFaultManagement-API/Subscriptions.robot
+++ b/SOL005/NSFaultManagement-API/Subscriptions.robot
@@ -22,32 +22,46 @@ Create a new alarm subscription
     Check Operation Occurrence Id
     Check HTTP Response Body Json Schema Is  FmSubscription
   
-Create a new alarm subscription - DUPLICATION
-     [Documentation]    Test ID: 5.3.3.3.2
-    ...    Test title: Create a new alarm subscription - DUPLICATION
+# Create a new alarm subscription - DUPLICATION
+     # [Documentation]    Test ID: 5.3.3.3.2
+    # ...    Test title: Create a new alarm subscription - DUPLICATION
+    # ...    Test objective: The objective is to create a new subscription with the NFV allowing duplication and perform a JSON schema and content validation of the returned fault management alarms subscription data structure..
+    # ...    Pre-conditions: subscription with the same filter and callbackUri exists
+    # ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    # ...    Config ID: Config_prod_NFVO 
+    # ...    Applicability: the NFVO allows creating a subscription resource if another subscription resource with the same filter and callbackUri already exists
+    # ...    Post-Conditions: none
+    # Post Create subscription - DUPLICATION
+    # Check HTTP Response Status Code Is    201
+    # Check Operation Occurrence Id
+    # Check HTTP Response Body Json Schema Is  FmSubscription
+
+# Create a new alarm subscription - NO DUPLICATION
+    # [Documentation]    Test ID: 5.3.3.3.3
+    # ...    Test title: Create a new alarm subscription - NO DUPLICATION
+    # ...    Test objective: The objective is to create a new subscription with the NFV not allowing duplication and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
+    # ...    Pre-conditions: subscription with the same filter and callbackUri exists
+    # ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    # ...    Config ID: Config_prod_NFVO 
+    # ...    Applicability: the NFVO decides to not create a duplicate subscription resource 
+    # ...    Post-Conditions: none
+    # Post Create subscription - NO-DUPLICATION
+    # Check HTTP Response Status Code Is    303
+    # Check Operation Occurrence Id
+    
+Create a duplicated Subscription
+     [Documentation]    Test ID: 5.3.3.3.2a
+    ...    Test title: Create a duplicated alarm subscription
     ...    Test objective: The objective is to create a new subscription with the NFV allowing duplication and perform a JSON schema and content validation of the returned fault management alarms subscription data structure..
     ...    Pre-conditions: subscription with the same filter and callbackUri exists
     ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO 
-    ...    Applicability: the NFVO allows creating a subscription resource if another subscription resource with the same filter and callbackUri already exists
+    ...    Applicability: 
     ...    Post-Conditions: none
-    Post Create subscription - DUPLICATION
-    Check HTTP Response Status Code Is    201
+    POST Subscription
+    Check Response for duplicated subscription
     Check Operation Occurrence Id
-    Check HTTP Response Body Json Schema Is  FmSubscription
 
-Create a new alarm subscription - NO DUPLICATION
-    [Documentation]    Test ID: 5.3.3.3.3
-    ...    Test title: Create a new alarm subscription - NO DUPLICATION
-    ...    Test objective: The objective is to create a new subscription with the NFV not allowing duplication and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
-    ...    Pre-conditions: subscription with the same filter and callbackUri exists
-    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO 
-    ...    Applicability: the NFVO decides to not create a duplicate subscription resource 
-    ...    Post-Conditions: none
-    Post Create subscription - NO-DUPLICATION
-    Check HTTP Response Status Code Is    303
-    Check Operation Occurrence Id
 
 Retrieve a list of alarm subscriptions
     [Documentation]    Test ID: 5.3.3.3.4
diff --git a/SOL005/NSFaultManagement-API/environment/variables.txt b/SOL005/NSFaultManagement-API/environment/variables.txt
index 848b78e97..0ae86d8e1 100644
--- a/SOL005/NSFaultManagement-API/environment/variables.txt
+++ b/SOL005/NSFaultManagement-API/environment/variables.txt
@@ -18,8 +18,6 @@ ${NFVO_ALLOWS_DUPLICATE_SUBS}     0
 
 ${fields}         criteria,objectInstanceIds
 
-${VNFM_ALLOWS_DUPLICATE_SUBS}    0
-
 ${alarmId}    6fc3539c-e602-4afa-8e13-962fb5a7d81d
 ${faultyNestedNsInstanceId}    faultyNestedNsInstanceId
 ${faultyNsVirtualLinkInstanceId}     faultyNsVirtualLinkInstanceId
-- 
GitLab


From 6fb7569d3eeb57cf0b3ac90c5930eb89e8587cc2 Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Fri, 11 Dec 2020 15:19:54 +0100
Subject: [PATCH 201/322] Fix issue #44

---
 .../schemas/subscriptions.schema.json         | 149 +++++++++++++++++-
 1 file changed, 148 insertions(+), 1 deletion(-)

diff --git a/SOL003/VNFLifecycleManagement-API/schemas/subscriptions.schema.json b/SOL003/VNFLifecycleManagement-API/schemas/subscriptions.schema.json
index fefb142da..75ab7eb89 100644
--- a/SOL003/VNFLifecycleManagement-API/schemas/subscriptions.schema.json
+++ b/SOL003/VNFLifecycleManagement-API/schemas/subscriptions.schema.json
@@ -1 +1,148 @@
-{  "type": "array",  "items": {    "description": "This type represents a subscription.\n",    "type": "object",    "required": [      "id",      "callbackUri",      "_links"    ],    "properties": {      "id": {        "description": "An identifier with the intention of being globally unique.\n",        "type": "string"      },      "filter": {        "description": "This type represents a filter that can be used to subscribe for notifications related to performance management events.\n",        "type": "object",        "properties": {          "vnfInstanceSubscriptionFilter": {            "description": "This type represents subscription filter criteria to match VNF instances.\n",            "type": "object",            "properties": {              "vnfdIds": {                "description": "If present, match VNF instances that were created based on a VNFD identified by one of the vnfdId values listed in this attribute. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",                "type": "array",                "items": {                  "description": "An identifier with the intention of being globally unique.\n",                  "type": "string"                }              },              "vnfProductsFromProviders": {                "description": "If present, match VNF instances that belong to VNF products from certain providers. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",                "type": "array",                "items": {                  "type": "object",                  "required": [                    "vnfProvider"                  ],                  "properties": {                    "vnfProvider": {                      "description": "Name of the VNF provider to match.\n",                      "type": "string"                    },                    "vnfProducts": {                      "description": "If present, match VNF instances that belong to VNF products with certain product names, from one particular provider.\n",                      "type": "array",                      "items": {                        "type": "object",                        "required": [                          "vnfProductName"                        ],                        "properties": {                          "vnfProductName": {                            "description": "Name of the VNF product to match.\n",                            "type": "string"                          },                          "versions": {                            "description": "If present, match VNF instances that belong to VNF products with certain versions and a certain product name, from one particular provider.\n",                            "type": "array",                            "items": {                              "type": "object",                              "required": [                                "vnfSoftwareVersion"                              ],                              "properties": {                                "vnfSoftwareVersion": {                                  "description": "A version.\n",                                  "type": "string"                                },                                "vnfdVersions": {                                  "description": "If present, match VNF instances that belong to VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n",                                  "type": "array",                                  "items": {                                    "description": "A version.\n",                                    "type": "string"                                  }                                }                              }                            }                          }                        }                      }                    }                  }                }              },              "vnfInstanceIds": {                "description": "If present, match VNF instances with an instance identifier listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",                "type": "array",                "items": {                  "description": "An identifier with the intention of being globally unique.\n",                  "type": "string"                }              },              "vnfInstanceNames": {                "description": "If present, match VNF instances with a VNF Instance Name listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",                "type": "array",                "items": {                  "type": "string"                }              }            }          },          "notificationTypes": {            "description": "Match particular notification types. Permitted values: * ThresholdCrossedNotification * PerformanceInformationAvailableNotification The permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.\n",            "type": "string",            "enum": [              "ThresholdCrossedNotification",              "PerformanceInformationAvailableNotification"            ]          }        }      },      "callbackUri": {        "description": "The URI of the endpoint to send the notification to.\n",        "type": "string",        "format": "url"      },      "_links": {        "description": "Links to resources related to this resource.\n",        "type": "object",        "required": [          "self"        ],        "properties": {          "self": {            "description": "This type represents a link to a resource.\n",            "type": "object",            "required": [              "href"            ],            "properties": {              "href": {                "description": "URI of the referenced resource.\n",                "type": "string",                "format": "url"              }            }          }        }      }    }  }}
\ No newline at end of file
+{
+	"type": "array",
+	"items": {
+		"description": "This type represents a subscription related to notifications about VNF lifecycle changes.\n",
+		"type": "object",
+		"required": ["id", "callbackUri", "_links"],
+		"properties": {
+			"id": {
+				"description": "An identifier with the intention of being globally unique.\n",
+				"type": "string"
+			},
+			"filter": {
+				"description": "This type represents a subscription filter related to notifications about VNF lifecycle changes. At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n",
+				"type": "object",
+				"properties": {
+					"vnfInstanceSubscriptionFilter": {
+						"description": "This type represents subscription filter criteria to match VNF instances.\n",
+						"type": "object",
+						"properties": {
+							"vnfdIds": {
+								"description": "If present, match VNF instances that were created based on a VNFD identified by one of the vnfdId values listed in this attribute. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
+								"type": "array",
+								"items": {
+									"description": "An identifier with the intention of being globally unique.\n",
+									"type": "string"
+								}
+							},
+							"vnfProductsFromProviders": {
+								"description": "If present, match VNF instances that belong to VNF products from certain providers. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
+								"type": "array",
+								"items": {
+									"type": "object",
+									"required": ["vnfProvider"],
+									"properties": {
+										"vnfProvider": {
+											"description": "Name of the VNF provider to match.\n",
+											"type": "string"
+										},
+										"vnfProducts": {
+											"description": "If present, match VNF instances that belong to VNF products with certain product names, from one particular provider.\n",
+											"type": "array",
+											"items": {
+												"type": "object",
+												"required": ["vnfProductName"],
+												"properties": {
+													"vnfProductName": {
+														"description": "Name of the VNF product to match.\n",
+														"type": "string"
+													},
+													"versions": {
+														"description": "If present, match VNF instances that belong to VNF products with certain versions and a certain product name, from one particular provider.\n",
+														"type": "array",
+														"items": {
+															"type": "object",
+															"required": ["vnfSoftwareVersion"],
+															"properties": {
+																"vnfSoftwareVersion": {
+																	"description": "A version.\n",
+																	"type": "string"
+																},
+																"vnfdVersions": {
+																	"description": "If present, match VNF instances that belong to VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n",
+																	"type": "array",
+																	"items": {
+																		"description": "A version.\n",
+																		"type": "string"
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+									}
+								}
+							},
+							"vnfInstanceIds": {
+								"description": "If present, match VNF instances with an instance identifier listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
+								"type": "array",
+								"items": {
+									"description": "An identifier with the intention of being globally unique.\n",
+									"type": "string"
+								}
+							},
+							"vnfInstanceNames": {
+								"description": "If present, match VNF instances with a VNF Instance Name listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
+								"type": "array",
+								"items": {
+									"type": "string"
+								}
+							}
+						}
+					},
+					"notificationTypes": {
+						"description": "Match particular notification types. Permitted values: * VnfLcmOperationOccurrenceNotification * VnfIdentifierCreationNotification * VnfIdentifierDeletionNotification The permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.\n",
+						"type": "array",
+						"items": {
+							"type": "string",
+							"enum": ["VnfLcmOperationOccurrenceNotification", "VnfIdentifierCreationNotification", "VnfIdentifierDeletionNotification"]
+						}
+					},
+					"operationTypes": {
+						"description": "Match particular VNF lifecycle operation types for the notification of type VnfLcmOperationOccurrenceNotification. May be present if the \"notificationTypes\" attribute contains the value \"VnfLcmOperationOccurrenceNotification\", and shall be absent otherwise.\n",
+						"type": "array",
+						"items": {
+							"description": "Value | Description ------|------------ INSTANTIATE | Represents the \"Instantiate VNF\" LCM operation.    SCALE | Represents the \"Scale VNF\" LCM operation. SCALE_TO_LEVEL | Represents the \"Scale VNF to Level\" LCM operation. CHANGE_FLAVOUR | Represents the \"Change VNF Flavour\" LCM operation. TERMINATE | Represents the \"Terminate VNF\" LCM operation. HEAL | Represents the \"Heal VNF\" LCM operation. OPERATE | Represents the \"Operate VNF\" LCM operation. CHANGE_EXT_CONN | Represents the \"Change external VNF connectivity\" LCM operation. MODIFY_INFO | Represents the \"Modify VNF Information\" LCM operation.     \n",
+							"type": "string",
+							"enum": ["INSTANTIATE", "SCALE", "SCALE_TO_LEVEL", "CHANGE_FLAVOUR", "TERMINATE", "HEAL", "OPERATE", "CHANGE_EXT_CONN", "MODIFY_INFO"]
+						}
+					},
+					"operationStates": {
+						"description": "Match particular LCM operation state values as reported in notifications of type VnfLcmOperationOccurrenceNotification. May be present if the \"notificationTypes\" attribute contains the value \"VnfLcmOperationOccurrenceNotification\", and shall be absent otherwise.\n",
+						"type": "array",
+						"items": {
+							"description": "Value | Description ------|------------ STARTING | The LCM operation is starting. PROCESSING | The LCM operation is currently in execution. COMPLETED | he LCM operation has been completed successfully. FAILED_TEMP | The LCM operation has failed and execution has stopped, but the execution of the operation is not considered to be closed. FAILED | The LCM operation has failed and it cannot be retried or rolled back, as it is determined that such action won't succeed. ROLLING_BACK | The LCM operation is currently being rolled back. ROLLED_BACK | The LCM operation has been successfully rolled back, i.e. The state of the VNF prior to the original operation invocation has been restored as closely as possible.\n",
+							"type": "string",
+							"enum": ["STARTING", "PROCESSING", "COMPLETED", "FAILED_TEMP", "FAILED", "ROLLING_BACK", "ROLLED_BACK"]
+						}
+					}
+				}
+			},
+			"callbackUri": {
+				"description": "String formatted according to IETF RFC 3986.\n",
+				"type": "string"
+			},
+			"_links": {
+				"description": "Links to resources related to this resource.\n",
+				"type": "object",
+				"required": ["self"],
+				"properties": {
+					"self": {
+						"description": "This type represents a link to a resource.\n",
+						"type": "object",
+						"required": ["href"],
+						"properties": {
+							"href": {
+								"description": "URI of the referenced resource.\n",
+								"type": "string",
+								"format": "url"
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
-- 
GitLab


From 0d00a9b3cd92652e41177b3e61651a9cccc1ceca Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Fri, 11 Dec 2020 15:33:54 +0100
Subject: [PATCH 202/322] Fix issue #73

---
 SOL002/VNFConfiguration-API/ApiVersion.robot                    | 2 +-
 SOL002/VNFFaultManagement-API/ApiVersion.robot                  | 2 +-
 SOL002/VNFIndicator-API/ApiVersion.robot                        | 2 +-
 SOL002/VNFLifecycleManagement-API/ApiVersion.robot              | 2 +-
 SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot | 2 +-
 SOL002/VNFPerformanceManagement-API/ApiVersion.robot            | 2 +-
 SOL003/VNFFaultManagement-API/ApiVersion.robot                  | 2 +-
 SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot  | 2 +-
 SOL003/VNFIndicator-API/ApiVersion.robot                        | 2 +-
 SOL003/VNFLifecycleManagement-API/ApiVersion.robot              | 2 +-
 SOL003/VNFLifecycleOperationGranting-API/ApiVersion.robot       | 2 +-
 SOL003/VNFLifecycleOperationGranting-API/Grants.robot           | 2 +-
 SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot  | 2 +-
 SOL003/VNFPackageManagement-API/ApiVersion.robot                | 2 +-
 SOL003/VNFPerformanceManagement-API/ApiVersion.robot            | 2 +-
 .../ApiVersion.robot                                            | 2 +-
 .../VRQANOperationKeywords.robot                                | 2 +-
 SOL005/NSDManagement-API/ApiVersion.robot                       | 2 +-
 SOL005/NSFaultManagement-API/ApiVersion.robot                   | 2 +-
 SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot        | 2 +-
 SOL005/NSLifecycleManagement-API/ApiVersion.robot               | 2 +-
 SOL005/NSPerformanceManagement-API/ApiVersion.robot             | 2 +-
 SOL005/VNFPackageManagement-API/ApiVersion.robot                | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/SOL002/VNFConfiguration-API/ApiVersion.robot b/SOL002/VNFConfiguration-API/ApiVersion.robot
index 43b857994..108cbe0d9 100644
--- a/SOL002/VNFConfiguration-API/ApiVersion.robot
+++ b/SOL002/VNFConfiguration-API/ApiVersion.robot
@@ -206,6 +206,6 @@ Check HTTP Response Status Code Is
 
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
diff --git a/SOL002/VNFFaultManagement-API/ApiVersion.robot b/SOL002/VNFFaultManagement-API/ApiVersion.robot
index 2f4b46c4a..48a593c97 100644
--- a/SOL002/VNFFaultManagement-API/ApiVersion.robot
+++ b/SOL002/VNFFaultManagement-API/ApiVersion.robot
@@ -208,6 +208,6 @@ Check HTTP Response Status Code Is
 
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
diff --git a/SOL002/VNFIndicator-API/ApiVersion.robot b/SOL002/VNFIndicator-API/ApiVersion.robot
index 9a60cbe3f..a89c0b19d 100644
--- a/SOL002/VNFIndicator-API/ApiVersion.robot
+++ b/SOL002/VNFIndicator-API/ApiVersion.robot
@@ -208,6 +208,6 @@ Check HTTP Response Status Code Is
 
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/ApiVersion.robot b/SOL002/VNFLifecycleManagement-API/ApiVersion.robot
index 2b94beca1..1c1ea5db5 100644
--- a/SOL002/VNFLifecycleManagement-API/ApiVersion.robot
+++ b/SOL002/VNFLifecycleManagement-API/ApiVersion.robot
@@ -206,6 +206,6 @@ Check HTTP Response Status Code Is
 
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index 210784c18..8cd37ad8b 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -33,7 +33,7 @@ Check Operation Occurrence Id
 
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
 
diff --git a/SOL002/VNFPerformanceManagement-API/ApiVersion.robot b/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
index 168033e8d..0e98a8396 100644
--- a/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
+++ b/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
@@ -206,6 +206,6 @@ Check HTTP Response Status Code Is
 
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
diff --git a/SOL003/VNFFaultManagement-API/ApiVersion.robot b/SOL003/VNFFaultManagement-API/ApiVersion.robot
index 943898e57..b265a9a56 100644
--- a/SOL003/VNFFaultManagement-API/ApiVersion.robot
+++ b/SOL003/VNFFaultManagement-API/ApiVersion.robot
@@ -208,6 +208,6 @@ Check HTTP Response Status Code Is
 
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
diff --git a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
index 1f9b5e86e..cbf26efb8 100644
--- a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
+++ b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
@@ -60,7 +60,7 @@ Check HTTP Response Header Contains
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
     
diff --git a/SOL003/VNFIndicator-API/ApiVersion.robot b/SOL003/VNFIndicator-API/ApiVersion.robot
index bcb0549b0..4c8aa20c1 100644
--- a/SOL003/VNFIndicator-API/ApiVersion.robot
+++ b/SOL003/VNFIndicator-API/ApiVersion.robot
@@ -208,6 +208,6 @@ Check HTTP Response Status Code Is
 
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/ApiVersion.robot b/SOL003/VNFLifecycleManagement-API/ApiVersion.robot
index 46cba71dd..e19b65ac9 100644
--- a/SOL003/VNFLifecycleManagement-API/ApiVersion.robot
+++ b/SOL003/VNFLifecycleManagement-API/ApiVersion.robot
@@ -207,6 +207,6 @@ Check HTTP Response Status Code Is
 
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleOperationGranting-API/ApiVersion.robot b/SOL003/VNFLifecycleOperationGranting-API/ApiVersion.robot
index 0e97091ce..b9291d316 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/ApiVersion.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/ApiVersion.robot
@@ -208,6 +208,6 @@ Check HTTP Response Status Code Is
 
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
index 4f9ce5172..6b791381a 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
@@ -172,7 +172,7 @@ Check HTTP Response Header Contains
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     
 Get an individual grant - Successful
diff --git a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
index 52b961997..f4f267ef1 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
@@ -158,5 +158,5 @@ Check HTTP Response Header Contains
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
diff --git a/SOL003/VNFPackageManagement-API/ApiVersion.robot b/SOL003/VNFPackageManagement-API/ApiVersion.robot
index 689766575..41eeca71b 100644
--- a/SOL003/VNFPackageManagement-API/ApiVersion.robot
+++ b/SOL003/VNFPackageManagement-API/ApiVersion.robot
@@ -210,6 +210,6 @@ Check HTTP Response Status Code Is
 
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
diff --git a/SOL003/VNFPerformanceManagement-API/ApiVersion.robot b/SOL003/VNFPerformanceManagement-API/ApiVersion.robot
index b975fc71f..88ba224c7 100644
--- a/SOL003/VNFPerformanceManagement-API/ApiVersion.robot
+++ b/SOL003/VNFPerformanceManagement-API/ApiVersion.robot
@@ -209,6 +209,6 @@ Check HTTP Response Status Code Is
 
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/ApiVersion.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/ApiVersion.robot
index 37cd37715..45cf503da 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/ApiVersion.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/ApiVersion.robot
@@ -206,6 +206,6 @@ Check HTTP Response Status Code Is
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot
index f33ff0732..8aab471ed 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot
@@ -34,7 +34,7 @@ Check HTTP Response Header Contains
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
     
diff --git a/SOL005/NSDManagement-API/ApiVersion.robot b/SOL005/NSDManagement-API/ApiVersion.robot
index 0d34a455b..aa117f09b 100644
--- a/SOL005/NSDManagement-API/ApiVersion.robot
+++ b/SOL005/NSDManagement-API/ApiVersion.robot
@@ -208,6 +208,6 @@ Check HTTP Response Status Code Is
 
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
diff --git a/SOL005/NSFaultManagement-API/ApiVersion.robot b/SOL005/NSFaultManagement-API/ApiVersion.robot
index 5038878de..5b8291f74 100644
--- a/SOL005/NSFaultManagement-API/ApiVersion.robot
+++ b/SOL005/NSFaultManagement-API/ApiVersion.robot
@@ -208,6 +208,6 @@ Check HTTP Response Status Code Is
 
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
diff --git a/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot b/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
index 4d9893ce8..20e4d62ac 100644
--- a/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
+++ b/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
@@ -35,7 +35,7 @@ Check HTTP Response Header Contains
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
     
diff --git a/SOL005/NSLifecycleManagement-API/ApiVersion.robot b/SOL005/NSLifecycleManagement-API/ApiVersion.robot
index 76b1e5d1c..fcbaad59f 100644
--- a/SOL005/NSLifecycleManagement-API/ApiVersion.robot
+++ b/SOL005/NSLifecycleManagement-API/ApiVersion.robot
@@ -208,6 +208,6 @@ Check HTTP Response Status Code Is
 
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
diff --git a/SOL005/NSPerformanceManagement-API/ApiVersion.robot b/SOL005/NSPerformanceManagement-API/ApiVersion.robot
index 8b20e5a67..8619b4931 100644
--- a/SOL005/NSPerformanceManagement-API/ApiVersion.robot
+++ b/SOL005/NSPerformanceManagement-API/ApiVersion.robot
@@ -208,6 +208,6 @@ Check HTTP Response Status Code Is
 
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/ApiVersion.robot b/SOL005/VNFPackageManagement-API/ApiVersion.robot
index 640b20e7c..5dc01749c 100644
--- a/SOL005/VNFPackageManagement-API/ApiVersion.robot
+++ b/SOL005/VNFPackageManagement-API/ApiVersion.robot
@@ -207,6 +207,6 @@ Check HTTP Response Status Code Is
 
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
-- 
GitLab


From 01a6bea91158f0160d3ade1115fde1129537d5e7 Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Fri, 11 Dec 2020 15:42:42 +0100
Subject: [PATCH 203/322] Fix issue #71

---
 .../ScaleVNFTask.robot                        |  6 ++--
 .../VnfLcmOperationKeywords.robot             | 30 ++++++++++++++++---
 .../environment/variables.txt                 |  3 +-
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
index f34e1bf96..e545c237d 100644
--- a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
@@ -17,7 +17,7 @@ POST Scale a vnfInstance
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Scale vnfInstance  
+    POST Scale vnfInstance    0
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
 
@@ -30,7 +30,7 @@ POST Scale a vnfInstance Conflict (Not-Instantiated)
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Scale vnfInstance  
+    POST Scale vnfInstance    1
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
 
@@ -43,7 +43,7 @@ POST Scale a vnfInstance Not Found
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Scale vnfInstance
+    POST Scale vnfInstance    2
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails 
    
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index 8cd37ad8b..f4dd79745 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -252,16 +252,38 @@ DELETE instantiate individual vnfInstance
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 	
-POST Scale vnfInstance	
+
+POST Scale vnfInstance
+    [Arguments]    ${vnf_state}
+    [Documentation]    ${vnf_state} differentiate the VNF ID to be used in the different POST requests
+    ...    ${vnf_state} == 0 -> VNF in instantiated state
+    ...    ${vnf_state} == 1 -> VNF in not_instantiated state
+    ...    ${vnf_state} == 2 -> VNF ID not stored
+    ...     
     Log    Trying to Instantiate a vnf Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template}=    Get File    jsons/scaleVnfRequest.json
-    ${body}=        Format String   ${template}     scaleVnfRequesttype=${scaleVnfRequesttype}    scaleVnfRequestAspect=${scaleVnfRequestAspect} 
+    ${body}=    Get File    jsons/scaleVnfRequest.json
+    Run Keyword If    ${vnf_state} == 0    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${instantiatedVnfInstanceId}/scale    ${body}
+    Run Keyword If    ${vnf_state} == 1    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notInstantiatedVnfInstanceId}/scale    ${body}
+    Run Keyword If    ${vnf_state} == 2    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${NOT_EXISTANT_VNF_INSTANCE_ID}/scale    ${body}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
-    ${outputResponse}=    Output    response
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
+	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
+
+
+# POST Scale vnfInstance	
+    # Log    Trying to Instantiate a vnf Instance
+    # Set Headers  {"Accept":"${ACCEPT}"}  
+    # Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    # Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    # ${template}=    Get File    jsons/scaleVnfRequest.json
+    # ${body}=        Format String   ${template}     scaleVnfRequesttype=${scaleVnfRequesttype}    scaleVnfRequestAspect=${scaleVnfRequestAspect} 
+    # Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
+    # ${outputResponse}=    Output    response
+	# Set Global Variable    ${response}    ${outputResponse} 
 GET Scale vnfInstance				
     Log    Trying to get a scale a vnf Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
diff --git a/SOL002/VNFLifecycleManagement-API/environment/variables.txt b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
index 29e211d27..922dc705f 100644
--- a/SOL002/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
@@ -38,7 +38,8 @@ ${subscriptionId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
 ${VnfLcmOperationOccurrenceNotification}    {}
 ${VnfIdentifierCreationNotification}    {}
 ${VnfIdentifierDeletionNotification}    {}
-
+${notInstantiatedVnfInstanceId}    NOT_INSTANTIATED_VNF_INSTANCE_ID
+${NOT_EXISTANT_VNF_INSTANCE_ID}    NOT_EXISTANT_VNF_INSTANCE_ID    
 ${SYNC_MODE}    0
 
 ${callback_uri}    http://localhost
-- 
GitLab


From 71076f1736ac5b09fc4ba1ea82822f85763d34ba Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Fri, 11 Dec 2020 18:04:10 +0100
Subject: [PATCH 204/322] Fix issue #77

---
 .../VNFPackageManagementKeywords.robot               |  6 +++---
 .../IndividualReport.robot                           | 12 ++++++------
 .../IndividualThreshold.robot                        | 12 ++++++------
 SOL003/VNFPerformanceManagement-API/Thresholds.robot | 10 +++++-----
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 88032d975..d751124a8 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -691,13 +691,13 @@ Send Delete request for individual VNF Package Subscription with invalid resourc
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual VNF Package Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for individual VNF Package Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -706,7 +706,7 @@ Send Put request for individual VNF Package Subscription
     Set Suite Variable    ${response}    ${output}
     
 Send Patch request for individual VNF Package Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualReport.robot b/SOL003/VNFPerformanceManagement-API/IndividualReport.robot
index 62be3b6fc..48017858d 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualReport.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualReport.robot
@@ -83,7 +83,7 @@ DELETE Individual Performance Report - Method not implemented
 Get Individual Performance Report
     Log    Trying to get a performance report present in the VNFM
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -91,21 +91,21 @@ Get Individual Performance Report
 Get Individual Performance Report with invalid resource endpoint
     Log    Trying to get a performance report with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${erroneousReportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for Individual Performance Report
     Log    Trying to create new performance report
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for Individual Performance Report
     Log    Trying to update performance report
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -115,7 +115,7 @@ Send Put request for Individual Performance Report
     
 Send Patch request for Individual Performance Report
     Log    Trying to update performance report
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -125,7 +125,7 @@ Send Patch request for Individual Performance Report
 
 Send Delete request for Individual Performance Report
     Log    Trying to delete performance report   
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
index b34edb3a9..1790d9cd4 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -113,7 +113,7 @@ PATCH Individual Threshold - Precondition failed
 GET Individual VNF Performance Threshold
     Log    Trying to get a Threhsold present in the VNFM
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -121,28 +121,28 @@ GET Individual VNF Performance Threshold
 GET individual VNF Performance Threshold with invalid resource identifier
     Log    Trying to get a Threhsold with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${erroneousThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual VNF Performance Threshold
     Log    Trying to delete a Threhsold in the VNFM
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual VNF Performance Threshold with invalid resource identifier
     Log    Trying to delete a Threhsold in the VNFM with invalid id
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${erroneousThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual VNF Performance Threshold
     Log    Trying to create new threshold
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${newThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -150,7 +150,7 @@ Send Post request for individual VNF Performance Threshold
 Send Put request for individual VNF Performance Threshold
     Log    Trying to PUT threshold
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
diff --git a/SOL003/VNFPerformanceManagement-API/Thresholds.robot b/SOL003/VNFPerformanceManagement-API/Thresholds.robot
index b43be7c97..1555adaa8 100644
--- a/SOL003/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL003/VNFPerformanceManagement-API/Thresholds.robot
@@ -140,7 +140,7 @@ GET Performance Thresholds - Bad Request Response too Big
 GET all Performance Thresholds
     Log    Trying to get all thresholds present in the VNFM    
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -148,7 +148,7 @@ GET all Performance Thresholds
 GET Performance Thresholds with attribute-based filter
     Log    Trying to get thresholds present in the VNFM with filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds?${FILTER_OK}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -156,7 +156,7 @@ GET Performance Thresholds with attribute-based filter
 GET Performance Thresholds with invalid attribute-based filter
     Log    Trying to get thresholds present in the VNFM with invalid filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds?${FILTER_KO}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -164,7 +164,7 @@ GET Performance Thresholds with invalid attribute-based filter
 GET VNF Performance Thresholds with invalid resource endpoint
     Log    Trying to get thresholds present in the VNFM with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/threshold
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -200,7 +200,7 @@ Send PATCH Request for all Performance Thresholds
 
 Send DELETE Request for all Performance Thresholds
     Log    DELETE THresholds
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
-- 
GitLab


From 86bfa3cb8e646bd3f85309b5c463912b9212c37d Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Fri, 11 Dec 2020 18:05:50 +0100
Subject: [PATCH 205/322] Fix issue #83

---
 .../schemas/{vnfLcmOpOcc.schema.json => VnfLcmOpOcc.schema.json}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename SOL003/VNFLifecycleManagement-API/schemas/{vnfLcmOpOcc.schema.json => VnfLcmOpOcc.schema.json} (100%)

diff --git a/SOL003/VNFLifecycleManagement-API/schemas/vnfLcmOpOcc.schema.json b/SOL003/VNFLifecycleManagement-API/schemas/VnfLcmOpOcc.schema.json
similarity index 100%
rename from SOL003/VNFLifecycleManagement-API/schemas/vnfLcmOpOcc.schema.json
rename to SOL003/VNFLifecycleManagement-API/schemas/VnfLcmOpOcc.schema.json
-- 
GitLab


From d2d76d7b2ae197ebd2dcdd917b9699b78bb4339f Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Fri, 11 Dec 2020 18:50:53 +0100
Subject: [PATCH 206/322] Fix issue #89

---
 .../VNFLifecycleManagement-API/RetryOperationWorkflow.robot   | 4 ----
 .../RollBackOperationWorkflow.robot                           | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
index 8544fc162..bf4db381d 100644
--- a/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
@@ -21,8 +21,6 @@ Retry VNF LCM Operation - Successful
     ...    Post-Conditions: The VNF lifecycle management operation occurrence is in COMPLETED state
     Send Retry Operation Request
     Check HTTP Response Status Code Is    202
-    Check HTTP Response Header Contains    Location 
-    Check Operation Occurrence Id existence
     Check Operation Notification For Retry    PROCESSING
     Check Operation Notification For Retry    COMPLETED
     Check Postcondition VNF Retry Successful
@@ -38,8 +36,6 @@ Retry VNF LCM Operation - Unsuccessful
     ...    Post-Conditions: The VNF lifecycle management operation occurrence is in FAILED_TEMP state
     Send Retry Operation Request
     Check HTTP Response Status Code Is    202
-    Check HTTP Response Header Contains    Location 
-    Check Operation Occurrence Id existence
     Check Operation Notification For Retry    PROCESSING
     Check Operation Notification For Retry    FAILED_TEMP
     Check Postcondition VNF Retry Unsuccessful
diff --git a/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
index f401cc094..3e42be057 100644
--- a/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
@@ -23,8 +23,6 @@ Rollback a VNF LCM Operation - Successful
     ...    Post-Conditions: The VNF lifecycle management operation occurrence is in ROLLED_BACK state
     Send Roll back Operation Request
     Check HTTP Response Status Code Is    202
-    Check HTTP Response Header Contains    Location 
-    Check Operation Occurrence Id existence
     Check Operation Notification For Roll Back    ROLLING_BACK
     Check Operation Notification For Roll Back    ROLLED_BACK
     Check Postcondition VNF Roll Back Successful
@@ -40,8 +38,6 @@ Rollback VNF LCM Operation - Unsuccessful
     ...    Post-Conditions: The VNF lifecycle management operation occurrence is in FAILED_TEMP state
     Send Roll back Operation Request
     Check HTTP Response Status Code Is    202
-    Check HTTP Response Header Contains    Location 
-    Check Operation Occurrence Id existence
     Check Operation Notification For Roll Back    ROLLING_BACK
     Check Operation Notification For Roll Back    FAILED_TEMP
     Check Postcondition VNF Roll Back UnSuccessful
-- 
GitLab


From 5521fdee115658f83195a1320ee3ef7601b915e9 Mon Sep 17 00:00:00 2001
From: uihassan <uihassan@etsi.org>
Date: Tue, 15 Dec 2020 06:43:36 +0500
Subject: [PATCH 207/322] VNF Descriptors added for 7.3.1.6.1-3

---
 .../VnfLcmMntOperationKeywords.robot                          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index 306f854c0..e9fdf938b 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -332,8 +332,10 @@ POST Change VNF deployment flavour
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get key for VNF Descriptor
+    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
     ${template}=    Get File    jsons/changeVnfFlavourRequest.json
-    ${body}=        Format String   ${template}     newFlavourId=${newFlavourId}
+    ${body}=        Format String   ${template}     newFlavourId=${flavour_id}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_flavour    ${body} 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  	 
-- 
GitLab


From 0513d64e31d66332e8d711a80b82117c3410e157 Mon Sep 17 00:00:00 2001
From: uihassan <uihassan@etsi.org>
Date: Tue, 15 Dec 2020 07:25:31 +0500
Subject: [PATCH 208/322] VNF Descriptors added for 7.3.1.12.2

---
 .../IndividualVnfLcmOperationOccurence.robot  |  1 +
 .../VnfLcmMntOperationKeywords.robot          | 20 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot b/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
index 5722c62a9..85bc89adc 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
@@ -30,6 +30,7 @@ Get Individual VNF LCM Operation occurrences
     Get Individual VNF LCM Operation occurrences
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    VnfLcmOpOcc 
+    Check HTTP Response Body of Individual VNF LCM Operation occurrences content against VNF Descriptor
 
 PUT Individual VNF LCM Operation occurrences - Method not implemented
     [Documentation]    Test ID: 7.3.1.12.3
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index e9fdf938b..ce0725c0f 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -1244,4 +1244,22 @@ Get key for VNF Descriptor
         Log    ${key}
         ${check1}=    Run Keyword And Return Status    Should Be Equal As Strings    ${topology_template.node_templates.${key}.type}    tosca.nodes.nfv.VNF
         Run Keyword If     ${check1}     Set Global Variable    ${vnfKey}    ${key}   
-    END
\ No newline at end of file
+    END
+    
+Check HTTP Response Body of Individual VNF LCM Operation occurrences content against VNF Descriptor
+    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 VNF LCM    ELSE    Parse SOL006 VNF LCM
+    
+Parse SOL001 Individual VNF LCM
+    Get key for VNF Descriptor
+    
+    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
+    Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdId']}    ${descriptor_id}
+    Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdVersion']}    ${descriptor_version}
+    
+Parse SOL006 Individual VNF LCM
+    ${descriptor_id}=    Get Variable Value    ${nfv.vnfd[0].id}
+    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}
+    Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdId']}    ${descriptor_id}
+    Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdVersion']}    ${descriptor_version}
+         
\ No newline at end of file
-- 
GitLab


From bb61db5fefb7f0db7f4d159a106b3aef223929c0 Mon Sep 17 00:00:00 2001
From: uihassan <uihassan@etsi.org>
Date: Tue, 15 Dec 2020 07:38:20 +0500
Subject: [PATCH 209/322] VNF Descriptors added for 7.3.2.1.1-3

---
 .../Grants.robot                              | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
index 4f9ce5172..3ab3f76e1 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
@@ -114,8 +114,10 @@ Send Request Grant Request in Synchronous mode
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Get key for VNF Descriptor
+    ${vnf_flavour_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
     ${template}=    Get File    jsons/grantRequest.json
-    ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${vnfdId}    flavourId=${flavourId}
+    ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${vnfdId}    flavourId=${vnf_flavour_id}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/grants    ${body}
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
@@ -126,8 +128,10 @@ Send Request Grant Request in Asynchronous mode
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Get key for VNF Descriptor
+    ${vnf_flavour_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
     ${template}=    Get File    jsons/grantRequest.json
-    ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${vnfdId}    flavourId=${flavourId}
+    ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${vnfdId}    flavourId=${vnf_flavour_id}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/grants    ${body}
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
@@ -138,23 +142,13 @@ Send Request for a new Grant Forbiden Operation
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Get key for VNF Descriptor
+    ${vnf_flavour_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
     ${template}=    Get File    jsons/grantRejectedRequest.json
-    ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${vnfdId}    flavourId=${flavourId}
+    ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${vnfdId}    flavourId=${vnf_flavour_id}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/grants    ${body}
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
-   
-Send Request Grant Request
-    Set Headers    {"Accept": "${ACCEPT}"}
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${template}=    Get File    jsons/grantRequest.json
-    ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${vnfdId}    flavourId=${flavourId}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/grants    ${body}    allow_redirects=false
-    ${resp}    Output    response
-    ${result}=    evaluate    json.loads(json.dumps(${resp}))    json
-    Log  ${result}
-    Set Suite Variable    ${response}    ${result}
     
 Check HTTP Response Status Code Is
     [Arguments]    ${expected_status}    
-- 
GitLab


From 102df7518f2492ab5a0aed14bbc4c3671cb14551 Mon Sep 17 00:00:00 2001
From: uihassan <uihassan@etsi.org>
Date: Tue, 15 Dec 2020 07:58:21 +0500
Subject: [PATCH 210/322] VNF Descriptors added for 7.3.3.2.1

---
 .../Grants.robot                              |  1 +
 .../IndividualVNFPackage.robot                |  1 +
 .../VNFPackageManagementKeywords.robot        | 42 ++++++++++++++++++-
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
index 3ab3f76e1..6c832261b 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
@@ -5,6 +5,7 @@ Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=fals
 Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
+Variables    descriptors/SOL001/vnf-b-1_VNF.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.
 
diff --git a/SOL003/VNFPackageManagement-API/IndividualVNFPackage.robot b/SOL003/VNFPackageManagement-API/IndividualVNFPackage.robot
index 6732e9cb8..67fda5b2c 100644
--- a/SOL003/VNFPackageManagement-API/IndividualVNFPackage.robot
+++ b/SOL003/VNFPackageManagement-API/IndividualVNFPackage.robot
@@ -19,6 +19,7 @@ GET Individual VNF Package
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   vnfPkgInfo
     Check HTTP Response Body vnfPkgInfo Identifier matches the requested VNF Package
+    Check HTTP Response Body of Individual VNF Package content against VNF Descriptor
 
 GET Individual VNF Package with invalid resource identifier
     [Documentation]    Test ID: 7.3.3.2.2
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 88032d975..dfdfa3b11 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -9,7 +9,7 @@ Library    Collections
 Library    JSONSchemaLibrary    schemas/
 Library    Process
 Library    String
-
+Variables    descriptors/SOL001/vnf-b-1_VNF.yaml
 
 *** Keywords ***
 Get all VNF Packages
@@ -1524,4 +1524,42 @@ GET OnBoarded VNF Packages with fields and exclude_default attribute selector
 Check Postcondition VNF Package Subscription is Deleted
     Log    Check Postcondition Subscription is deleted
     GET individual VNF Package Subscription
-    Check HTTP Response Status Code Is    404 
\ No newline at end of file
+    Check HTTP Response Status Code Is    404 
+    
+Check HTTP Response Body of Individual VNF Package content against VNF Descriptor
+    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 VNF Package    ELSE    Parse SOL006 VNF Package    
+    
+Parse SOL001 VNF Package
+    Get key for VNF Descriptor
+    
+    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
+    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
+    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
+    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
+    
+    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${descriptor_id}
+    Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${provider}
+    Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${product_name}
+    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}
+    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
+    
+Get key for VNF Descriptor
+    FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
+        Log    ${key}
+        ${check1}=    Run Keyword And Return Status    Should Be Equal As Strings    ${topology_template.node_templates.${key}.type}    tosca.nodes.nfv.VNF
+        Run Keyword If     ${check1}     Set Global Variable    ${vnfKey}    ${key}   
+    END
+    
+Parse SOL006 VNF Package
+    ${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}
+     ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
+     ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}
+     
+    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${descriptor_id}
+    Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${provider}
+    Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${product_name}
+    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}
+    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
\ No newline at end of file
-- 
GitLab


From 6685f7946eced38ea97bdd5d62c490d63ecd83a3 Mon Sep 17 00:00:00 2001
From: uihassan <uihassan@etsi.org>
Date: Tue, 15 Dec 2020 08:12:52 +0500
Subject: [PATCH 211/322] VNF Descriptors added for 7.3.3.7.1

---
 .../IndividualSubscription.robot              |  1 +
 .../VNFPackageManagementKeywords.robot        | 41 ++++++++++++++++---
 .../environment/variables.txt                 |  1 +
 3 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/SOL003/VNFPackageManagement-API/IndividualSubscription.robot b/SOL003/VNFPackageManagement-API/IndividualSubscription.robot
index 2219974bc..41839a657 100644
--- a/SOL003/VNFPackageManagement-API/IndividualSubscription.robot
+++ b/SOL003/VNFPackageManagement-API/IndividualSubscription.robot
@@ -20,6 +20,7 @@ GET Individual VNF Package Subscription
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   PkgmSubscription
     Check HTTP Response Body Subscription Identifier matches the requested Subscription
+    Check HTTP Response Body of Individual Subscription content against VNF Descriptor
 
 GET Individual VNF Package Subscription with invalid resource identifier
     [Documentation]    Test ID: 7.3.3.7.2
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index dfdfa3b11..deed6bc83 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -1553,13 +1553,44 @@ Get key for VNF Descriptor
     
 Parse SOL006 VNF Package
     ${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}
-     ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
-     ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}
+    ${provider}=    Get Variable Value    ${nfv.vnfd[0].provider}
+    ${product_name}=    Get Variable Value    ${nfv.vnfd[0].product-name}
+    ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
+    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}
      
     Should Be Equal As Strings    ${response['body']['vnfdId']}    ${descriptor_id}
     Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${provider}
     Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${product_name}
     Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}
-    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
\ No newline at end of file
+    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
+    
+Check HTTP Response Body of Individual Subscription content against VNF Descriptor
+    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 Package Subscription    ELSE    Parse SOL006 Package Subscription
+    
+Parse SOL001 Package Subscription
+    Get key for VNF Descriptor
+    
+    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
+    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
+    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
+    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
+    
+    Should Be Equal As Strings    ${response['body']['filter']['vnfdId']}    ${descriptor_id}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProvider']}    ${provider}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['vnfProductName']}    ${product_name}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['versions']['vnfSoftwareVesion']}    ${software_version}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['versions']['vnfdVersion']}    ${descriptor_version}
+    
+Parse SOL006 Package Subscription
+    ${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}
+    ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
+    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}
+     
+    Should Be Equal As Strings    ${response['body']['filter']['vnfdId']}    ${descriptor_id}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProvider']}    ${provider}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['vnfProductName']}    ${product_name}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['versions']['vnfSoftwareVesion']}    ${software_version}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['versions']['vnfdVersion']}    ${descriptor_version}
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/environment/variables.txt b/SOL003/VNFPackageManagement-API/environment/variables.txt
index 1bb5c34f5..8cc86ab17 100644
--- a/SOL003/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL003/VNFPackageManagement-API/environment/variables.txt
@@ -21,6 +21,7 @@ ${apiName}        vnfpkgm
 ${NFVO_CHECKS_NOTIF_ENDPOINT}    1        ## If true, during subscription, the FUT performs a get to the notification endpoint
 
 ${NFVO_ALLOWS_DUPLICATE_SUBS}    1
+${descriptorType}	SOL001
 
 ${response}    httpresponse
 
-- 
GitLab


From 9530726b04444691dfbb8597319204bfe25947f1 Mon Sep 17 00:00:00 2001
From: uihassan <uihassan@etsi.org>
Date: Sun, 20 Dec 2020 07:17:00 +0500
Subject: [PATCH 212/322] Descriptors for 6.3.5.1.1 added

---
 .../VNFInstances.robot                        |   1 -
 .../VnfLcmOperationKeywords.robot             |  19 +-
 .../descriptors/SOL001/vnf-b-1_VNF.yaml       | 168 ++++++++++++++++++
 .../reference_tst010_vnf_b_2df_SOL006.yaml    | 105 +++++++++++
 .../environment/variables.txt                 |   5 +-
 .../jsons/createVnfRequest.json               |  14 +-
 6 files changed, 305 insertions(+), 7 deletions(-)
 create mode 100644 SOL002/VNFLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
 create mode 100644 SOL002/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml

diff --git a/SOL002/VNFLifecycleManagement-API/VNFInstances.robot b/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
index 9f2f09c01..e518ec98a 100644
--- a/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
+++ b/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
@@ -33,7 +33,6 @@ GET information about multiple VNF instances
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    vnfInstances
     
-
 GET information about multiple VNF instances Bad Request Invalid attribute-based filtering parameters
     [Documentation]    Test ID: 6.3.5.1.3
     ...    Test title: GET information about multiple VNF instances Bad Request Invalid attribute-based filtering parameters
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index 210784c18..dfc2dad13 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -10,6 +10,7 @@ Library    JSONLibrary
 Library    Collections
 Library    JSONSchemaLibrary    schemas/
 Library           String
+Variables    descriptors/SOL001/vnf-b-1_VNF.yaml
 
 *** Keywords ***
 
@@ -79,8 +80,15 @@ POST Create a new vnfInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get key for VNF Descriptor
+    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
+    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
+    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
+    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
+    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
     ${template} =    Get File    jsons/createVnfRequest.json
-    ${body}=        Format String   ${template}     vnfdId=${vnfdId}
+    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfProvider=${provider}    vnfProductName=${product_name}    vnfSoftwareVersion=${software_version}    vnfdVersion= ${descriptor_version}    flavourId=${flavour_id}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
@@ -1015,4 +1023,11 @@ Get VNF LCM Operation occurrences with exclude_fields attribute selector
     
 Check HTTP Response Header Contain Link
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
-    Should Not Be Empty    ${linkURL}
\ No newline at end of file
+    Should Not Be Empty    ${linkURL}
+    
+Get key for VNF Descriptor
+    FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
+        Log    ${key}
+        ${check1}=    Run Keyword And Return Status    Should End With    ${key}    VNF
+        Run Keyword If     ${check1}     Set Global Variable    ${vnfKey}    ${key}   
+    END
diff --git a/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml b/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
new file mode 100644
index 000000000..1712e2b33
--- /dev/null
+++ b/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
@@ -0,0 +1,168 @@
+tosca_definitions_version: tosca_simple_yaml_1_2
+description: "TST010 reference VNF-B"
+metadata:
+  descriptor_id: "VNF-B"
+  vendor: "ETSI TST WG"
+  version: "2.0"
+topology_template:
+  substitution_mappings:
+    node_type: "tosca.nodes.nfv.VNF"
+    requirements:
+      virtual_link_management:
+        [management, virtual_link_management]
+      virtual_link_left:
+        [left, virtual_link_left]
+      virtual_link_right:
+        [right, virtual_link_right]
+  node_templates:
+    VDU-B-1:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-1-vcd"
+        descriptor: "Description of VDU-B-1"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 2
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 4096
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-1-vsd"
+    VDU-B-2:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-2-vcd"
+        descriptor: "Description of VDU-B-2"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 4
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 6144
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-2-vsd"
+    right:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 1
+      requirements:
+        virtual_link_right:
+        virtual_binding: VDU-B-2
+    management:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 0
+      requirements:
+        virtual_link_management:
+        virtual_binding: VDU-B-1
+    left:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 2
+      requirements:
+        virtual_link_left:
+        virtual_binding: VDU-B-1
+    internal_vl:
+      type: tosca.nodes.nfv.VnfVirtualLink
+      properties:
+        connectivity_type:
+          layer_protocols: [ ipv4 ]
+        description: Internal Virtual link in the VNF
+        vl_profile:
+          max_bitrate_requirements:
+            root: 100000
+            leaf: 20000
+          min_bitrate_requirements:
+            root: 10000
+            leaf: 10000
+    internal_vdu_b_1_cp:
+      type: tosca.nodes.nfv.VduCp
+      properties:
+        order: 2
+      requirements:
+        - virtual_binding: VDU-B-1
+        - virtual_link: internal_vl
+    internal_vdu_b_2_cp:
+      type: tosca.nodes.nfv.VduCp
+      properties:
+        order: 0
+      requirements:
+        - virtual_binding: VDU-B-2
+        - virtual_link: internal_vl
+    vdu-b-1-vsd:
+      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
+      properties:
+        virtual_block_storage_data:
+          size_of_storage: 20
+          rdma_enabled: false
+        sw_image_data:
+          name: "vdu-b-1 image"
+          version: "1.1"
+          checksum: 
+            algorithm: "sha-224"
+            hash: "somehashfortst010"
+          container_format: "bare"
+          disk-format: qcow2
+          min-disk: '1'
+          min-ram: '2'
+          size: '1'
+      artifacts:
+        sw_image:
+          type: tosca.artifacts.nfv.SwImage
+          file: vdu-b-1.qcow2
+    vdu-b-1-vsd:
+      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
+      properties:
+        virtual_block_storage_data:
+          size_of_storage: 20
+          rdma_enabled: false
+        sw_image_data:
+          name: "vdu-b-1 image"
+          version: "1.1"
+          checksum: 
+            algorithm: "sha-224"
+            hash: "somehashfortst010"
+          container_format: "bare"
+          disk-format: qcow2
+          min-disk: '1'
+          min-ram: '2'
+          size: '1'
+      artifacts:
+        sw_image:
+          type: tosca.artifacts.nfv.SwImage
+          file: vdu-b-2.qcow2
+    vnf_b_1_VNF:
+      type: "tosca.nodes.nfv.VNF"
+      properties:
+        descriptor_id: "VNF-B-2VDUs"
+        descriptor_version: "2.0"
+        provider: "ETSI TST WG"
+        product_name: "VNF-B-2VDUs"
+        software_version: "2.0"
+        product_info_name: "VNF-B-2VDUs"
+        product_info_description: "TST010 reference VNF-B with 2 VDUs"
+        flavour_id: "VNF-B-2VDU_flavor"
+        flavour_description: "VNF-B with 2 VDUs flavor"
+        vnfm_info: 
+          etsivnfm: 
+          - v2.3.1 
+        interfaces:
+            Vnflcm:
+              scale:
+                implementation: scale-example.yaml
+              terminate:
+                implementation: terminate-example.yaml
+              operate:
+                implementation: operate-example.yaml
diff --git a/SOL002/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml b/SOL002/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
new file mode 100644
index 000000000..4b84be92b
--- /dev/null
+++ b/SOL002/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
@@ -0,0 +1,105 @@
+nfv:
+  vnfd:
+    - id: VNF-B-2df
+      provider: ETSI TST WG
+      product-name: TST010 reference VNF-B with 2 DFs
+      software-version: '2.1'
+      version: '2.1'
+      vnfm-info: ETSI VNFM
+      vdu:
+        id: vdu-b-1
+        name: VNF-B VDU 1
+        int-cpd:
+          - id: left
+            layer-protocol: ethernet
+          - id: management
+            layer-protocol: ethernet
+          - id: right
+            layer-protocol: ethernet
+        virtual-compute-desc: vdu-b-1-vcd
+        virtual-storage-desc: vdu-b-1-vsd
+        sw-image-desc: vdu-b-1-image
+      virtual-compute-desc:
+        id: vdu-b-1-vcd
+        virtual-memory:
+          size: '4.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-1-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-1-image
+        name: VNF-B image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B.qcow2'
+      ext-cpd:
+        - id: ext-b-left
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: left
+          layer-protocol: ethernet
+        - id: management
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: management
+          layer-protocol: ethernet
+        - id: ext-b-right
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: right
+          layer-protocol: ethernet
+      df:
+        - id: small
+          vdu-profile:
+            id: vdu-b-1
+            min-number-of-instances: '1'
+            max-number-of-instances: '2'
+          instantiation-level:
+            - id: double
+              vdu-level:
+                vdu-id: vdu-b-1
+                number-of-instances: '2'
+            - id: single
+              vdu-level:
+                vdu-id: vdu-b-1
+                number-of-instances: '1'
+          default-instantiation-level: single
+          lcm-operations-configuration:
+            scale-vnf-to-level-op-config:
+              arbitrary-target-levels-supported: 'true'
+            terminate-vnf-op-config:
+              min-graceful-termination: '1'
+            operate-vnf-op-config:
+              min-graceful-stop-timeout: '1'
+        - id: big
+          vdu-profile:
+            id: vdu-b-1
+            min-number-of-instances: '1'
+            max-number-of-instances: '4'
+          instantiation-level:
+            - id: double
+              vdu-level:
+                vdu-id: vdu-b-1
+                number-of-instances: '2'
+            - id: triple
+              vdu-level:
+                vdu-id: vdu-b-1
+                number-of-instances: '3'
+          default-instantiation-level: double
+          lcm-operations-configuration:
+            scale-vnf-to-level-op-config:
+              arbitrary-target-levels-supported: 'true'
+            terminate-vnf-op-config:
+              min-graceful-termination: '1'
+            operate-vnf-op-config:
+              min-graceful-stop-timeout: '1'
diff --git a/SOL002/VNFLifecycleManagement-API/environment/variables.txt b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
index 29e211d27..511ea0e2f 100644
--- a/SOL002/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
@@ -77,4 +77,7 @@ ${changeStateTo}    STOPPED
 
 ${vnfdIds}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
 
-${callbackResp}    localhost
\ No newline at end of file
+${callbackResp}    localhost
+
+${descriptorType}    SOL001
+${vnfKey}    {}
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/createVnfRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/createVnfRequest.json
index 5c9c30a25..6d6066433 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/createVnfRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/createVnfRequest.json
@@ -1,5 +1,13 @@
 {{
-  "vnfdId": "${vnfdId}",
   "vnfInstanceName": "string",
-  "vnfInstanceDescription": "string"
-}}
\ No newline at end of file
+  "vnfInstanceDescription": "string",
+  "vnfdId": "{vnfdId}",
+  "vnfProvider":"{vnfProvider}",
+  "vnfProductName":"{vnfProductName}",
+  "vnfSoftwareVersion":"{vnfSoftwareVersion}",
+  "vnfdVersion":"{vnfdVersion}",
+  "instantiatedVnfInfo":{{
+  	"flavourId":"{flavourId}",
+  	"vnfState":"STARTED"
+  }}
+}}
-- 
GitLab


From d7494b97579416f74957be8007f9fb69d2a865dc Mon Sep 17 00:00:00 2001
From: uihassan <uihassan@etsi.org>
Date: Sun, 20 Dec 2020 07:31:10 +0500
Subject: [PATCH 213/322] Descriptors for 6.3.5.2.2 added

---
 .../IndividualVNFInstance.robot               |  1 +
 .../VnfLcmOperationKeywords.robot             | 39 +++++++++++++++++++
 .../environment/variables.txt                 |  3 +-
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index 826228e15..65aba97b4 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
@@ -37,6 +37,7 @@ GET Information about an individual VNF Instance
     GET individual vnfInstance
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    vnfInstance
+    Check HTTP Response Body vnfInstance content against VNF Descriptor
     
 PUT Individual VNFInstance - Method not implemented 
      [Documentation]    Test ID: 6.3.5.2.3
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index dfc2dad13..89da19236 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -1031,3 +1031,42 @@ Get key for VNF Descriptor
         ${check1}=    Run Keyword And Return Status    Should End With    ${key}    VNF
         Run Keyword If     ${check1}     Set Global Variable    ${vnfKey}    ${key}   
     END
+
+Check HTTP Response Body vnfInstance content against VNF Descriptor
+    #${check_descriptors} flag, 1 to check descriptors
+    Run Keyword If    ${check_descriptors} == 1    Check Individual VNF Instance Content
+    
+Check Individual VNF Instance Content    
+    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001    ELSE    Parse SOL006
+    
+Parse SOL001
+    Get key for VNF Descriptor
+    
+    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
+    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
+    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
+    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
+    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
+    
+    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${descriptor_id}
+    Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${provider}
+    Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${product_name}
+    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}
+    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
+    Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['flavourId']}    ${flavour_id}
+    
+Parse SOL006
+    #Log    SOL006 code
+     ${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}
+     ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
+     ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}
+     
+    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${descriptor_id}
+    Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${provider}
+    Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${product_name}
+    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}
+    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
+
diff --git a/SOL002/VNFLifecycleManagement-API/environment/variables.txt b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
index 511ea0e2f..af7f6a479 100644
--- a/SOL002/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
@@ -80,4 +80,5 @@ ${vnfdIds}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
 ${callbackResp}    localhost
 
 ${descriptorType}    SOL001
-${vnfKey}    {}
\ No newline at end of file
+${vnfKey}    {}
+${check_descriptors}	1
\ No newline at end of file
-- 
GitLab


From 5a6e72a1bf3d7262890b19af862c80bfa44679f2 Mon Sep 17 00:00:00 2001
From: uihassan <uihassan@etsi.org>
Date: Mon, 21 Dec 2020 07:11:42 +0500
Subject: [PATCH 214/322] Added SOL006 descriptors in 6.3.5.1.1

---
 .../VnfLcmOperationKeywords.robot             | 28 +++++++++++++------
 .../environment/variables.txt                 |  9 +++++-
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index 89da19236..421a8d71c 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -80,15 +80,9 @@ POST Create a new vnfInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get key for VNF Descriptor
-    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
-    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
-    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
-    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
-    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
-    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
+    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Instance Post
     ${template} =    Get File    jsons/createVnfRequest.json
-    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfProvider=${provider}    vnfProductName=${product_name}    vnfSoftwareVersion=${software_version}    vnfdVersion= ${descriptor_version}    flavourId=${flavour_id}
+    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfProvider=${provider}    vnfProductName=${product_name}    vnfSoftwareVersion=${software_version}    vnfdVersion= ${descriptor_version}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
@@ -1057,7 +1051,6 @@ Parse SOL001
     Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['flavourId']}    ${flavour_id}
     
 Parse SOL006
-    #Log    SOL006 code
      ${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}
@@ -1070,3 +1063,20 @@ Parse SOL006
     Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}
     Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
 
+Add VNF Descriptor Content to VNF Instance Post
+    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 VNF Instance    ELSE    Parse SOL006 VNF Instance
+    
+Parse SOL001 VNF Instance
+    Get key for VNF Descriptor
+    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
+    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
+    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
+    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
+    
+Parse SOL006 VNF Instance
+    ${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}
+    ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
+    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}     
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/environment/variables.txt b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
index af7f6a479..f0679b13b 100644
--- a/SOL002/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
@@ -81,4 +81,11 @@ ${callbackResp}    localhost
 
 ${descriptorType}    SOL001
 ${vnfKey}    {}
-${check_descriptors}	1
\ No newline at end of file
+${check_descriptors}	1
+
+${descriptor_id}	
+${provider}	
+${product_name}    
+${software_version}    
+${descriptor_version}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances    ${body}
\ No newline at end of file
-- 
GitLab


From eaf4dbc36b721f9a7562541037e6fc2d6e476b08 Mon Sep 17 00:00:00 2001
From: uihassan <uihassan@etsi.org>
Date: Mon, 21 Dec 2020 07:21:23 +0500
Subject: [PATCH 215/322] Descriptors for 6.3.5.2.4 added

---
 .../VnfLcmOperationKeywords.robot                         | 8 +++++---
 .../jsons/createVnfRequest.json                           | 6 +-----
 .../jsons/patchBodyRequest.json                           | 3 ++-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index 421a8d71c..4105f3616 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -80,7 +80,7 @@ POST Create a new vnfInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Instance Post
+    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Instance
     ${template} =    Get File    jsons/createVnfRequest.json
     ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfProvider=${provider}    vnfProductName=${product_name}    vnfSoftwareVersion=${software_version}    vnfdVersion= ${descriptor_version}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances    ${body}
@@ -204,7 +204,9 @@ PATCH individual vnfInstance
     Set Headers    {"Content-Type": "${CONTENT_TYPE_PATCH}"}
     Set Headers    {"If-Match": "${original_etag}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/patchBodyRequest.json
+    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Instance
+    ${template}=    Get File    jsons/patchBodyRequest.json
+    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}    ${body}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -1063,7 +1065,7 @@ Parse SOL006
     Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}
     Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
 
-Add VNF Descriptor Content to VNF Instance Post
+Add VNF Descriptor Content to VNF Instance
     Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 VNF Instance    ELSE    Parse SOL006 VNF Instance
     
 Parse SOL001 VNF Instance
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/createVnfRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/createVnfRequest.json
index 6d6066433..08fe8a182 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/createVnfRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/createVnfRequest.json
@@ -5,9 +5,5 @@
   "vnfProvider":"{vnfProvider}",
   "vnfProductName":"{vnfProductName}",
   "vnfSoftwareVersion":"{vnfSoftwareVersion}",
-  "vnfdVersion":"{vnfdVersion}",
-  "instantiatedVnfInfo":{{
-  	"flavourId":"{flavourId}",
-  	"vnfState":"STARTED"
-  }}
+  "vnfdVersion":"{vnfdVersion}"
 }}
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/patchBodyRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/patchBodyRequest.json
index 0c8845c21..a9f1c9dae 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/patchBodyRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/patchBodyRequest.json
@@ -1,4 +1,5 @@
 {
   "vnfInstanceName": "vnf new name",
-  "vnfInstanceDescription": "new description"
+  "vnfInstanceDescription": "new description",
+  "vnfdId": "{vnfdId}"
 }
\ No newline at end of file
-- 
GitLab


From 00b70753d9a5b30400d7a85146f81b948e586759 Mon Sep 17 00:00:00 2001
From: uihassan <uihassan@etsi.org>
Date: Mon, 21 Dec 2020 07:27:26 +0500
Subject: [PATCH 216/322] Descriptors for 6.3.5.12.2 added

---
 .../IndividualVnfLcmOperationOccurence.robot  |  1 +
 .../VnfLcmOperationKeywords.robot             | 24 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot b/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
index 82ecf4c76..25bdd4d68 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
@@ -29,6 +29,7 @@ Get status information about multiple VNF instances
     Get Individual VNF LCM OP occurrences
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    VnfLcmOpOcc 
+    Check HTTP Response Body vnf LCM OpOCC content against VNF Descriptor
 
 PUT status information about multiple VNF instances - Method not implemented
     [Documentation]    Test ID: 6.3.5.12.3
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index 4105f3616..f47e49094 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -1081,4 +1081,26 @@ Parse SOL006 VNF Instance
     ${provider}=    Get Variable Value    ${nfv.vnfd[0].provider}
     ${product_name}=    Get Variable Value    ${nfv.vnfd[0].product-name}
     ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
-    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}     
\ No newline at end of file
+    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}     
+    
+Check HTTP Response Body vnf LCM OpOCC content against VNF Descriptor
+    Run Keyword If    ${check_descriptors} == 1    Check Individual VNF LCM Operation Occurence Content
+    
+Check Individual VNF LCM Operation Occurence Content    
+    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 LCM Op Occ   ELSE    Parse SOL006 LCM Op Occ
+    
+Parse SOL001 LCM Op Occ
+    Get key for VNF Descriptor
+    
+    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
+    
+    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${descriptor_id}
+    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
+    
+Parse SOL006 LCM Op Occ
+     ${descriptor_id}=    Get Variable Value    ${nfv.vnfd[0].id}
+     ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}
+     
+    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${descriptor_id}
+    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
\ No newline at end of file
-- 
GitLab


From 3cd55a9e9a78bcd37d38da9e727938e3c757ff30 Mon Sep 17 00:00:00 2001
From: uihassan <uihassan@etsi.org>
Date: Tue, 22 Dec 2020 18:48:34 +0500
Subject: [PATCH 217/322] remove unused template variable

---
 .../VnfLcmOperationKeywords.robot                           | 2 +-
 .../VNFLifecycleManagement-API/jsons/createVnfRequest.json  | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index f47e49094..46e2fa7a6 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -82,7 +82,7 @@ POST Create a new vnfInstance
     Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Instance
     ${template} =    Get File    jsons/createVnfRequest.json
-    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfProvider=${provider}    vnfProductName=${product_name}    vnfSoftwareVersion=${software_version}    vnfdVersion= ${descriptor_version}
+    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/createVnfRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/createVnfRequest.json
index 08fe8a182..5b1a730e3 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/createVnfRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/createVnfRequest.json
@@ -1,9 +1,5 @@
 {{
   "vnfInstanceName": "string",
   "vnfInstanceDescription": "string",
-  "vnfdId": "{vnfdId}",
-  "vnfProvider":"{vnfProvider}",
-  "vnfProductName":"{vnfProductName}",
-  "vnfSoftwareVersion":"{vnfSoftwareVersion}",
-  "vnfdVersion":"{vnfdVersion}"
+  "vnfdId": "{vnfdId}"
 }}
-- 
GitLab


From b3d06550c3aa73ec1e8a54e793f5710bb9d7228d Mon Sep 17 00:00:00 2001
From: uihassan <uihassan@etsi.org>
Date: Wed, 23 Dec 2020 07:13:50 +0500
Subject: [PATCH 218/322] bug fix and optional check added

---
 .../VnfLcmMntOperationKeywords.robot          |  54 ++++--
 .../environment/variables.txt                 |   9 +-
 .../jsons/createVnfRequest.json               |   7 +-
 .../Grants.robot                              |  24 ++-
 .../descriptors/SOL001/vnf-b-1_VNF.yaml       | 168 ++++++++++++++++++
 .../reference_tst010_vnf_b_2df_SOL006.yaml    | 105 +++++++++++
 .../environment/variables.txt                 |   6 +-
 .../VNFPackageManagementKeywords.robot        |   6 +
 .../descriptors/SOL001/vnf-b-1_VNF.yaml       | 168 ++++++++++++++++++
 .../reference_tst010_vnf_b_2df_SOL006.yaml    | 105 +++++++++++
 .../environment/variables.txt                 |   6 +-
 11 files changed, 625 insertions(+), 33 deletions(-)
 create mode 100644 SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/vnf-b-1_VNF.yaml
 create mode 100644 SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
 create mode 100644 SOL003/VNFPackageManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
 create mode 100644 SOL003/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml

diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index ce0725c0f..e9baab89a 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -332,10 +332,9 @@ POST Change VNF deployment flavour
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get key for VNF Descriptor
-    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
+    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to Change VNF Flavour
     ${template}=    Get File    jsons/changeVnfFlavourRequest.json
-    ${body}=        Format String   ${template}     newFlavourId=${flavour_id}
+    ${body}=        Format String   ${template}     newFlavourId=${newFlavourId}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_flavour    ${body} 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  	 
@@ -372,15 +371,9 @@ POST Create a new vnfInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get key for VNF Descriptor
-    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
-    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
-    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
-    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
-    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
-    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
+    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Instance
     ${template}=    Get File    jsons/createVnfRequest.json
-    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfProvider=${provider}    vnfProductName=${product_name}    vnfSoftwareVersion=${software_version}    vnfdVersion= ${descriptor_version}    flavourId=${flavour_id}
+    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfProvider=${provider}    vnfProductName=${product_name}    vnfSoftwareVersion=${software_version}    vnfdVersion= ${descriptor_version} 
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
@@ -510,9 +503,7 @@ PATCH individual vnfInstance
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE_PATCH}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get key for VNF Descriptor
-    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
-    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
+    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Instance
     ${template}=    Get File    jsons/patchBodyRequest.json
     ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfdVersion= ${descriptor_version}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}    ${body}	
@@ -1206,6 +1197,9 @@ Check HTTP Response Header Contain Link
     Should Not Be Empty    ${linkURL}
     
 Check HTTP Response Body vnfInstance content against VNF Descriptor
+    Run Keyword If    ${check_descriptors} == 1    Check Individual VNF Instance Content
+    
+Check Individual VNF Instance Content    
     Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001    ELSE    Parse SOL006
     
 Parse SOL001
@@ -1247,6 +1241,9 @@ Get key for VNF Descriptor
     END
     
 Check HTTP Response Body of Individual VNF LCM Operation occurrences content against VNF Descriptor
+    Run Keyword If    ${check_descriptors} == 1    Check Individual VNF LCM Operation Occurence Content
+    
+Check Individual VNF LCM Operation Occurence Content
     Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 VNF LCM    ELSE    Parse SOL006 VNF LCM
     
 Parse SOL001 Individual VNF LCM
@@ -1262,4 +1259,31 @@ Parse SOL006 Individual VNF LCM
     ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}
     Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdId']}    ${descriptor_id}
     Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdVersion']}    ${descriptor_version}
-         
\ No newline at end of file
+         
+Add VNF Descriptor Content to VNF Instance
+    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 VNF Instance    ELSE    Parse SOL006 VNF Instance
+
+Parse SOL001 VNF Instance
+    Get key for VNF Descriptor
+    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
+    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
+    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
+    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
+    
+Parse SOL006 VNF Instance
+    ${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}
+    ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
+    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version} 
+    
+Add VNF Descriptor Content to Change VNF Flavour
+    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 Change VNF Flavour    ELSE    Parse SOL006 Change VNF Flavour
+    
+Parse SOL001 Change VNF Flavour
+    Get key for VNF Descriptor
+    ${newFlavourId}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
+    
+Parse SOL006 Change VNF Flavour
+    Log    flavour id is not present in SOL006 descriptors
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/environment/variables.txt b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
index 439c951a9..cb28b2f2a 100644
--- a/SOL003/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
@@ -100,4 +100,11 @@ ${scaleOutResponse}
 ${callbackResp}    localhost
 
 ${descriptorType}    SOL001
-${vnfKey}    {}
\ No newline at end of file
+${vnfKey}    {}
+${check_descriptors}	1
+
+${descriptor_id}    
+${provider}    
+${product_name}    
+${software_version}    
+${descriptor_version}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/jsons/createVnfRequest.json b/SOL003/VNFLifecycleManagement-API/jsons/createVnfRequest.json
index fddfd7911..15a5f7f7d 100644
--- a/SOL003/VNFLifecycleManagement-API/jsons/createVnfRequest.json
+++ b/SOL003/VNFLifecycleManagement-API/jsons/createVnfRequest.json
@@ -5,10 +5,5 @@
   "vnfProvider":"{vnfProvider}",
   "vnfProductName":"{vnfProductName}",
   "vnfSoftwareVersion":"{vnfSoftwareVersion}",
-  "vnfdVersion":"{vnfdVersion}",
-  "instantiatedVnfInfo":{{
-  	"flavourId":"{flavourId}",
-  	"vnfState":"STARTED"
-  }}
-  "metadata":{{}}
+  "vnfdVersion":"{vnfdVersion}"
 }}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
index 6c832261b..6b6cdc04c 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
@@ -115,10 +115,9 @@ Send Request Grant Request in Synchronous mode
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    Get key for VNF Descriptor
-    ${vnf_flavour_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
+    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to Grant Request
     ${template}=    Get File    jsons/grantRequest.json
-    ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${vnfdId}    flavourId=${vnf_flavour_id}
+    ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${vnfdId}    flavourId=${flavourId}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/grants    ${body}
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
@@ -129,10 +128,9 @@ Send Request Grant Request in Asynchronous mode
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    Get key for VNF Descriptor
-    ${vnf_flavour_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
+    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to Grant Request
     ${template}=    Get File    jsons/grantRequest.json
-    ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${vnfdId}    flavourId=${vnf_flavour_id}
+    ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${vnfdId}    flavourId=${flavourId}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/grants    ${body}
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
@@ -143,10 +141,9 @@ Send Request for a new Grant Forbiden Operation
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    Get key for VNF Descriptor
-    ${vnf_flavour_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
+    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to Grant Request
     ${template}=    Get File    jsons/grantRejectedRequest.json
-    ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${vnfdId}    flavourId=${vnf_flavour_id}
+    ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${vnfdId}    flavourId=${flavourId}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/grants    ${body}
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
@@ -211,4 +208,13 @@ Delete Grants
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
     
+Add VNF Descriptor Content to Grant Request
+    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 Grant Request    ELSE    Parse SOL006 Grant Request
+    
+Parse SOL001 Grant Request
+    Get key for VNF Descriptor
+    ${flavourId}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
+    
+Parse SOL006 Grant Request
+    Log    flavour id is not present in SOL006 descriptors
     
diff --git a/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/vnf-b-1_VNF.yaml b/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/vnf-b-1_VNF.yaml
new file mode 100644
index 000000000..1712e2b33
--- /dev/null
+++ b/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/vnf-b-1_VNF.yaml
@@ -0,0 +1,168 @@
+tosca_definitions_version: tosca_simple_yaml_1_2
+description: "TST010 reference VNF-B"
+metadata:
+  descriptor_id: "VNF-B"
+  vendor: "ETSI TST WG"
+  version: "2.0"
+topology_template:
+  substitution_mappings:
+    node_type: "tosca.nodes.nfv.VNF"
+    requirements:
+      virtual_link_management:
+        [management, virtual_link_management]
+      virtual_link_left:
+        [left, virtual_link_left]
+      virtual_link_right:
+        [right, virtual_link_right]
+  node_templates:
+    VDU-B-1:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-1-vcd"
+        descriptor: "Description of VDU-B-1"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 2
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 4096
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-1-vsd"
+    VDU-B-2:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-2-vcd"
+        descriptor: "Description of VDU-B-2"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 4
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 6144
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-2-vsd"
+    right:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 1
+      requirements:
+        virtual_link_right:
+        virtual_binding: VDU-B-2
+    management:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 0
+      requirements:
+        virtual_link_management:
+        virtual_binding: VDU-B-1
+    left:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 2
+      requirements:
+        virtual_link_left:
+        virtual_binding: VDU-B-1
+    internal_vl:
+      type: tosca.nodes.nfv.VnfVirtualLink
+      properties:
+        connectivity_type:
+          layer_protocols: [ ipv4 ]
+        description: Internal Virtual link in the VNF
+        vl_profile:
+          max_bitrate_requirements:
+            root: 100000
+            leaf: 20000
+          min_bitrate_requirements:
+            root: 10000
+            leaf: 10000
+    internal_vdu_b_1_cp:
+      type: tosca.nodes.nfv.VduCp
+      properties:
+        order: 2
+      requirements:
+        - virtual_binding: VDU-B-1
+        - virtual_link: internal_vl
+    internal_vdu_b_2_cp:
+      type: tosca.nodes.nfv.VduCp
+      properties:
+        order: 0
+      requirements:
+        - virtual_binding: VDU-B-2
+        - virtual_link: internal_vl
+    vdu-b-1-vsd:
+      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
+      properties:
+        virtual_block_storage_data:
+          size_of_storage: 20
+          rdma_enabled: false
+        sw_image_data:
+          name: "vdu-b-1 image"
+          version: "1.1"
+          checksum: 
+            algorithm: "sha-224"
+            hash: "somehashfortst010"
+          container_format: "bare"
+          disk-format: qcow2
+          min-disk: '1'
+          min-ram: '2'
+          size: '1'
+      artifacts:
+        sw_image:
+          type: tosca.artifacts.nfv.SwImage
+          file: vdu-b-1.qcow2
+    vdu-b-1-vsd:
+      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
+      properties:
+        virtual_block_storage_data:
+          size_of_storage: 20
+          rdma_enabled: false
+        sw_image_data:
+          name: "vdu-b-1 image"
+          version: "1.1"
+          checksum: 
+            algorithm: "sha-224"
+            hash: "somehashfortst010"
+          container_format: "bare"
+          disk-format: qcow2
+          min-disk: '1'
+          min-ram: '2'
+          size: '1'
+      artifacts:
+        sw_image:
+          type: tosca.artifacts.nfv.SwImage
+          file: vdu-b-2.qcow2
+    vnf_b_1_VNF:
+      type: "tosca.nodes.nfv.VNF"
+      properties:
+        descriptor_id: "VNF-B-2VDUs"
+        descriptor_version: "2.0"
+        provider: "ETSI TST WG"
+        product_name: "VNF-B-2VDUs"
+        software_version: "2.0"
+        product_info_name: "VNF-B-2VDUs"
+        product_info_description: "TST010 reference VNF-B with 2 VDUs"
+        flavour_id: "VNF-B-2VDU_flavor"
+        flavour_description: "VNF-B with 2 VDUs flavor"
+        vnfm_info: 
+          etsivnfm: 
+          - v2.3.1 
+        interfaces:
+            Vnflcm:
+              scale:
+                implementation: scale-example.yaml
+              terminate:
+                implementation: terminate-example.yaml
+              operate:
+                implementation: operate-example.yaml
diff --git a/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml b/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
new file mode 100644
index 000000000..4b84be92b
--- /dev/null
+++ b/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
@@ -0,0 +1,105 @@
+nfv:
+  vnfd:
+    - id: VNF-B-2df
+      provider: ETSI TST WG
+      product-name: TST010 reference VNF-B with 2 DFs
+      software-version: '2.1'
+      version: '2.1'
+      vnfm-info: ETSI VNFM
+      vdu:
+        id: vdu-b-1
+        name: VNF-B VDU 1
+        int-cpd:
+          - id: left
+            layer-protocol: ethernet
+          - id: management
+            layer-protocol: ethernet
+          - id: right
+            layer-protocol: ethernet
+        virtual-compute-desc: vdu-b-1-vcd
+        virtual-storage-desc: vdu-b-1-vsd
+        sw-image-desc: vdu-b-1-image
+      virtual-compute-desc:
+        id: vdu-b-1-vcd
+        virtual-memory:
+          size: '4.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-1-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-1-image
+        name: VNF-B image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B.qcow2'
+      ext-cpd:
+        - id: ext-b-left
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: left
+          layer-protocol: ethernet
+        - id: management
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: management
+          layer-protocol: ethernet
+        - id: ext-b-right
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: right
+          layer-protocol: ethernet
+      df:
+        - id: small
+          vdu-profile:
+            id: vdu-b-1
+            min-number-of-instances: '1'
+            max-number-of-instances: '2'
+          instantiation-level:
+            - id: double
+              vdu-level:
+                vdu-id: vdu-b-1
+                number-of-instances: '2'
+            - id: single
+              vdu-level:
+                vdu-id: vdu-b-1
+                number-of-instances: '1'
+          default-instantiation-level: single
+          lcm-operations-configuration:
+            scale-vnf-to-level-op-config:
+              arbitrary-target-levels-supported: 'true'
+            terminate-vnf-op-config:
+              min-graceful-termination: '1'
+            operate-vnf-op-config:
+              min-graceful-stop-timeout: '1'
+        - id: big
+          vdu-profile:
+            id: vdu-b-1
+            min-number-of-instances: '1'
+            max-number-of-instances: '4'
+          instantiation-level:
+            - id: double
+              vdu-level:
+                vdu-id: vdu-b-1
+                number-of-instances: '2'
+            - id: triple
+              vdu-level:
+                vdu-id: vdu-b-1
+                number-of-instances: '3'
+          default-instantiation-level: double
+          lcm-operations-configuration:
+            scale-vnf-to-level-op-config:
+              arbitrary-target-levels-supported: 'true'
+            terminate-vnf-op-config:
+              min-graceful-termination: '1'
+            operate-vnf-op-config:
+              min-graceful-stop-timeout: '1'
diff --git a/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt b/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
index 8ba38cb43..7a1fed179 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
+++ b/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
@@ -41,4 +41,8 @@ ${VrQuotaAvailNotification}    {}
 ${vnfInstanceId}    myVnfInstanceId
 ${vnfLcmOpOccId}    myLcmOccId
 ${vnfdId}    myVnF
-${flavourId}    string
\ No newline at end of file
+${flavourId}    string
+
+${descriptorType}    SOL001
+${vnfKey}    {}
+${check_descriptors}	1
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index deed6bc83..009ef0e6d 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -1527,6 +1527,9 @@ Check Postcondition VNF Package Subscription is Deleted
     Check HTTP Response Status Code Is    404 
     
 Check HTTP Response Body of Individual VNF Package content against VNF Descriptor
+    Run Keyword If    ${check_descriptors} == 1    Check Individual VNF Package Content
+    
+Check Individual VNF Package Content
     Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 VNF Package    ELSE    Parse SOL006 VNF Package    
     
 Parse SOL001 VNF Package
@@ -1565,6 +1568,9 @@ Parse SOL006 VNF Package
     Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
     
 Check HTTP Response Body of Individual Subscription content against VNF Descriptor
+    Run Keyword If    ${check_descriptors} == 1    Check Individual VNF Subscription Content
+    
+Check Individual VNF Subscription Content
     Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 Package Subscription    ELSE    Parse SOL006 Package Subscription
     
 Parse SOL001 Package Subscription
diff --git a/SOL003/VNFPackageManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml b/SOL003/VNFPackageManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
new file mode 100644
index 000000000..1712e2b33
--- /dev/null
+++ b/SOL003/VNFPackageManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
@@ -0,0 +1,168 @@
+tosca_definitions_version: tosca_simple_yaml_1_2
+description: "TST010 reference VNF-B"
+metadata:
+  descriptor_id: "VNF-B"
+  vendor: "ETSI TST WG"
+  version: "2.0"
+topology_template:
+  substitution_mappings:
+    node_type: "tosca.nodes.nfv.VNF"
+    requirements:
+      virtual_link_management:
+        [management, virtual_link_management]
+      virtual_link_left:
+        [left, virtual_link_left]
+      virtual_link_right:
+        [right, virtual_link_right]
+  node_templates:
+    VDU-B-1:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-1-vcd"
+        descriptor: "Description of VDU-B-1"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 2
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 4096
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-1-vsd"
+    VDU-B-2:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-2-vcd"
+        descriptor: "Description of VDU-B-2"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 4
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 6144
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-2-vsd"
+    right:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 1
+      requirements:
+        virtual_link_right:
+        virtual_binding: VDU-B-2
+    management:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 0
+      requirements:
+        virtual_link_management:
+        virtual_binding: VDU-B-1
+    left:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 2
+      requirements:
+        virtual_link_left:
+        virtual_binding: VDU-B-1
+    internal_vl:
+      type: tosca.nodes.nfv.VnfVirtualLink
+      properties:
+        connectivity_type:
+          layer_protocols: [ ipv4 ]
+        description: Internal Virtual link in the VNF
+        vl_profile:
+          max_bitrate_requirements:
+            root: 100000
+            leaf: 20000
+          min_bitrate_requirements:
+            root: 10000
+            leaf: 10000
+    internal_vdu_b_1_cp:
+      type: tosca.nodes.nfv.VduCp
+      properties:
+        order: 2
+      requirements:
+        - virtual_binding: VDU-B-1
+        - virtual_link: internal_vl
+    internal_vdu_b_2_cp:
+      type: tosca.nodes.nfv.VduCp
+      properties:
+        order: 0
+      requirements:
+        - virtual_binding: VDU-B-2
+        - virtual_link: internal_vl
+    vdu-b-1-vsd:
+      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
+      properties:
+        virtual_block_storage_data:
+          size_of_storage: 20
+          rdma_enabled: false
+        sw_image_data:
+          name: "vdu-b-1 image"
+          version: "1.1"
+          checksum: 
+            algorithm: "sha-224"
+            hash: "somehashfortst010"
+          container_format: "bare"
+          disk-format: qcow2
+          min-disk: '1'
+          min-ram: '2'
+          size: '1'
+      artifacts:
+        sw_image:
+          type: tosca.artifacts.nfv.SwImage
+          file: vdu-b-1.qcow2
+    vdu-b-1-vsd:
+      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
+      properties:
+        virtual_block_storage_data:
+          size_of_storage: 20
+          rdma_enabled: false
+        sw_image_data:
+          name: "vdu-b-1 image"
+          version: "1.1"
+          checksum: 
+            algorithm: "sha-224"
+            hash: "somehashfortst010"
+          container_format: "bare"
+          disk-format: qcow2
+          min-disk: '1'
+          min-ram: '2'
+          size: '1'
+      artifacts:
+        sw_image:
+          type: tosca.artifacts.nfv.SwImage
+          file: vdu-b-2.qcow2
+    vnf_b_1_VNF:
+      type: "tosca.nodes.nfv.VNF"
+      properties:
+        descriptor_id: "VNF-B-2VDUs"
+        descriptor_version: "2.0"
+        provider: "ETSI TST WG"
+        product_name: "VNF-B-2VDUs"
+        software_version: "2.0"
+        product_info_name: "VNF-B-2VDUs"
+        product_info_description: "TST010 reference VNF-B with 2 VDUs"
+        flavour_id: "VNF-B-2VDU_flavor"
+        flavour_description: "VNF-B with 2 VDUs flavor"
+        vnfm_info: 
+          etsivnfm: 
+          - v2.3.1 
+        interfaces:
+            Vnflcm:
+              scale:
+                implementation: scale-example.yaml
+              terminate:
+                implementation: terminate-example.yaml
+              operate:
+                implementation: operate-example.yaml
diff --git a/SOL003/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml b/SOL003/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
new file mode 100644
index 000000000..4b84be92b
--- /dev/null
+++ b/SOL003/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
@@ -0,0 +1,105 @@
+nfv:
+  vnfd:
+    - id: VNF-B-2df
+      provider: ETSI TST WG
+      product-name: TST010 reference VNF-B with 2 DFs
+      software-version: '2.1'
+      version: '2.1'
+      vnfm-info: ETSI VNFM
+      vdu:
+        id: vdu-b-1
+        name: VNF-B VDU 1
+        int-cpd:
+          - id: left
+            layer-protocol: ethernet
+          - id: management
+            layer-protocol: ethernet
+          - id: right
+            layer-protocol: ethernet
+        virtual-compute-desc: vdu-b-1-vcd
+        virtual-storage-desc: vdu-b-1-vsd
+        sw-image-desc: vdu-b-1-image
+      virtual-compute-desc:
+        id: vdu-b-1-vcd
+        virtual-memory:
+          size: '4.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-1-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-1-image
+        name: VNF-B image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B.qcow2'
+      ext-cpd:
+        - id: ext-b-left
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: left
+          layer-protocol: ethernet
+        - id: management
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: management
+          layer-protocol: ethernet
+        - id: ext-b-right
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: right
+          layer-protocol: ethernet
+      df:
+        - id: small
+          vdu-profile:
+            id: vdu-b-1
+            min-number-of-instances: '1'
+            max-number-of-instances: '2'
+          instantiation-level:
+            - id: double
+              vdu-level:
+                vdu-id: vdu-b-1
+                number-of-instances: '2'
+            - id: single
+              vdu-level:
+                vdu-id: vdu-b-1
+                number-of-instances: '1'
+          default-instantiation-level: single
+          lcm-operations-configuration:
+            scale-vnf-to-level-op-config:
+              arbitrary-target-levels-supported: 'true'
+            terminate-vnf-op-config:
+              min-graceful-termination: '1'
+            operate-vnf-op-config:
+              min-graceful-stop-timeout: '1'
+        - id: big
+          vdu-profile:
+            id: vdu-b-1
+            min-number-of-instances: '1'
+            max-number-of-instances: '4'
+          instantiation-level:
+            - id: double
+              vdu-level:
+                vdu-id: vdu-b-1
+                number-of-instances: '2'
+            - id: triple
+              vdu-level:
+                vdu-id: vdu-b-1
+                number-of-instances: '3'
+          default-instantiation-level: double
+          lcm-operations-configuration:
+            scale-vnf-to-level-op-config:
+              arbitrary-target-levels-supported: 'true'
+            terminate-vnf-op-config:
+              min-graceful-termination: '1'
+            operate-vnf-op-config:
+              min-graceful-stop-timeout: '1'
diff --git a/SOL003/VNFPackageManagement-API/environment/variables.txt b/SOL003/VNFPackageManagement-API/environment/variables.txt
index 8cc86ab17..e2621e31d 100644
--- a/SOL003/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL003/VNFPackageManagement-API/environment/variables.txt
@@ -87,4 +87,8 @@ ${NEG_FILTER}     nfvId=41fdd38a-3d4c-465c-83e0-f80e014425f8    # Negative case,
 ${fields}         softwareImages,additionalArtifacts
 ${VAR_SEPERATOR}    &
 
-${callbackResp}    localhost
\ No newline at end of file
+${callbackResp}    localhost
+
+${descriptorType}    SOL001
+${vnfKey}    {}
+${check_descriptors}	1
\ No newline at end of file
-- 
GitLab


From f3b7789ed7491f210735adb4b2e3bba8cac419c0 Mon Sep 17 00:00:00 2001
From: zafar <zafar@etsi.org>
Date: Thu, 24 Dec 2020 14:42:35 +0500
Subject: [PATCH 219/322] descriptors added in test case 5.3.5.1.11

---
 .../descriptors/SOL001/vnf-b-1_VNF.yaml       | 168 ++++++++++++++++++
 .../reference_tst010_vnf_b_2df_SOL006.yaml    | 105 +++++++++++
 .../VNFPackageManagementKeywords.robot        |  66 ++++++-
 .../VNFPackages.robot                         |   1 +
 .../descriptors/SOL001/vnf-b-1_VNF.yaml       | 168 ++++++++++++++++++
 .../reference_tst010_vnf_b_2df_SOL006.yaml    | 105 +++++++++++
 .../environment/variables.txt                 |  12 +-
 7 files changed, 623 insertions(+), 2 deletions(-)
 create mode 100644 SOL005/NSLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
 create mode 100644 SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
 create mode 100644 SOL005/VNFPackageManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
 create mode 100644 SOL005/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml

diff --git a/SOL005/NSLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml b/SOL005/NSLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
new file mode 100644
index 000000000..1712e2b33
--- /dev/null
+++ b/SOL005/NSLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
@@ -0,0 +1,168 @@
+tosca_definitions_version: tosca_simple_yaml_1_2
+description: "TST010 reference VNF-B"
+metadata:
+  descriptor_id: "VNF-B"
+  vendor: "ETSI TST WG"
+  version: "2.0"
+topology_template:
+  substitution_mappings:
+    node_type: "tosca.nodes.nfv.VNF"
+    requirements:
+      virtual_link_management:
+        [management, virtual_link_management]
+      virtual_link_left:
+        [left, virtual_link_left]
+      virtual_link_right:
+        [right, virtual_link_right]
+  node_templates:
+    VDU-B-1:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-1-vcd"
+        descriptor: "Description of VDU-B-1"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 2
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 4096
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-1-vsd"
+    VDU-B-2:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-2-vcd"
+        descriptor: "Description of VDU-B-2"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 4
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 6144
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-2-vsd"
+    right:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 1
+      requirements:
+        virtual_link_right:
+        virtual_binding: VDU-B-2
+    management:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 0
+      requirements:
+        virtual_link_management:
+        virtual_binding: VDU-B-1
+    left:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 2
+      requirements:
+        virtual_link_left:
+        virtual_binding: VDU-B-1
+    internal_vl:
+      type: tosca.nodes.nfv.VnfVirtualLink
+      properties:
+        connectivity_type:
+          layer_protocols: [ ipv4 ]
+        description: Internal Virtual link in the VNF
+        vl_profile:
+          max_bitrate_requirements:
+            root: 100000
+            leaf: 20000
+          min_bitrate_requirements:
+            root: 10000
+            leaf: 10000
+    internal_vdu_b_1_cp:
+      type: tosca.nodes.nfv.VduCp
+      properties:
+        order: 2
+      requirements:
+        - virtual_binding: VDU-B-1
+        - virtual_link: internal_vl
+    internal_vdu_b_2_cp:
+      type: tosca.nodes.nfv.VduCp
+      properties:
+        order: 0
+      requirements:
+        - virtual_binding: VDU-B-2
+        - virtual_link: internal_vl
+    vdu-b-1-vsd:
+      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
+      properties:
+        virtual_block_storage_data:
+          size_of_storage: 20
+          rdma_enabled: false
+        sw_image_data:
+          name: "vdu-b-1 image"
+          version: "1.1"
+          checksum: 
+            algorithm: "sha-224"
+            hash: "somehashfortst010"
+          container_format: "bare"
+          disk-format: qcow2
+          min-disk: '1'
+          min-ram: '2'
+          size: '1'
+      artifacts:
+        sw_image:
+          type: tosca.artifacts.nfv.SwImage
+          file: vdu-b-1.qcow2
+    vdu-b-1-vsd:
+      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
+      properties:
+        virtual_block_storage_data:
+          size_of_storage: 20
+          rdma_enabled: false
+        sw_image_data:
+          name: "vdu-b-1 image"
+          version: "1.1"
+          checksum: 
+            algorithm: "sha-224"
+            hash: "somehashfortst010"
+          container_format: "bare"
+          disk-format: qcow2
+          min-disk: '1'
+          min-ram: '2'
+          size: '1'
+      artifacts:
+        sw_image:
+          type: tosca.artifacts.nfv.SwImage
+          file: vdu-b-2.qcow2
+    vnf_b_1_VNF:
+      type: "tosca.nodes.nfv.VNF"
+      properties:
+        descriptor_id: "VNF-B-2VDUs"
+        descriptor_version: "2.0"
+        provider: "ETSI TST WG"
+        product_name: "VNF-B-2VDUs"
+        software_version: "2.0"
+        product_info_name: "VNF-B-2VDUs"
+        product_info_description: "TST010 reference VNF-B with 2 VDUs"
+        flavour_id: "VNF-B-2VDU_flavor"
+        flavour_description: "VNF-B with 2 VDUs flavor"
+        vnfm_info: 
+          etsivnfm: 
+          - v2.3.1 
+        interfaces:
+            Vnflcm:
+              scale:
+                implementation: scale-example.yaml
+              terminate:
+                implementation: terminate-example.yaml
+              operate:
+                implementation: operate-example.yaml
diff --git a/SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml b/SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
new file mode 100644
index 000000000..4b84be92b
--- /dev/null
+++ b/SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
@@ -0,0 +1,105 @@
+nfv:
+  vnfd:
+    - id: VNF-B-2df
+      provider: ETSI TST WG
+      product-name: TST010 reference VNF-B with 2 DFs
+      software-version: '2.1'
+      version: '2.1'
+      vnfm-info: ETSI VNFM
+      vdu:
+        id: vdu-b-1
+        name: VNF-B VDU 1
+        int-cpd:
+          - id: left
+            layer-protocol: ethernet
+          - id: management
+            layer-protocol: ethernet
+          - id: right
+            layer-protocol: ethernet
+        virtual-compute-desc: vdu-b-1-vcd
+        virtual-storage-desc: vdu-b-1-vsd
+        sw-image-desc: vdu-b-1-image
+      virtual-compute-desc:
+        id: vdu-b-1-vcd
+        virtual-memory:
+          size: '4.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-1-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-1-image
+        name: VNF-B image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B.qcow2'
+      ext-cpd:
+        - id: ext-b-left
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: left
+          layer-protocol: ethernet
+        - id: management
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: management
+          layer-protocol: ethernet
+        - id: ext-b-right
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: right
+          layer-protocol: ethernet
+      df:
+        - id: small
+          vdu-profile:
+            id: vdu-b-1
+            min-number-of-instances: '1'
+            max-number-of-instances: '2'
+          instantiation-level:
+            - id: double
+              vdu-level:
+                vdu-id: vdu-b-1
+                number-of-instances: '2'
+            - id: single
+              vdu-level:
+                vdu-id: vdu-b-1
+                number-of-instances: '1'
+          default-instantiation-level: single
+          lcm-operations-configuration:
+            scale-vnf-to-level-op-config:
+              arbitrary-target-levels-supported: 'true'
+            terminate-vnf-op-config:
+              min-graceful-termination: '1'
+            operate-vnf-op-config:
+              min-graceful-stop-timeout: '1'
+        - id: big
+          vdu-profile:
+            id: vdu-b-1
+            min-number-of-instances: '1'
+            max-number-of-instances: '4'
+          instantiation-level:
+            - id: double
+              vdu-level:
+                vdu-id: vdu-b-1
+                number-of-instances: '2'
+            - id: triple
+              vdu-level:
+                vdu-id: vdu-b-1
+                number-of-instances: '3'
+          default-instantiation-level: double
+          lcm-operations-configuration:
+            scale-vnf-to-level-op-config:
+              arbitrary-target-levels-supported: 'true'
+            terminate-vnf-op-config:
+              min-graceful-termination: '1'
+            operate-vnf-op-config:
+              min-graceful-stop-timeout: '1'
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 38977de8b..78d63f8ac 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -8,6 +8,7 @@ Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_veri
 Library           Process
 Library           MockServerLibrary
 Library           String
+Variables    descriptors/SOL001/vnf-b-1_VNF.yaml
 
 
 *** Keywords ***
@@ -174,12 +175,75 @@ Send Post Request to create new VNF Package Resource
     Log    Creating a new VNF Package
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    ${body}=    Get File    jsons/CreateVnfPkgInfoRequest.json
+    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Package
+    ${body} =    Get File    jsons/CreateVnfPkgInfoRequest.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
+Get key for VNF Descriptor
+    FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
+        Log    ${key}
+        ${check1}=    Run Keyword And Return Status    Should End With    ${key}    VNF
+        Run Keyword If     ${check1}     Set Global Variable    ${vnfKey}    ${key}   
+    END
+    
+Add VNF Descriptor Content to VNF Package
+    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 VNF Package    ELSE    Parse SOL006 VNF Package
+
+Parse SOL001 VNF Package
+    Get key for VNF Descriptor
+    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
+    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
+    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
+    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
+    
+Parse SOL006 VNF Package
+    ${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}
+    ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
+    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}     
+
+Check HTTP Response Body vnfPkginfo content against VNF Descriptor
+    #${check_descriptors} flag, 1 to check descriptors
+    Run Keyword If    ${check_descriptors} == 1    Check Individual VNFPkgInfo Content
+    
+Check Individual VNFPkgInfo Content    
+    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001    ELSE    Parse SOL006
+    
+Parse SOL001
+    Get key for VNF Descriptor
+    
+    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
+    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
+    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
+    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
+    #${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
+    
+    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${descriptor_id}
+    Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${provider}
+    Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${product_name}
+    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}
+    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
+    #Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['flavourId']}    ${flavour_id}
+    
+Parse SOL006
+     ${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}
+     ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
+     ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}
+     
+    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${descriptor_id}
+    Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${provider}
+    Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${product_name}
+    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}
+    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
+    
 Check Postcondition VNF Package Resource Exists
     Log    Checking that nsd info exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
diff --git a/SOL005/VNFPackageManagement-API/VNFPackages.robot b/SOL005/VNFPackageManagement-API/VNFPackages.robot
index 15c5db397..b0b15ff99 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackages.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackages.robot
@@ -157,6 +157,7 @@ Create new VNF Package Resource
     Check HTTP Response Body Json Schema Is   vnfPkgInfo
     Check HTTP Response Header Contains    Location
     Check Postcondition VNF Package Resource Exists
+    Check HTTP Response Body vnfPkgInfo content against VNF Descriptor
 
 PUT all VNF Packages - Method not implemented
     [Documentation]    Test ID: 5.3.5.1.12
diff --git a/SOL005/VNFPackageManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml b/SOL005/VNFPackageManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
new file mode 100644
index 000000000..1712e2b33
--- /dev/null
+++ b/SOL005/VNFPackageManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
@@ -0,0 +1,168 @@
+tosca_definitions_version: tosca_simple_yaml_1_2
+description: "TST010 reference VNF-B"
+metadata:
+  descriptor_id: "VNF-B"
+  vendor: "ETSI TST WG"
+  version: "2.0"
+topology_template:
+  substitution_mappings:
+    node_type: "tosca.nodes.nfv.VNF"
+    requirements:
+      virtual_link_management:
+        [management, virtual_link_management]
+      virtual_link_left:
+        [left, virtual_link_left]
+      virtual_link_right:
+        [right, virtual_link_right]
+  node_templates:
+    VDU-B-1:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-1-vcd"
+        descriptor: "Description of VDU-B-1"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 2
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 4096
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-1-vsd"
+    VDU-B-2:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-2-vcd"
+        descriptor: "Description of VDU-B-2"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 4
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 6144
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-2-vsd"
+    right:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 1
+      requirements:
+        virtual_link_right:
+        virtual_binding: VDU-B-2
+    management:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 0
+      requirements:
+        virtual_link_management:
+        virtual_binding: VDU-B-1
+    left:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 2
+      requirements:
+        virtual_link_left:
+        virtual_binding: VDU-B-1
+    internal_vl:
+      type: tosca.nodes.nfv.VnfVirtualLink
+      properties:
+        connectivity_type:
+          layer_protocols: [ ipv4 ]
+        description: Internal Virtual link in the VNF
+        vl_profile:
+          max_bitrate_requirements:
+            root: 100000
+            leaf: 20000
+          min_bitrate_requirements:
+            root: 10000
+            leaf: 10000
+    internal_vdu_b_1_cp:
+      type: tosca.nodes.nfv.VduCp
+      properties:
+        order: 2
+      requirements:
+        - virtual_binding: VDU-B-1
+        - virtual_link: internal_vl
+    internal_vdu_b_2_cp:
+      type: tosca.nodes.nfv.VduCp
+      properties:
+        order: 0
+      requirements:
+        - virtual_binding: VDU-B-2
+        - virtual_link: internal_vl
+    vdu-b-1-vsd:
+      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
+      properties:
+        virtual_block_storage_data:
+          size_of_storage: 20
+          rdma_enabled: false
+        sw_image_data:
+          name: "vdu-b-1 image"
+          version: "1.1"
+          checksum: 
+            algorithm: "sha-224"
+            hash: "somehashfortst010"
+          container_format: "bare"
+          disk-format: qcow2
+          min-disk: '1'
+          min-ram: '2'
+          size: '1'
+      artifacts:
+        sw_image:
+          type: tosca.artifacts.nfv.SwImage
+          file: vdu-b-1.qcow2
+    vdu-b-1-vsd:
+      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
+      properties:
+        virtual_block_storage_data:
+          size_of_storage: 20
+          rdma_enabled: false
+        sw_image_data:
+          name: "vdu-b-1 image"
+          version: "1.1"
+          checksum: 
+            algorithm: "sha-224"
+            hash: "somehashfortst010"
+          container_format: "bare"
+          disk-format: qcow2
+          min-disk: '1'
+          min-ram: '2'
+          size: '1'
+      artifacts:
+        sw_image:
+          type: tosca.artifacts.nfv.SwImage
+          file: vdu-b-2.qcow2
+    vnf_b_1_VNF:
+      type: "tosca.nodes.nfv.VNF"
+      properties:
+        descriptor_id: "VNF-B-2VDUs"
+        descriptor_version: "2.0"
+        provider: "ETSI TST WG"
+        product_name: "VNF-B-2VDUs"
+        software_version: "2.0"
+        product_info_name: "VNF-B-2VDUs"
+        product_info_description: "TST010 reference VNF-B with 2 VDUs"
+        flavour_id: "VNF-B-2VDU_flavor"
+        flavour_description: "VNF-B with 2 VDUs flavor"
+        vnfm_info: 
+          etsivnfm: 
+          - v2.3.1 
+        interfaces:
+            Vnflcm:
+              scale:
+                implementation: scale-example.yaml
+              terminate:
+                implementation: terminate-example.yaml
+              operate:
+                implementation: operate-example.yaml
diff --git a/SOL005/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml b/SOL005/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
new file mode 100644
index 000000000..4b84be92b
--- /dev/null
+++ b/SOL005/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
@@ -0,0 +1,105 @@
+nfv:
+  vnfd:
+    - id: VNF-B-2df
+      provider: ETSI TST WG
+      product-name: TST010 reference VNF-B with 2 DFs
+      software-version: '2.1'
+      version: '2.1'
+      vnfm-info: ETSI VNFM
+      vdu:
+        id: vdu-b-1
+        name: VNF-B VDU 1
+        int-cpd:
+          - id: left
+            layer-protocol: ethernet
+          - id: management
+            layer-protocol: ethernet
+          - id: right
+            layer-protocol: ethernet
+        virtual-compute-desc: vdu-b-1-vcd
+        virtual-storage-desc: vdu-b-1-vsd
+        sw-image-desc: vdu-b-1-image
+      virtual-compute-desc:
+        id: vdu-b-1-vcd
+        virtual-memory:
+          size: '4.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-1-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-1-image
+        name: VNF-B image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B.qcow2'
+      ext-cpd:
+        - id: ext-b-left
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: left
+          layer-protocol: ethernet
+        - id: management
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: management
+          layer-protocol: ethernet
+        - id: ext-b-right
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: right
+          layer-protocol: ethernet
+      df:
+        - id: small
+          vdu-profile:
+            id: vdu-b-1
+            min-number-of-instances: '1'
+            max-number-of-instances: '2'
+          instantiation-level:
+            - id: double
+              vdu-level:
+                vdu-id: vdu-b-1
+                number-of-instances: '2'
+            - id: single
+              vdu-level:
+                vdu-id: vdu-b-1
+                number-of-instances: '1'
+          default-instantiation-level: single
+          lcm-operations-configuration:
+            scale-vnf-to-level-op-config:
+              arbitrary-target-levels-supported: 'true'
+            terminate-vnf-op-config:
+              min-graceful-termination: '1'
+            operate-vnf-op-config:
+              min-graceful-stop-timeout: '1'
+        - id: big
+          vdu-profile:
+            id: vdu-b-1
+            min-number-of-instances: '1'
+            max-number-of-instances: '4'
+          instantiation-level:
+            - id: double
+              vdu-level:
+                vdu-id: vdu-b-1
+                number-of-instances: '2'
+            - id: triple
+              vdu-level:
+                vdu-id: vdu-b-1
+                number-of-instances: '3'
+          default-instantiation-level: double
+          lcm-operations-configuration:
+            scale-vnf-to-level-op-config:
+              arbitrary-target-levels-supported: 'true'
+            terminate-vnf-op-config:
+              min-graceful-termination: '1'
+            operate-vnf-op-config:
+              min-graceful-stop-timeout: '1'
diff --git a/SOL005/VNFPackageManagement-API/environment/variables.txt b/SOL005/VNFPackageManagement-API/environment/variables.txt
index 2bd7dd7e9..82d338955 100644
--- a/SOL005/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFPackageManagement-API/environment/variables.txt
@@ -84,4 +84,14 @@ ${vnfPkgUri}        http://localhost/content.zip
 
 ${NFVO_non-MANO_OK}    1    # If 1 means that non-MANO artifacts are supported by the NFVO
 ${non_mano_artifact_sets} 
-${callbackResp}    127.0.0.1
\ No newline at end of file
+${callbackResp}    127.0.0.1
+
+${descriptorType}    SOL001
+${vnfKey}    {}
+${check_descriptors}	1
+
+${descriptor_id}	
+${provider}	
+${product_name}    
+${software_version}    
+${descriptor_version}
\ No newline at end of file
-- 
GitLab


From 6d4a5d58415eaa688a06a394ddfaf615c607af00 Mon Sep 17 00:00:00 2001
From: zafar <zafar@etsi.org>
Date: Thu, 24 Dec 2020 17:03:54 +0500
Subject: [PATCH 220/322] descriptors added for IndividualVNFPackage &
 NotificationConsumer resources

---
 SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot | 1 +
 SOL005/VNFPackageManagement-API/NotificationConsumer.robot | 7 +++++--
 .../jsons/VnfPackageChangeNotification.json                | 2 +-
 .../jsons/VnfPackageOnboardingNotification.json            | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot b/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot
index 5a1efdce4..6e6a4d5d3 100644
--- a/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot
+++ b/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot
@@ -19,6 +19,7 @@ GET Individual VNF Package
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   vnfPkgInfo
     Check HTTP Response Body vnfPkgInfo Identifier matches the requested VNF Package
+    Check HTTP Response Body vnfPkgInfo content against VNF Descriptor
 
 GET Individual VNF Package with invalid resource identifier
     [Documentation]    Test ID: 5.3.5.2.2
diff --git a/SOL005/VNFPackageManagement-API/NotificationConsumer.robot b/SOL005/VNFPackageManagement-API/NotificationConsumer.robot
index b32b7f822..d8a5f0087 100644
--- a/SOL005/VNFPackageManagement-API/NotificationConsumer.robot
+++ b/SOL005/VNFPackageManagement-API/NotificationConsumer.robot
@@ -1,6 +1,7 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt
+Resource          VNFPackageManagementKeywords.robot
 Library           OperatingSystem
 Library           JSONLibrary
 Library           String
@@ -52,8 +53,9 @@ Post VNF Package Onboarding Notification
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Package
     ${template} =    Get File    jsons/VnfPackageOnboardingNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPkgId=${vnfPkgId}
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPkgId=${vnfPkgId}    vnfdId=${descriptor_id}
     Post    ${callbackResp}    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -63,8 +65,9 @@ Post VNF Package Change Notification
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Package
     ${template} =    Get File    jsons/VnfPackageChangeNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPkgId=${vnfPkgId}
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPkgId=${vnfPkgId}    vnfdId=${descriptor_id}
     Post    ${callbackResp}    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/jsons/VnfPackageChangeNotification.json b/SOL005/VNFPackageManagement-API/jsons/VnfPackageChangeNotification.json
index 103545205..e6ababfad 100644
--- a/SOL005/VNFPackageManagement-API/jsons/VnfPackageChangeNotification.json
+++ b/SOL005/VNFPackageManagement-API/jsons/VnfPackageChangeNotification.json
@@ -4,7 +4,7 @@
 	"subscriptionId":"{subscriptionId}",
 	"timeStamp":"",
 	"vnfPkgId":"{vnfPkgId}",
-	"vnfdId":"",
+	"vnfdId":"{vnfdId}",
 	"changeType":"PKG_DELETE",
 	"_links":""
 }}
diff --git a/SOL005/VNFPackageManagement-API/jsons/VnfPackageOnboardingNotification.json b/SOL005/VNFPackageManagement-API/jsons/VnfPackageOnboardingNotification.json
index 08fdbf7cd..f455852da 100644
--- a/SOL005/VNFPackageManagement-API/jsons/VnfPackageOnboardingNotification.json
+++ b/SOL005/VNFPackageManagement-API/jsons/VnfPackageOnboardingNotification.json
@@ -4,7 +4,7 @@
 	"subscriptionId":"{subscriptionId}",
 	"timeStamp":"",
 	"vnfPkgId":"{vnfPkgId}",
-	"vnfdId":"",
+	"vnfdId":"{vnfdId}",
 	"vnfmInfo":"",
 	"_links":""
 }}
-- 
GitLab


From 67acbdbfcf967ed343cae55b82a138021c4bd8ba Mon Sep 17 00:00:00 2001
From: zafar <zafar@etsi.org>
Date: Thu, 24 Dec 2020 21:08:16 +0500
Subject: [PATCH 221/322] SOL006 descriptors added for Test ID: 5.3.2.2.2

---
 .../IndividualNSInstance.robot                |  1 +
 .../NSLCMOperationKeywords.robot              | 52 +++++++++++++++++++
 .../environment/variables.txt                 | 13 ++++-
 .../VNFPackageManagementKeywords.robot        |  2 +-
 4 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot b/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
index 32285a8d4..7ac92c149 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
@@ -32,6 +32,7 @@ GET Information about an individual NS Instance
     GET IndividualNSInstance
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    NsInstance
+    Check HTTP Response Body NsInstance content against VNF Descriptor
     
 PUT Individual NSInstance - Method not implemented 
     [Documentation]    Test ID: 5.3.2.2.3
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index b871442b7..10dffb4c9 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -8,6 +8,8 @@ Library    OperatingSystem
 Library    MockServerLibrary
 Library    Collections
 Library    String
+Variables  descriptors/SOL001/vnf-b-1_VNF.yaml
+
 
 *** Keywords ***
 Initialize System
@@ -221,6 +223,56 @@ POST New nsInstance
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}     
 
+Check HTTP Response Body NsInstance content against VNF Descriptor
+    #${check_descriptors} flag, 1 to check descriptors
+    Run Keyword If    ${check_descriptors} == 1    Check Individual NsInstance Content
+
+Check Individual NsInstance Content    
+    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001    ELSE    Parse SOL006
+
+Parse SOL001
+    Get key for VNF Descriptor
+    
+    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
+    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
+    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
+    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
+    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
+    
+    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfdId']}    ${descriptor_id}
+    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfProvider']}    ${provider}
+    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfProductName']}    ${product_name}
+    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfSoftwareVesion']}    ${software_version}
+    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfdVersion']}    ${descriptor_version}
+    Should Be Equal As Strings    ${response['body']['vnfInstance']['instantiatedVnfInfo']['flavourId']}    ${flavour_id}
+    
+Parse SOL006
+     ${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}
+     ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
+     ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}
+     ${external_cp}=    Get Variable Value    ${nfv.vnfd[0].ext-cpd[0].id}
+     ${vdu_id}=    Get Variable Value    ${nfv.vnfd[0].vdu[0].id}
+     ${virtual_storage}=    Get Variable Value    ${nfv.vnfd[0].vdu[0].virtual-storage-desc}
+     
+    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfdId']}    ${descriptor_id}
+    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfProvider']}    ${provider}
+    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfProductName']}    ${product_name}
+    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfSoftwareVesion']}    ${software_version}
+    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfdVersion']}    ${descriptor_version}
+    Should Be Equal As Strings    ${response['body']['vnfInstance']['instantiatedVnfInfo']['extCpInfo']['cpdId']}    ${external_cp}
+    Should Be Equal As Strings    ${response['body']['vnfInstance']['instantiatedVnfInfo']['vnfcResourceInfo']['vduId']}    ${vdu_id}
+    Should Be Equal As Strings    ${response['body']['vnfInstance']['instantiatedVnfInfo']['virtualStorageResourceInfo']['virtualStorageDescId']}    ${virtual_storage}
+
+Get key for VNF Descriptor
+    FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
+        Log    ${key}
+        ${check1}=    Run Keyword And Return Status    Should End With    ${key}    VNF
+        Run Keyword If     ${check1}     Set Global Variable    ${vnfKey}    ${key}   
+    END
+
 POST New nsInstance with DISABLED nsd
     Log    Create NS instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances
     Set Headers  {"Accept":"${ACCEPT}"}  
diff --git a/SOL005/NSLifecycleManagement-API/environment/variables.txt b/SOL005/NSLifecycleManagement-API/environment/variables.txt
index 02b7d79a8..01df2b696 100644
--- a/SOL005/NSLifecycleManagement-API/environment/variables.txt
+++ b/SOL005/NSLifecycleManagement-API/environment/variables.txt
@@ -76,4 +76,15 @@ ${NEG_FILTER}    attribute_not_exist=some_value
 ${NEG_SELECTOR}    fields=wrong_field
 ${json}    {"notificationStatus": ""}
 
-${callbackResp}    127.0.0.1
\ No newline at end of file
+${callbackResp}    127.0.0.1
+
+${descriptorType}    SOL001
+${vnfKey}    {}
+${check_descriptors}	1
+
+${descriptor_id}	
+${provider}	
+${product_name}    
+${software_version}    
+${descriptor_version}
+${flavour_id}
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 78d63f8ac..6f374726a 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -8,7 +8,7 @@ Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_veri
 Library           Process
 Library           MockServerLibrary
 Library           String
-Variables    descriptors/SOL001/vnf-b-1_VNF.yaml
+Variables         descriptors/SOL001/vnf-b-1_VNF.yaml
 
 
 *** Keywords ***
-- 
GitLab


From 897005846e2489ff8e02fce3dd023a94ea68893d Mon Sep 17 00:00:00 2001
From: zafar <zafar@etsi.org>
Date: Fri, 25 Dec 2020 18:33:16 +0500
Subject: [PATCH 222/322] descriptors added for test ID: 5.3.2.5.1

---
 .../NSLCMOperationKeywords.robot              | 29 ++++++++++++++++---
 .../descriptors/SOL001/vnf-b-1_VNF.yaml       |  2 +-
 .../environment/variables.txt                 |  5 +++-
 .../jsons/UpdateNsRequest.json                | 14 ++++++++-
 4 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index 10dffb4c9..fa1bf6c29 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -558,12 +558,33 @@ POST Update NSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template}=    Get File    jsons/UpdateNsRequest.json
-    ${body}=        Format String   ${template}     vnfUpdateType=${vnfUpdateType}
-	Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/update    ${body}
+    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to NS Instance
+    ${template} =    Get File    jsons/UpdateNsRequest.json
+    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfFlavourId=${flavour_Id}    newFlavourId=${flavour_Id}    vnfVirtualLinkDescId=${virtualLink_id}    instantiationLevelId=${instantiationLevel_id}    vnfInstantiationLevelId=${instantiationLevel_id}    
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/update    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
-	
+
+Add VNF Descriptor Content to NS Instance
+    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 NS Instance    ELSE    Parse SOL006 NS Instance
+   
+Parse SOL001 NS Instance
+    Get key for VNF Descriptor
+    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
+    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
+    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
+    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
+    ${flavour_Id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
+    
+Parse SOL006 NS Instance
+    ${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}
+    ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
+    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}   
+    ${instantiationLevel_id}=    Get Variable Value    ${nfv.vnfd[0].df[0].instantiation-level[0].id}  
+ 
 DELETE Heal NSInstance
     log    Trying to Delete an Heal NS instance. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
diff --git a/SOL005/NSLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml b/SOL005/NSLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
index 1712e2b33..d9a374060 100644
--- a/SOL005/NSLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
+++ b/SOL005/NSLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
@@ -75,7 +75,7 @@ topology_template:
         virtual_link_left:
         virtual_binding: VDU-B-1
     internal_vl:
-      type: tosca.nodes.nfv.VnfVirtualLink
+      type: "tosca.nodes.nfv.VnfVirtualLink"
       properties:
         connectivity_type:
           layer_protocols: [ ipv4 ]
diff --git a/SOL005/NSLifecycleManagement-API/environment/variables.txt b/SOL005/NSLifecycleManagement-API/environment/variables.txt
index 01df2b696..f13e6903c 100644
--- a/SOL005/NSLifecycleManagement-API/environment/variables.txt
+++ b/SOL005/NSLifecycleManagement-API/environment/variables.txt
@@ -87,4 +87,7 @@ ${provider}
 ${product_name}    
 ${software_version}    
 ${descriptor_version}
-${flavour_id}
\ No newline at end of file
+${flavour_id}
+
+${virtualLink_id}
+${instantiationLevel_id}
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/jsons/UpdateNsRequest.json b/SOL005/NSLifecycleManagement-API/jsons/UpdateNsRequest.json
index 336075de4..756fa5756 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/UpdateNsRequest.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/UpdateNsRequest.json
@@ -1,3 +1,15 @@
 {{
-	"updateType": "{vnfUpdateType}"	
+	"updateType": "{vnfUpdateType}",
+	"instantiateVnfData": {{
+		"vnfdId": "{vnfdId}",
+		"vnfFlavourId": "{vnfFlavourId}",
+		"vnfInstantiationLevelId": "{vnfInstantiationLevelId}"
+		"extManagedVirtualLinks": {{
+			"vnfVirtualLinkDescId": "{vnfVirtualLinkDescId}"
+		}},
+	"changeVnfFlavourData": {{
+		"vnfInstanceId": {},
+		"newFlavourId": "{newFlavourId}",
+		"instantiationLevelId": "{instantiationLevelId}"
+		}}
 }}
\ No newline at end of file
-- 
GitLab


From 944a23bc0557445fad9a31981ff63d8a66bccefa Mon Sep 17 00:00:00 2001
From: zafar <zafar@etsi.org>
Date: Fri, 25 Dec 2020 22:03:53 +0500
Subject: [PATCH 223/322] descriptors added

---
 .../NSLCMOperationKeywords.robot              |  3 +-
 .../NotificationConsumer.robot                |  9 ++++-
 .../NsLcmOperationOccurrenceNotification.json |  1 +
 .../jsons/ScaleNs.json                        |  4 ++
 .../IndividualSubscription.robot              |  1 +
 .../VNFPackageManagementKeywords.robot        | 38 ++++++++++++++++++-
 .../jsons/subscriptions.json                  | 12 +++++-
 7 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index fa1bf6c29..0472e3a83 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -513,8 +513,9 @@ POST scale nsInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to NS Instance
     ${template}=    Get File    jsons/ScaleNs.json
-    ${body}=        Format String   ${template}     scaleType=${scaleType}   scaleTimeout=${scaleTimeout}   scaleVnfType=${scaleVnfType}   scaleGroupDescriptor=${scaleGroupDescriptor}   scaleMemberVnfIndex=${scaleMemberVnfIndex}
+    ${body}=        Format String   ${template}     scaleType=${scaleType}   scaleTimeout=${scaleTimeout}   scaleVnfType=${scaleVnfType}   scaleGroupDescriptor=${scaleGroupDescriptor}   scaleMemberVnfIndex=${scaleMemberVnfIndex}    vnfInstantiationLevelId=${instantiationLevel_id}
 	Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/scale    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
diff --git a/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot b/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot
index 6cc466661..2ad41997f 100644
--- a/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot
+++ b/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot
@@ -1,10 +1,11 @@
 *** Settings ***
 Library    String
-Resource    environment/variables.txt   
+Resource   environment/variables.txt   
 Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=false
 Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
+Resource   NSLCMOperationKeywords.robot   
 
 Suite Setup    Check resource existence and get CallbackUri
 
@@ -65,12 +66,16 @@ Post Ns Lcm Operation Occurrence Notification
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to Notification
     ${template} =    Get File    jsons/NsLcmOperationOccurrenceNotification.json
-    ${body}=        Format String   ${template}    nsInstanceId=${nsInstanceId}    nsLcmOpOccId=${nsLcmOpOccId}    subscriptionId=${subscriptionId}   
+    ${body}=        Format String   ${template}    nsInstanceId=${nsInstanceId}    nsLcmOpOccId=${nsLcmOpOccId}    subscriptionId=${subscriptionId}    affectedVnf=${descriptor_id}   
     Post    ${callbackResp}    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
+Add VNF Descriptor Content to Notification
+    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 NS Instance    ELSE    Parse SOL006 NS Instance
+	
 Post Ns Identifier Creation Notification
     log    Trying to perform a POST to get notification
     Set Headers  {"Accept":"${ACCEPT}"}  
diff --git a/SOL005/NSLifecycleManagement-API/jsons/NsLcmOperationOccurrenceNotification.json b/SOL005/NSLifecycleManagement-API/jsons/NsLcmOperationOccurrenceNotification.json
index d5ed27cba..414dc2d13 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/NsLcmOperationOccurrenceNotification.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/NsLcmOperationOccurrenceNotification.json
@@ -9,5 +9,6 @@
 	"notificationStatus":"START",
 	"operationState":"PROCESSING",
 	"isAutomaticInvocation":"True",
+	"affectedVnf": "{affectedVnf}",
 	"_links":""
 }}
diff --git a/SOL005/NSLifecycleManagement-API/jsons/ScaleNs.json b/SOL005/NSLifecycleManagement-API/jsons/ScaleNs.json
index 39d410cfd..2aa88d663 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/ScaleNs.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/ScaleNs.json
@@ -2,7 +2,11 @@
 	"scaleType": "{scaleType}",
 	"timeout_ns_scale": {scaleTimeout},
 	"scaleVnfData": {{
+		"vnfInstanceid": {},
 		"scaleVnfType": "{scaleVnfType}",
+		"scaleToLevelData": {{
+			"vnfInstantiationLevelId": "{vnfInstantiationLevelId}"
+		}},
 		"scaleByStepData": {{
 			"scaling-group-descriptor": "{scaleGroupDescriptor}",
 			"member-vnf-index": "{scaleMemberVnfIndex}"
diff --git a/SOL005/VNFPackageManagement-API/IndividualSubscription.robot b/SOL005/VNFPackageManagement-API/IndividualSubscription.robot
index b2b0c155f..7fc5498cf 100644
--- a/SOL005/VNFPackageManagement-API/IndividualSubscription.robot
+++ b/SOL005/VNFPackageManagement-API/IndividualSubscription.robot
@@ -20,6 +20,7 @@ GET Individual VNF Package Subscription
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   PkgmSubscription
     Check HTTP Response Body Subscription Identifier matches the requested Subscription
+    Check HTTP Response Body PkgmSubscription content against VNF Descriptor
 
 GET Individual VNF Package Subscription with invalid resource identifier
     [Documentation]    Test ID: 5.3.5.8.2
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 6f374726a..c886c0442 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -737,8 +737,9 @@ Send Post Request for VNF Package Subscription
     Log    Trying to create a new subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Package
     ${template}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}    vnfdId=${descriptor_id}    vnfProvider=${provider}    vnfProductName=${product_name}    vnfSoftwareVersion=${software_version}    vnfdVersions=${descriptor_version}    
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
@@ -926,6 +927,41 @@ Check HTTP Response Body Subscription Identifier matches the requested Subscript
     Should Be Equal    ${response['body']['id']}    ${subscriptionId} 
     Log    Subscription identifier as expected
 
+Check HTTP Response Body PkgmSubscription content against VNF Descriptor
+    #${check_descriptors} flag, 1 to check descriptors
+    Run Keyword If    ${check_descriptors} == 1    Check Individual PkgmSubscription Content
+
+Check Individual PkgmSubscription Content    
+    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 for Subscription    ELSE    Parse SOL006 for Subscription
+
+Parse SOL001 for Subscription
+    Get key for VNF Descriptor
+    
+    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
+    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
+    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
+    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
+    
+    Should Be Equal As Strings    ${response['body']['filter']['vnfdId']}    ${descriptor_id}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProvider']}    ${provider}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['vnfProductName']}    ${product_name}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['vnfProductName']['versions']['vnfSoftwareVersion']}    ${software_version}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['vnfProductName']['versions']['vnfdVersion']}    ${descriptor_version}
+    
+Parse SOL006 for Subscription
+     ${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}
+     ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
+     ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}
+     
+    Should Be Equal As Strings    ${response['body']['filter']['vnfdId']}    ${descriptor_id}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProvider']}    ${provider}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['vnfProductName']}    ${product_name}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['vnfProductName']['versions']['vnfSoftwareVersion']}    ${software_version}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['vnfProductName']['versions']['vnfdVersion']}    ${descriptor_version}
+
 Check Notification Endpoint
     &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}    
     &{headers} =	Create Dictionary	Content-Type=application/json
diff --git a/SOL005/VNFPackageManagement-API/jsons/subscriptions.json b/SOL005/VNFPackageManagement-API/jsons/subscriptions.json
index 124004374..0edaec106 100644
--- a/SOL005/VNFPackageManagement-API/jsons/subscriptions.json
+++ b/SOL005/VNFPackageManagement-API/jsons/subscriptions.json
@@ -1,6 +1,16 @@
 {{
 	"callbackUri": "{callback_uri}{callback_endpoint}",
 	"filter": {{
-		"vnfPkgId":  ["{vnfPkgId}"]
+		"vnfdId": ["{vnfdId}"],
+		"vnfPkgId":  ["{vnfPkgId}"],
+		"vnfProductsFromProviders": {{
+			"vnfProvider": {"vnfProvider"},
+			"vnfProducts": {{
+				"vnfProductName": {"vnfProductName"},
+				"versions": {{
+					"vnfSoftwareVersion": {"vnfSoftwareVersion"},
+					"vnfdVersions": [{"vnfdVersions"}]
+				}}
+		}}
 	}}
 }}
\ No newline at end of file
-- 
GitLab


From 3fb8875a3fa6333588216dd79b4b6f0c866f0c5f Mon Sep 17 00:00:00 2001
From: zafar <zafar@etsi.org>
Date: Tue, 5 Jan 2021 16:16:26 +0500
Subject: [PATCH 224/322] SOL006 descriptors updated

---
 .../VNFInstances.robot                        |   1 +
 .../VnfLcmOperationKeywords.robot             |  15 +-
 ...> reference_tst010_vnf_b_2vdu_SOL001.yaml} |   8 +-
 .../reference_tst010_vnf_b_2df_SOL006.yaml    | 105 -------------
 .../reference_tst010_vnf_b_2vdu_SOL006.yaml   | 138 ++++++++++++++++++
 5 files changed, 157 insertions(+), 110 deletions(-)
 rename SOL002/VNFLifecycleManagement-API/descriptors/SOL001/{vnf-b-1_VNF.yaml => reference_tst010_vnf_b_2vdu_SOL001.yaml} (96%)
 delete mode 100644 SOL002/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
 create mode 100644 SOL002/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml

diff --git a/SOL002/VNFLifecycleManagement-API/VNFInstances.robot b/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
index e518ec98a..6c042d821 100644
--- a/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
+++ b/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
@@ -19,6 +19,7 @@ POST Create a new vnfInstance
     POST Create a new vnfInstance
     Check HTTP Response Status Code Is    201
     Check HTTP Response Body Json Schema Is    vnfInstance
+    Check HTTP Response Body vnfInstance content against VNF Descriptor
 
 GET information about multiple VNF instances  
     [Documentation]    Test ID: 6.3.5.1.2
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index 46e2fa7a6..9d183ea82 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -76,7 +76,7 @@ Check HTTP Response Header Contains
     Log    Header is present
 
 POST Create a new vnfInstance	
-     Log    Create VNF instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances
+    Log    Create VNF instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Set Headers    {"Authorization":"${AUTHORIZATION}"}
@@ -1058,12 +1058,25 @@ Parse SOL006
      ${product_name}=    Get Variable Value    ${nfv.vnfd[0].product-name}
      ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
      ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}
+     ${external_cp}=    Get Variable Value    ${nfv.vnfd[0].ext-cpd[0].id}
+     ${vdu_id}=    Get Variable Value    ${nfv.vnfd[0].vdu[0].id}
+     ${vdu_cpid}=    Get Variable Value    ${nfv.vnfd[0].vdu[0].int-cpd[2].id} 
+     ${virtual_storage}=    Get Variable Value    ${nfv.vnfd[0].virtual-storage-desc.id}
+     ${virtual_link}=    Get Variable Value    ${nfv.vnfd[0].int-virtual-link-desc.id}
+
      
     Should Be Equal As Strings    ${response['body']['vnfdId']}    ${descriptor_id}
     Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${provider}
     Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${product_name}
     Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}
     Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
+    Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['extCpInfo']['cpdId']}    ${external_cp}
+    Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo']['vduId']}    ${vdu_id}
+    Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo']['vnfcCpInfo']['cpdId']}    ${vdu_cpid}
+    Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['virtualStorageResourceInfo']['virtualStorageDescId']}    ${virtual_storage}
+    Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['extManagedVirtualLinkInfo']['vnfVirtualLinkDescId']}    ${virtual_link}
+
+
 
 Add VNF Descriptor Content to VNF Instance
     Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 VNF Instance    ELSE    Parse SOL006 VNF Instance
diff --git a/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml b/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
similarity index 96%
rename from SOL002/VNFLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
rename to SOL002/VNFLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
index 1712e2b33..797d8bec3 100644
--- a/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
+++ b/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
@@ -75,7 +75,7 @@ topology_template:
         virtual_link_left:
         virtual_binding: VDU-B-1
     internal_vl:
-      type: tosca.nodes.nfv.VnfVirtualLink
+      type: "tosca.nodes.nfv.VnfVirtualLink"
       properties:
         connectivity_type:
           layer_protocols: [ ipv4 ]
@@ -88,14 +88,14 @@ topology_template:
             root: 10000
             leaf: 10000
     internal_vdu_b_1_cp:
-      type: tosca.nodes.nfv.VduCp
+      type: "tosca.nodes.nfv.VduCp"
       properties:
         order: 2
       requirements:
         - virtual_binding: VDU-B-1
         - virtual_link: internal_vl
     internal_vdu_b_2_cp:
-      type: tosca.nodes.nfv.VduCp
+      type: "tosca.nodes.nfv.VduCp"
       properties:
         order: 0
       requirements:
@@ -120,7 +120,7 @@ topology_template:
           size: '1'
       artifacts:
         sw_image:
-          type: tosca.artifacts.nfv.SwImage
+          type: "tosca.artifacts.nfv.SwImage"
           file: vdu-b-1.qcow2
     vdu-b-1-vsd:
       type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
diff --git a/SOL002/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml b/SOL002/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
deleted file mode 100644
index 4b84be92b..000000000
--- a/SOL002/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
+++ /dev/null
@@ -1,105 +0,0 @@
-nfv:
-  vnfd:
-    - id: VNF-B-2df
-      provider: ETSI TST WG
-      product-name: TST010 reference VNF-B with 2 DFs
-      software-version: '2.1'
-      version: '2.1'
-      vnfm-info: ETSI VNFM
-      vdu:
-        id: vdu-b-1
-        name: VNF-B VDU 1
-        int-cpd:
-          - id: left
-            layer-protocol: ethernet
-          - id: management
-            layer-protocol: ethernet
-          - id: right
-            layer-protocol: ethernet
-        virtual-compute-desc: vdu-b-1-vcd
-        virtual-storage-desc: vdu-b-1-vsd
-        sw-image-desc: vdu-b-1-image
-      virtual-compute-desc:
-        id: vdu-b-1-vcd
-        virtual-memory:
-          size: '4.0'
-        virtual-cpu:
-          num-virtual-cpu: '2'
-      virtual-storage-desc:
-        id: vdu-b-1-vsd
-        type-of-storage: root-storage
-        size-of-storage: '0'
-      sw-image-desc:
-        id: vdu-b-1-image
-        name: VNF-B image
-        version: '1.1'
-        checksum:
-          algorithm: sha-224
-          hash: somehashfortst010
-        container-format: bare
-        disk-format: qcow2
-        min-disk: '1'
-        min-ram: '2.0'
-        size: '1'
-        image: 'http://someurl.com/VNF-B.qcow2'
-      ext-cpd:
-        - id: ext-b-left
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: left
-          layer-protocol: ethernet
-        - id: management
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: management
-          layer-protocol: ethernet
-        - id: ext-b-right
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: right
-          layer-protocol: ethernet
-      df:
-        - id: small
-          vdu-profile:
-            id: vdu-b-1
-            min-number-of-instances: '1'
-            max-number-of-instances: '2'
-          instantiation-level:
-            - id: double
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '2'
-            - id: single
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '1'
-          default-instantiation-level: single
-          lcm-operations-configuration:
-            scale-vnf-to-level-op-config:
-              arbitrary-target-levels-supported: 'true'
-            terminate-vnf-op-config:
-              min-graceful-termination: '1'
-            operate-vnf-op-config:
-              min-graceful-stop-timeout: '1'
-        - id: big
-          vdu-profile:
-            id: vdu-b-1
-            min-number-of-instances: '1'
-            max-number-of-instances: '4'
-          instantiation-level:
-            - id: double
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '2'
-            - id: triple
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '3'
-          default-instantiation-level: double
-          lcm-operations-configuration:
-            scale-vnf-to-level-op-config:
-              arbitrary-target-levels-supported: 'true'
-            terminate-vnf-op-config:
-              min-graceful-termination: '1'
-            operate-vnf-op-config:
-              min-graceful-stop-timeout: '1'
diff --git a/SOL002/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml b/SOL002/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
new file mode 100644
index 000000000..d033e5a2e
--- /dev/null
+++ b/SOL002/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
@@ -0,0 +1,138 @@
+nfv:
+  vnfd:
+    - id: VNF-B-2vdu
+      provider: ETSI TST WG
+      product-name: TST010 reference VNF-B with 2 VDUs
+      software-version: '2.2'
+      version: '2.2'
+      vnfm-info: ETSI VNFM
+      vdu:
+        id: vdu-b-1
+        name: VNF-B VDU 1
+        int-cpd:
+          - id: left
+            layer-protocol: ethernet
+          - id: management
+            layer-protocol: ethernet
+          - id: internal
+            layer-protocol: ethernet
+            int-virtual-link-desc: internal-vl
+        virtual-compute-desc: vdu-b-1-vcd
+        virtual-storage-desc: vdu-b-1-vsd
+        sw-image-desc: vdu-b-1-image
+      vdu:
+        id: vdu-b-2
+        name: VNF-B VDU 2
+        int-cpd:
+          - id: right
+            layer-protocol: ethernet
+          - id: management
+            layer-protocol: ethernet
+          - id: internal
+            layer-protocol: ethernet
+            int-virtual-link-desc: internal-vl
+        virtual-compute-desc: vdu-b-2-vcd
+        virtual-storage-desc: vdu-b-2-vsd
+        sw-image-desc: vdu-b-2-image
+      virtual-compute-desc:
+        id: vdu-b-1-vcd
+        virtual-memory:
+          size: '4.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-1-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-1-image
+        name: VNF-B image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B.qcow2'
+      virtual-compute-desc:
+        id: vdu-b-2-vcd
+        virtual-memory:
+          size: '6.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-2-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-2-image
+        name: VNF-B-2 image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B-2.qcow2'
+      int-virtual-link-desc:
+        - id: internal-vl
+          flavour:
+            id: internal-vl-flavour
+            qos:
+              latency: '1'
+              packet-delay-variation: '1'
+              packet-loss-ratio: '0.05'
+          connectivity-type:
+            layer-protocol: ethernet     
+      ext-cpd:
+        - id: ext-b-left
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: left
+          layer-protocol: ethernet
+        - id: management
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: management
+          layer-protocol: ethernet
+        - id: ext-b-right
+          int-cpd:
+            vdu-id: vdu-b-2
+            cpd: right
+          layer-protocol: ethernet
+      df:
+        id: normal
+        vdu-profile:
+          - id: vdu-b-1
+            min-number-of-instances: '1'
+            max-number-of-instances: '2'
+          - id: vdu-b-2
+            min-number-of-instances: '1'
+            max-number-of-instances: '4'          
+        instantiation-level:
+          - id: double
+            vdu-level:
+              - vdu-id: vdu-b-1
+                number-of-instances: '2'
+              - vdu-id: vdu-b-2
+                number-of-instances: '2'
+          - id: single
+            vdu-level:
+              - vdu-id: vdu-b-1
+                number-of-instances: '1'
+              - vdu-id: vdu-b-2
+                number-of-instances: '1'
+        default-instantiation-level: single
+        lcm-operations-configuration:
+          scale-vnf-to-level-op-config:
+            arbitrary-target-levels-supported: 'true'
+          terminate-vnf-op-config:
+            min-graceful-termination: '1'
+          operate-vnf-op-config:
+            min-graceful-stop-timeout: '1'
\ No newline at end of file
-- 
GitLab


From a2f15601f08ac6b0b3b0932841ec1846d18a2755 Mon Sep 17 00:00:00 2001
From: zafar <zafar@etsi.org>
Date: Tue, 5 Jan 2021 17:37:40 +0500
Subject: [PATCH 225/322] SOL006 descriptors added

---
 .../IndividualVnfLcmOperationOccurence.robot  |  2 +-
 .../VnfLcmOperationKeywords.robot             | 23 ++++++++++++-------
 .../jsons/patchBodyRequest.json               |  2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot b/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
index 25bdd4d68..cf5882df8 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
@@ -28,7 +28,7 @@ Get status information about multiple VNF instances
     ...    Post-Conditions: none 
     Get Individual VNF LCM OP occurrences
     Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    VnfLcmOpOcc 
+    Check HTTP Response Body Json Schema Is    vnfLcmOpOcc 
     Check HTTP Response Body vnf LCM OpOCC content against VNF Descriptor
 
 PUT status information about multiple VNF instances - Method not implemented
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index 9d183ea82..1119823c3 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -10,7 +10,7 @@ Library    JSONLibrary
 Library    Collections
 Library    JSONSchemaLibrary    schemas/
 Library           String
-Variables    descriptors/SOL001/vnf-b-1_VNF.yaml
+Variables    descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
 
 *** Keywords ***
 
@@ -204,9 +204,9 @@ PATCH individual vnfInstance
     Set Headers    {"Content-Type": "${CONTENT_TYPE_PATCH}"}
     Set Headers    {"If-Match": "${original_etag}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Instance
-    ${template}=    Get File    jsons/patchBodyRequest.json
-    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}
+    #Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Instance
+    ${body}=    Get File    jsons/patchBodyRequest.json
+    #${body}=        Format String   ${template}     vnfdId=${descriptor_id}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}    ${body}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -1108,12 +1108,19 @@ Parse SOL001 LCM Op Occ
     ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
     ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
     
-    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${descriptor_id}
-    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
+    Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdId']}    ${descriptor_id}
+    Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdVersion']}    ${descriptor_version}
     
 Parse SOL006 LCM Op Occ
      ${descriptor_id}=    Get Variable Value    ${nfv.vnfd[0].id}
      ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}
+     ${vdu_id}=    Get Variable Value    ${nfv.vnfd[0].vdu[0].id}
+     ${virtual_storage}=    Get Variable Value    ${nfv.vnfd[0].virtual-storage-desc.id}
+     ${virtual_link}=    Get Variable Value    ${nfv.vnfd[0].int-virtual-link-desc.id}
      
-    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${descriptor_id}
-    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
\ No newline at end of file
+    Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdId']}    ${descriptor_id}
+    Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdVersion']}    ${descriptor_version}
+    Should Be Equal As Strings    ${response['body']['resourceChanges']['affectedVirtualLinks']['vnfVirtualLinkDescId']}    ${virtual_link}
+    Should Be Equal As Strings    ${response['body']['resourceChanges']['affectedVnfcs']['vduId']}    ${vdu_id}
+    Should Be Equal As Strings    ${response['body']['resourceChanges']['affectedVirtualStorages']['virtualStorageDescId']}    ${virtual_storage}
+    
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/patchBodyRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/patchBodyRequest.json
index a9f1c9dae..774192021 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/patchBodyRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/patchBodyRequest.json
@@ -1,5 +1,5 @@
 {
   "vnfInstanceName": "vnf new name",
   "vnfInstanceDescription": "new description",
-  "vnfdId": "{vnfdId}"
+  "vnfdId": ""
 }
\ No newline at end of file
-- 
GitLab


From afedd0f22463d9a3741af386ce8ae584c8211c3c Mon Sep 17 00:00:00 2001
From: zafar <zafar@etsi.org>
Date: Tue, 5 Jan 2021 18:17:40 +0500
Subject: [PATCH 226/322] Reference descriptor files updated

---
 ...> reference_tst010_vnf_b_2vdu_SOL001.yaml} |   6 +-
 .../reference_tst010_vnf_b_2df_SOL006.yaml    | 105 -------------
 .../reference_tst010_vnf_b_2vdu_SOL006.yaml   | 138 ++++++++++++++++++
 ...> reference_tst010_vnf_b_2vdu_SOL001.yaml} |   8 +-
 .../reference_tst010_vnf_b_2df_SOL006.yaml    | 105 -------------
 .../reference_tst010_vnf_b_2vdu_SOL006.yaml   | 138 ++++++++++++++++++
 6 files changed, 283 insertions(+), 217 deletions(-)
 rename SOL005/NSLifecycleManagement-API/descriptors/SOL001/{vnf-b-1_VNF.yaml => reference_tst010_vnf_b_2vdu_SOL001.yaml} (97%)
 delete mode 100644 SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
 create mode 100644 SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
 rename SOL005/VNFPackageManagement-API/descriptors/SOL001/{vnf-b-1_VNF.yaml => reference_tst010_vnf_b_2vdu_SOL001.yaml} (96%)
 delete mode 100644 SOL005/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
 create mode 100644 SOL005/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml

diff --git a/SOL005/NSLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml b/SOL005/NSLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
similarity index 97%
rename from SOL005/NSLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
rename to SOL005/NSLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
index d9a374060..797d8bec3 100644
--- a/SOL005/NSLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
+++ b/SOL005/NSLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
@@ -88,14 +88,14 @@ topology_template:
             root: 10000
             leaf: 10000
     internal_vdu_b_1_cp:
-      type: tosca.nodes.nfv.VduCp
+      type: "tosca.nodes.nfv.VduCp"
       properties:
         order: 2
       requirements:
         - virtual_binding: VDU-B-1
         - virtual_link: internal_vl
     internal_vdu_b_2_cp:
-      type: tosca.nodes.nfv.VduCp
+      type: "tosca.nodes.nfv.VduCp"
       properties:
         order: 0
       requirements:
@@ -120,7 +120,7 @@ topology_template:
           size: '1'
       artifacts:
         sw_image:
-          type: tosca.artifacts.nfv.SwImage
+          type: "tosca.artifacts.nfv.SwImage"
           file: vdu-b-1.qcow2
     vdu-b-1-vsd:
       type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
diff --git a/SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml b/SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
deleted file mode 100644
index 4b84be92b..000000000
--- a/SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
+++ /dev/null
@@ -1,105 +0,0 @@
-nfv:
-  vnfd:
-    - id: VNF-B-2df
-      provider: ETSI TST WG
-      product-name: TST010 reference VNF-B with 2 DFs
-      software-version: '2.1'
-      version: '2.1'
-      vnfm-info: ETSI VNFM
-      vdu:
-        id: vdu-b-1
-        name: VNF-B VDU 1
-        int-cpd:
-          - id: left
-            layer-protocol: ethernet
-          - id: management
-            layer-protocol: ethernet
-          - id: right
-            layer-protocol: ethernet
-        virtual-compute-desc: vdu-b-1-vcd
-        virtual-storage-desc: vdu-b-1-vsd
-        sw-image-desc: vdu-b-1-image
-      virtual-compute-desc:
-        id: vdu-b-1-vcd
-        virtual-memory:
-          size: '4.0'
-        virtual-cpu:
-          num-virtual-cpu: '2'
-      virtual-storage-desc:
-        id: vdu-b-1-vsd
-        type-of-storage: root-storage
-        size-of-storage: '0'
-      sw-image-desc:
-        id: vdu-b-1-image
-        name: VNF-B image
-        version: '1.1'
-        checksum:
-          algorithm: sha-224
-          hash: somehashfortst010
-        container-format: bare
-        disk-format: qcow2
-        min-disk: '1'
-        min-ram: '2.0'
-        size: '1'
-        image: 'http://someurl.com/VNF-B.qcow2'
-      ext-cpd:
-        - id: ext-b-left
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: left
-          layer-protocol: ethernet
-        - id: management
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: management
-          layer-protocol: ethernet
-        - id: ext-b-right
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: right
-          layer-protocol: ethernet
-      df:
-        - id: small
-          vdu-profile:
-            id: vdu-b-1
-            min-number-of-instances: '1'
-            max-number-of-instances: '2'
-          instantiation-level:
-            - id: double
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '2'
-            - id: single
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '1'
-          default-instantiation-level: single
-          lcm-operations-configuration:
-            scale-vnf-to-level-op-config:
-              arbitrary-target-levels-supported: 'true'
-            terminate-vnf-op-config:
-              min-graceful-termination: '1'
-            operate-vnf-op-config:
-              min-graceful-stop-timeout: '1'
-        - id: big
-          vdu-profile:
-            id: vdu-b-1
-            min-number-of-instances: '1'
-            max-number-of-instances: '4'
-          instantiation-level:
-            - id: double
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '2'
-            - id: triple
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '3'
-          default-instantiation-level: double
-          lcm-operations-configuration:
-            scale-vnf-to-level-op-config:
-              arbitrary-target-levels-supported: 'true'
-            terminate-vnf-op-config:
-              min-graceful-termination: '1'
-            operate-vnf-op-config:
-              min-graceful-stop-timeout: '1'
diff --git a/SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml b/SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
new file mode 100644
index 000000000..d033e5a2e
--- /dev/null
+++ b/SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
@@ -0,0 +1,138 @@
+nfv:
+  vnfd:
+    - id: VNF-B-2vdu
+      provider: ETSI TST WG
+      product-name: TST010 reference VNF-B with 2 VDUs
+      software-version: '2.2'
+      version: '2.2'
+      vnfm-info: ETSI VNFM
+      vdu:
+        id: vdu-b-1
+        name: VNF-B VDU 1
+        int-cpd:
+          - id: left
+            layer-protocol: ethernet
+          - id: management
+            layer-protocol: ethernet
+          - id: internal
+            layer-protocol: ethernet
+            int-virtual-link-desc: internal-vl
+        virtual-compute-desc: vdu-b-1-vcd
+        virtual-storage-desc: vdu-b-1-vsd
+        sw-image-desc: vdu-b-1-image
+      vdu:
+        id: vdu-b-2
+        name: VNF-B VDU 2
+        int-cpd:
+          - id: right
+            layer-protocol: ethernet
+          - id: management
+            layer-protocol: ethernet
+          - id: internal
+            layer-protocol: ethernet
+            int-virtual-link-desc: internal-vl
+        virtual-compute-desc: vdu-b-2-vcd
+        virtual-storage-desc: vdu-b-2-vsd
+        sw-image-desc: vdu-b-2-image
+      virtual-compute-desc:
+        id: vdu-b-1-vcd
+        virtual-memory:
+          size: '4.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-1-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-1-image
+        name: VNF-B image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B.qcow2'
+      virtual-compute-desc:
+        id: vdu-b-2-vcd
+        virtual-memory:
+          size: '6.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-2-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-2-image
+        name: VNF-B-2 image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B-2.qcow2'
+      int-virtual-link-desc:
+        - id: internal-vl
+          flavour:
+            id: internal-vl-flavour
+            qos:
+              latency: '1'
+              packet-delay-variation: '1'
+              packet-loss-ratio: '0.05'
+          connectivity-type:
+            layer-protocol: ethernet     
+      ext-cpd:
+        - id: ext-b-left
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: left
+          layer-protocol: ethernet
+        - id: management
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: management
+          layer-protocol: ethernet
+        - id: ext-b-right
+          int-cpd:
+            vdu-id: vdu-b-2
+            cpd: right
+          layer-protocol: ethernet
+      df:
+        id: normal
+        vdu-profile:
+          - id: vdu-b-1
+            min-number-of-instances: '1'
+            max-number-of-instances: '2'
+          - id: vdu-b-2
+            min-number-of-instances: '1'
+            max-number-of-instances: '4'          
+        instantiation-level:
+          - id: double
+            vdu-level:
+              - vdu-id: vdu-b-1
+                number-of-instances: '2'
+              - vdu-id: vdu-b-2
+                number-of-instances: '2'
+          - id: single
+            vdu-level:
+              - vdu-id: vdu-b-1
+                number-of-instances: '1'
+              - vdu-id: vdu-b-2
+                number-of-instances: '1'
+        default-instantiation-level: single
+        lcm-operations-configuration:
+          scale-vnf-to-level-op-config:
+            arbitrary-target-levels-supported: 'true'
+          terminate-vnf-op-config:
+            min-graceful-termination: '1'
+          operate-vnf-op-config:
+            min-graceful-stop-timeout: '1'
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml b/SOL005/VNFPackageManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
similarity index 96%
rename from SOL005/VNFPackageManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
rename to SOL005/VNFPackageManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
index 1712e2b33..797d8bec3 100644
--- a/SOL005/VNFPackageManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
+++ b/SOL005/VNFPackageManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
@@ -75,7 +75,7 @@ topology_template:
         virtual_link_left:
         virtual_binding: VDU-B-1
     internal_vl:
-      type: tosca.nodes.nfv.VnfVirtualLink
+      type: "tosca.nodes.nfv.VnfVirtualLink"
       properties:
         connectivity_type:
           layer_protocols: [ ipv4 ]
@@ -88,14 +88,14 @@ topology_template:
             root: 10000
             leaf: 10000
     internal_vdu_b_1_cp:
-      type: tosca.nodes.nfv.VduCp
+      type: "tosca.nodes.nfv.VduCp"
       properties:
         order: 2
       requirements:
         - virtual_binding: VDU-B-1
         - virtual_link: internal_vl
     internal_vdu_b_2_cp:
-      type: tosca.nodes.nfv.VduCp
+      type: "tosca.nodes.nfv.VduCp"
       properties:
         order: 0
       requirements:
@@ -120,7 +120,7 @@ topology_template:
           size: '1'
       artifacts:
         sw_image:
-          type: tosca.artifacts.nfv.SwImage
+          type: "tosca.artifacts.nfv.SwImage"
           file: vdu-b-1.qcow2
     vdu-b-1-vsd:
       type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
diff --git a/SOL005/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml b/SOL005/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
deleted file mode 100644
index 4b84be92b..000000000
--- a/SOL005/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
+++ /dev/null
@@ -1,105 +0,0 @@
-nfv:
-  vnfd:
-    - id: VNF-B-2df
-      provider: ETSI TST WG
-      product-name: TST010 reference VNF-B with 2 DFs
-      software-version: '2.1'
-      version: '2.1'
-      vnfm-info: ETSI VNFM
-      vdu:
-        id: vdu-b-1
-        name: VNF-B VDU 1
-        int-cpd:
-          - id: left
-            layer-protocol: ethernet
-          - id: management
-            layer-protocol: ethernet
-          - id: right
-            layer-protocol: ethernet
-        virtual-compute-desc: vdu-b-1-vcd
-        virtual-storage-desc: vdu-b-1-vsd
-        sw-image-desc: vdu-b-1-image
-      virtual-compute-desc:
-        id: vdu-b-1-vcd
-        virtual-memory:
-          size: '4.0'
-        virtual-cpu:
-          num-virtual-cpu: '2'
-      virtual-storage-desc:
-        id: vdu-b-1-vsd
-        type-of-storage: root-storage
-        size-of-storage: '0'
-      sw-image-desc:
-        id: vdu-b-1-image
-        name: VNF-B image
-        version: '1.1'
-        checksum:
-          algorithm: sha-224
-          hash: somehashfortst010
-        container-format: bare
-        disk-format: qcow2
-        min-disk: '1'
-        min-ram: '2.0'
-        size: '1'
-        image: 'http://someurl.com/VNF-B.qcow2'
-      ext-cpd:
-        - id: ext-b-left
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: left
-          layer-protocol: ethernet
-        - id: management
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: management
-          layer-protocol: ethernet
-        - id: ext-b-right
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: right
-          layer-protocol: ethernet
-      df:
-        - id: small
-          vdu-profile:
-            id: vdu-b-1
-            min-number-of-instances: '1'
-            max-number-of-instances: '2'
-          instantiation-level:
-            - id: double
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '2'
-            - id: single
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '1'
-          default-instantiation-level: single
-          lcm-operations-configuration:
-            scale-vnf-to-level-op-config:
-              arbitrary-target-levels-supported: 'true'
-            terminate-vnf-op-config:
-              min-graceful-termination: '1'
-            operate-vnf-op-config:
-              min-graceful-stop-timeout: '1'
-        - id: big
-          vdu-profile:
-            id: vdu-b-1
-            min-number-of-instances: '1'
-            max-number-of-instances: '4'
-          instantiation-level:
-            - id: double
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '2'
-            - id: triple
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '3'
-          default-instantiation-level: double
-          lcm-operations-configuration:
-            scale-vnf-to-level-op-config:
-              arbitrary-target-levels-supported: 'true'
-            terminate-vnf-op-config:
-              min-graceful-termination: '1'
-            operate-vnf-op-config:
-              min-graceful-stop-timeout: '1'
diff --git a/SOL005/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml b/SOL005/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
new file mode 100644
index 000000000..d033e5a2e
--- /dev/null
+++ b/SOL005/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
@@ -0,0 +1,138 @@
+nfv:
+  vnfd:
+    - id: VNF-B-2vdu
+      provider: ETSI TST WG
+      product-name: TST010 reference VNF-B with 2 VDUs
+      software-version: '2.2'
+      version: '2.2'
+      vnfm-info: ETSI VNFM
+      vdu:
+        id: vdu-b-1
+        name: VNF-B VDU 1
+        int-cpd:
+          - id: left
+            layer-protocol: ethernet
+          - id: management
+            layer-protocol: ethernet
+          - id: internal
+            layer-protocol: ethernet
+            int-virtual-link-desc: internal-vl
+        virtual-compute-desc: vdu-b-1-vcd
+        virtual-storage-desc: vdu-b-1-vsd
+        sw-image-desc: vdu-b-1-image
+      vdu:
+        id: vdu-b-2
+        name: VNF-B VDU 2
+        int-cpd:
+          - id: right
+            layer-protocol: ethernet
+          - id: management
+            layer-protocol: ethernet
+          - id: internal
+            layer-protocol: ethernet
+            int-virtual-link-desc: internal-vl
+        virtual-compute-desc: vdu-b-2-vcd
+        virtual-storage-desc: vdu-b-2-vsd
+        sw-image-desc: vdu-b-2-image
+      virtual-compute-desc:
+        id: vdu-b-1-vcd
+        virtual-memory:
+          size: '4.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-1-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-1-image
+        name: VNF-B image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B.qcow2'
+      virtual-compute-desc:
+        id: vdu-b-2-vcd
+        virtual-memory:
+          size: '6.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-2-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-2-image
+        name: VNF-B-2 image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B-2.qcow2'
+      int-virtual-link-desc:
+        - id: internal-vl
+          flavour:
+            id: internal-vl-flavour
+            qos:
+              latency: '1'
+              packet-delay-variation: '1'
+              packet-loss-ratio: '0.05'
+          connectivity-type:
+            layer-protocol: ethernet     
+      ext-cpd:
+        - id: ext-b-left
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: left
+          layer-protocol: ethernet
+        - id: management
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: management
+          layer-protocol: ethernet
+        - id: ext-b-right
+          int-cpd:
+            vdu-id: vdu-b-2
+            cpd: right
+          layer-protocol: ethernet
+      df:
+        id: normal
+        vdu-profile:
+          - id: vdu-b-1
+            min-number-of-instances: '1'
+            max-number-of-instances: '2'
+          - id: vdu-b-2
+            min-number-of-instances: '1'
+            max-number-of-instances: '4'          
+        instantiation-level:
+          - id: double
+            vdu-level:
+              - vdu-id: vdu-b-1
+                number-of-instances: '2'
+              - vdu-id: vdu-b-2
+                number-of-instances: '2'
+          - id: single
+            vdu-level:
+              - vdu-id: vdu-b-1
+                number-of-instances: '1'
+              - vdu-id: vdu-b-2
+                number-of-instances: '1'
+        default-instantiation-level: single
+        lcm-operations-configuration:
+          scale-vnf-to-level-op-config:
+            arbitrary-target-levels-supported: 'true'
+          terminate-vnf-op-config:
+            min-graceful-termination: '1'
+          operate-vnf-op-config:
+            min-graceful-stop-timeout: '1'
\ No newline at end of file
-- 
GitLab


From 71788593472711463c77dcd157575dc786fa59de Mon Sep 17 00:00:00 2001
From: zafar <zafar@etsi.org>
Date: Tue, 5 Jan 2021 20:25:07 +0500
Subject: [PATCH 227/322] SOL006 descriptors updated

---
 .../NSLCMOperationKeywords.robot                   | 14 ++++++++++----
 .../NotificationConsumer.robot                     |  2 +-
 .../NsLcmOperationOccurrenceNotification.json      |  4 +++-
 .../VNFPackageManagementKeywords.robot             |  4 +---
 .../jsons/subscriptions.json                       |  2 +-
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index 0472e3a83..c7d01465b 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -8,7 +8,7 @@ Library    OperatingSystem
 Library    MockServerLibrary
 Library    Collections
 Library    String
-Variables  descriptors/SOL001/vnf-b-1_VNF.yaml
+Variables  descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
 
 
 *** Keywords ***
@@ -255,8 +255,10 @@ Parse SOL006
      ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}
      ${external_cp}=    Get Variable Value    ${nfv.vnfd[0].ext-cpd[0].id}
      ${vdu_id}=    Get Variable Value    ${nfv.vnfd[0].vdu[0].id}
-     ${virtual_storage}=    Get Variable Value    ${nfv.vnfd[0].vdu[0].virtual-storage-desc}
-     
+     ${vdu_cpid}=    Get Variable Value    ${nfv.vnfd[0].vdu[0].int-cpd[2].id} 
+     ${virtual_storage}=    Get Variable Value    ${nfv.vnfd[0].virtual-storage-desc.id}
+     ${virtual_link}=    Get Variable Value    ${nfv.vnfd[0].int-virtual-link-desc.id}
+
     Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfdId']}    ${descriptor_id}
     Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfProvider']}    ${provider}
     Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfProductName']}    ${product_name}
@@ -264,7 +266,10 @@ Parse SOL006
     Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfdVersion']}    ${descriptor_version}
     Should Be Equal As Strings    ${response['body']['vnfInstance']['instantiatedVnfInfo']['extCpInfo']['cpdId']}    ${external_cp}
     Should Be Equal As Strings    ${response['body']['vnfInstance']['instantiatedVnfInfo']['vnfcResourceInfo']['vduId']}    ${vdu_id}
+    Should Be Equal As Strings    ${response['body']['vnfInstance']['instantiatedVnfInfo']['extCpInfo']['cpdId']}    ${vdu_cpid}
     Should Be Equal As Strings    ${response['body']['vnfInstance']['instantiatedVnfInfo']['virtualStorageResourceInfo']['virtualStorageDescId']}    ${virtual_storage}
+    Should Be Equal As Strings    ${response['body']['vnfInstance']['instantiatedVnfInfo']['extManagedVirtualLinkInfo']['vnfVirtualLinkDescId']}    ${virtual_link}
+
 
 Get key for VNF Descriptor
     FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
@@ -583,7 +588,8 @@ Parse SOL006 NS Instance
     ${provider}=    Get Variable Value    ${nfv.vnfd[0].provider}
     ${product_name}=    Get Variable Value    ${nfv.vnfd[0].product-name}
     ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
-    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}   
+    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}
+    ${virtualLink_id}=    Get Variable Value    ${nfv.vnfd[0].int-virtual-link-desc.id}       
     ${instantiationLevel_id}=    Get Variable Value    ${nfv.vnfd[0].df[0].instantiation-level[0].id}  
  
 DELETE Heal NSInstance
diff --git a/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot b/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot
index 2ad41997f..546b10860 100644
--- a/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot
+++ b/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot
@@ -68,7 +68,7 @@ Post Ns Lcm Operation Occurrence Notification
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to Notification
     ${template} =    Get File    jsons/NsLcmOperationOccurrenceNotification.json
-    ${body}=        Format String   ${template}    nsInstanceId=${nsInstanceId}    nsLcmOpOccId=${nsLcmOpOccId}    subscriptionId=${subscriptionId}    affectedVnf=${descriptor_id}   
+    ${body}=        Format String   ${template}    nsInstanceId=${nsInstanceId}    nsLcmOpOccId=${nsLcmOpOccId}    subscriptionId=${subscriptionId}    vnfdId=${descriptor_id}  
     Post    ${callbackResp}    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
diff --git a/SOL005/NSLifecycleManagement-API/jsons/NsLcmOperationOccurrenceNotification.json b/SOL005/NSLifecycleManagement-API/jsons/NsLcmOperationOccurrenceNotification.json
index 414dc2d13..9a4e3cfb0 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/NsLcmOperationOccurrenceNotification.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/NsLcmOperationOccurrenceNotification.json
@@ -9,6 +9,8 @@
 	"notificationStatus":"START",
 	"operationState":"PROCESSING",
 	"isAutomaticInvocation":"True",
-	"affectedVnf": "{affectedVnf}",
+	"affectedVnf": {{
+		"vnfdId": "{vnfdId}"
+	}},
 	"_links":""
 }}
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index c886c0442..b1c600a40 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -8,7 +8,7 @@ Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_veri
 Library           Process
 Library           MockServerLibrary
 Library           String
-Variables         descriptors/SOL001/vnf-b-1_VNF.yaml
+Variables         descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
 
 
 *** Keywords ***
@@ -222,14 +222,12 @@ Parse SOL001
     ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
     ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
     ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
-    #${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
     
     Should Be Equal As Strings    ${response['body']['vnfdId']}    ${descriptor_id}
     Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${provider}
     Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${product_name}
     Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}
     Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
-    #Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['flavourId']}    ${flavour_id}
     
 Parse SOL006
      ${descriptor_id}=    Get Variable Value    ${nfv.vnfd[0].id}
diff --git a/SOL005/VNFPackageManagement-API/jsons/subscriptions.json b/SOL005/VNFPackageManagement-API/jsons/subscriptions.json
index 0edaec106..e4db0e2b5 100644
--- a/SOL005/VNFPackageManagement-API/jsons/subscriptions.json
+++ b/SOL005/VNFPackageManagement-API/jsons/subscriptions.json
@@ -9,7 +9,7 @@
 				"vnfProductName": {"vnfProductName"},
 				"versions": {{
 					"vnfSoftwareVersion": {"vnfSoftwareVersion"},
-					"vnfdVersions": [{"vnfdVersions"}]
+					"vnfdVersions": [{"vnfdVersion"}]
 				}}
 		}}
 	}}
-- 
GitLab


From 0001d589d2702e07132901d682c5fd70c648922d Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Thu, 7 Jan 2021 17:29:44 +0100
Subject: [PATCH 228/322] Fix on multiple keywords with same name

---
 .../NSDManagementKeywords.robot               | 250 +++++++++---------
 .../VNFPackageManagementKeywords.robot        | 220 +++++++--------
 2 files changed, 235 insertions(+), 235 deletions(-)

diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index c5a26d96a..355128df6 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -16,7 +16,7 @@ GET all Network Service Descriptors Information
     Log    The GET method queries multiple NS descriptors
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -24,7 +24,7 @@ GET Network Service Descriptors Information with attribute-based filter
     Log    The GET method queries multiple NS descriptors using Attribute-based filtering parameters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?${NSD_NAME}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?${NSD_NAME}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -37,7 +37,7 @@ GET Network Service Descriptors Information with invalid attribute-based filter
     Log    The GET method queries multiple NS descriptors using Attribute-based filtering parameters. Negative case, with erroneous attribute name
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?${NEG_FIELDS}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?${NEG_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -47,7 +47,7 @@ Get all Network Service Descriptors Information with malformed authorization tok
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Authorization": "${BAD_AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
+    REST.Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -56,7 +56,7 @@ Get all Network Service Descriptors Information without authorization token
     Log    The GET method queries omitting token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -66,7 +66,7 @@ Get all Network Service Descriptors Information with expired or revoked authoriz
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Authorization": "${NEG_AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -74,7 +74,7 @@ GET all Network Service Descriptors Information with all_fields attribute select
     Log    The GET method queries multiple NS descriptors using Attribute-based filtering parameters "all_fields"
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?all_fields
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?all_fields
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -88,7 +88,7 @@ GET all Network Service Descriptors Information with exclude_default attribute s
     Log    Trying to get all NSDs present in the NFVO Catalogue, using exclude_default filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?exclude_default
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -102,7 +102,7 @@ GET all Network Service Descriptors Information with fields attribute selector
     Log    Trying to get all NSDs present in the NFVO Catalogue, using fields filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?fields=${fields}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -110,7 +110,7 @@ GET all Network Service Descriptors Information with exclude_default and fields
     Log    Trying to get all NSDs present in the NFVO Catalogue, using fields filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?exclude_default&fields=${fields}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?exclude_default&fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}  
 
@@ -125,7 +125,7 @@ GET all Network Service Descriptors Information with exclude_fields attribute se
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use exclude_fields option
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?exclude_fields=${fields}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
 
@@ -141,7 +141,7 @@ Send Post Request to create new Network Service Descriptor Resource
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${body}=    Get File    jsons/createNsdInfoRequest.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors    ${body}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -149,7 +149,7 @@ Check Postcondition NsdInfo Exists
     Log    Checking that nsd info exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${response['body']['id']}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
@@ -160,7 +160,7 @@ Send PUT Request for all Network Service Descriptors
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -169,7 +169,7 @@ Send PATCH Request for all Network Service Descriptors
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -178,7 +178,7 @@ Send DELETE Request for all Network Service Descriptors
     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": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -190,7 +190,7 @@ GET Individual Network Service Descriptor Information
     Log    The GET method reads information about an individual NS descriptor
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -203,7 +203,7 @@ GET Individual Network Service Descriptor Information with invalid resource iden
     Log    Trying to perform a GET on an erroneous nsDescriptorInfoId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${erroneous_nsdInfoId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${erroneous_nsdInfoId}
     Integer    response status    404
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -215,7 +215,7 @@ Send PATCH to disable Individual Network Service Descriptor
     Set Headers    {"If-Match": "${original_etag}"}
     ${body}=    Get File    jsons/NsdInfoModificationDisable.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}    ${body}
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -236,7 +236,7 @@ Send PATCH to enable Individual Network Service Descriptor
     Set Headers    {"If-Match": "${original_etag}"}
     ${body}=    Get File    jsons/NsdInfoModificationEnable.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}    ${body}
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -247,7 +247,7 @@ Send PATCH to enable Individual Network Service Descriptor in onboarding state d
     Set Headers    {"If-Match": "${original_etag}"}
     ${body}=    Get File    jsons/NsdInfoModificationEnable.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}    ${body}
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -258,7 +258,7 @@ Send PATCH to enable Individual Network Service Descriptor in onboarding state d
     Set Headers    {"If-Match": "${wrong_etag}"}
     ${body}=    Get File    jsons/NsdInfoModificationEnable.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}    ${body}
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -266,21 +266,21 @@ Send DELETE Request for Individual Network Service Descriptor
     Log    Trying to perform a DELETE nsdInfo. The nsdInfo should be in "NOT_USED" usageState and in "DISABLED" operationalState.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${disabledNsdInfoId}
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${disabledNsdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Check Postcondition Network Service Descriptor is Deleted
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${disabledNsdInfoId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${disabledNsdInfoId}
     Integer    response status    404
 
 Send DELETE Request for Individual Network Service Descriptor in operational state ENABLED
     Log    Trying to perform a DELETE nsdInfo in ENABLED operational state
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -292,7 +292,7 @@ Send POST Request for Individual Network Service Descriptor
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -301,7 +301,7 @@ Send PUT Request for Individual Network Service Descriptor
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -329,7 +329,7 @@ Get NSD Content in Zip Format
     Log    Trying to get a NSD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -337,7 +337,7 @@ Get NSD Content with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${erroneous_nsdInfoId}/nsd_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${erroneous_nsdInfoId}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -345,7 +345,7 @@ Get NSD Content with conflict due to onboarding state
     Log    Trying to get a VNFD from a given NSD Management present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}/nsd_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -355,7 +355,7 @@ GET NSD Content with Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -365,7 +365,7 @@ GET NSD Content with invalid Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -413,7 +413,7 @@ Send POST Request for NSD Content
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a POST. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -421,7 +421,7 @@ Send PATCH Request for NSD Content
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -429,7 +429,7 @@ Send DELETE Request for NSD Content
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -437,7 +437,7 @@ GET all PNF Descriptors Information
     Log    The GET method queries multiple PNF descriptors
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -445,7 +445,7 @@ GET PNF Descriptors Information with attribute-based filter
     Log    The GET method queries multiple PNF descriptors using Attribute-based filtering parameters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?${PNFD_NAME}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?${PNFD_NAME}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -458,7 +458,7 @@ GET PNF Descriptors Information with invalid attribute-based filter
     Log    The GET method queries multiple PNF descriptors using Attribute-based filtering parameters. Negative case, with erroneous attribute name
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?${NEG_FIELDS}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?${NEG_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -466,7 +466,7 @@ GET all PNF Descriptors Information with all_fields attribute selector
     Log    The GET method queries multiple PNF descriptors using Attribute-based filtering parameters "all_fields"
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?all_fields
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?all_fields
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -480,7 +480,7 @@ GET all PNF Descriptors Information with exclude_default attribute selector
     Log    Trying to get all PNFDs present in the NFVO Catalogue, using exclude_default filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?exclude_default
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -494,7 +494,7 @@ GET all PNF Descriptors Information with fields attribute selector
     Log    Trying to get all PNFDs present in the NFVO Catalogue, using fields filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?fields=${fields}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}  
     
@@ -502,7 +502,7 @@ GET all PNF Descriptors Information with exclude_default and fields attribute se
     Log    Trying to get all PNFDs present in the NFVO Catalogue, using fields filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?exclude_default&fields=${fields}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?exclude_default&fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}  
 
@@ -517,7 +517,7 @@ GET all PNF Descriptors Information with exclude_fields attribute selector
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use exclude_fields option
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?exclude_fields=${fields}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
 
@@ -533,7 +533,7 @@ Send Post Request to create new PNF Descriptor Resource
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${body}=    Get File    jsons/createPnfdInfoRequest.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors    ${body}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -541,7 +541,7 @@ Check Postcondition PnfdInfo Exists
     Log    Checking that nsd info exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${response['body']['id']}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
@@ -552,7 +552,7 @@ Send PUT Request for all PNF Descriptors
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -561,7 +561,7 @@ Send PATCH Request for all PNF Descriptors
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -570,7 +570,7 @@ Send DELETE Request for all PNF Descriptors
     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": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -578,7 +578,7 @@ GET Individual PNF Descriptor Information
     Log    The GET method reads information about an individual PNF descriptor
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -591,7 +591,7 @@ GET Individual PNF Descriptor Information with invalid resource identifier
     Log    Trying to perform a GET on an erroneous nsDescriptorInfoId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${erroneous_pnfdInfoId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${erroneous_pnfdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -602,7 +602,7 @@ Send PATCH to update Individual PNF Descriptor
     Set Headers    {"If-Match": "${original_etag}"}
     ${body}=    Get File    jsons/PnfdInfoModification.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}    ${body}
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Set Suite Variable    ${body["userDefinedData"]}    ${userDefinedDataSet}
@@ -618,7 +618,7 @@ Send PATCH to update Individual PNF Descriptor with HTTP Etag precondition failu
     Set Headers    {"If-Match": "${wrong_etag}"}
     ${body}=    Get File    jsons/PnfdInfoModification.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}    ${body}
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -626,14 +626,14 @@ Send DELETE Request for Individual PNF Descriptor
     Log    Trying to perform a DELETE pnfdInfo.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Check Postcondition PNF Descriptor is Deleted
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
     Integer    response status    404
 
 Send POST Request for Individual PNF Descriptor
@@ -641,7 +641,7 @@ Send POST Request for Individual PNF Descriptor
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -650,7 +650,7 @@ Send PUT Request for Individual PNF Descriptor
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -658,7 +658,7 @@ Get PNFD Content
     Log    Trying to get a NSD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -667,7 +667,7 @@ Get PNFD Content with Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -676,7 +676,7 @@ Get PNFD Content with invalid Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -684,7 +684,7 @@ Get PNFD Content with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${erroneous_pnfdInfoId}/pnfd_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${erroneous_pnfdInfoId}/pnfd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -692,7 +692,7 @@ Get PNFD Content with conflict due to onboarding state
     Log    Trying to get a PNFD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${onboardingStatePnfdId}/pnfd_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${onboardingStatePnfdId}/pnfd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -710,7 +710,7 @@ Send PUT Request to upload PNFD Content with conflict due to onboarding state
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${body}=  Get Binary File  ${contentFilePnfd}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${creatingNsdInfoId}/pnfd_content    ${body}
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${creatingNsdInfoId}/pnfd_content    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -718,7 +718,7 @@ Send POST Request for PNFD Content
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a POST. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/nsd_content
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -726,7 +726,7 @@ Send PATCH Request for PNFD Content
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/nsd_content
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -734,7 +734,7 @@ Send DELETE Request for PNFD Content
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/nsd_content
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -747,7 +747,7 @@ Get all NSD Management Subscriptions
     Log    Trying to get the list of subscriptions
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -755,7 +755,7 @@ Get NSD Management Subscriptions with attribute-based filters
     Log    Trying to get the list of subscriptions using filters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ok}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ok}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -764,7 +764,7 @@ Get NSD Management Subscriptions with invalid attribute-based filters
     Log    Trying to get the list of subscriptions using filters with wrong attribute name
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ko}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ko}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -773,7 +773,7 @@ Get NSD Management Subscriptions with invalid resource endpoint
     Log    Trying to perform a request on a Uri which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}    
 
@@ -787,21 +787,21 @@ Send Post Request for NSD Management Subscription
     ${template}=    Get File    jsons/subscriptions.json
     ${body}=        Format String   ${template}     notifCallbackUri=${notifCallbackUri}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1
     ...    Check Notification Endpoint  
 
 
-Send Post Request for Duplicated NSD Management Subscription
+Send POST Request for Duplicated NSD Management Subscription
     Log    Trying to create a subscription with an already created content
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${template}=    Get File    jsons/subscriptions.json
     ${body}=        Format String   ${template}     notifCallbackUri=${notifCallbackUri}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1
@@ -814,7 +814,7 @@ Send Put Request for NSD Management Subscriptions
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -824,7 +824,7 @@ Send Patch Request for NSD Management Subscriptions
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -833,7 +833,7 @@ Send Delete Request for NSD Management Subscriptions
     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": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -877,7 +877,7 @@ Check Postcondition NSD Management Subscription Is Set
     Log    Trying to get the subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
@@ -886,7 +886,7 @@ Check Postcondition NSD Management Subscription Is Set
 Check Postcondition Subscription Resource Returned in Location Header Is Available
     Log    Going to check postcondition
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${response['headers']['Location']}
+    REST.GET    ${response['headers']['Location']}
     Integer    response status    200
     Log    Received a 200 OK as expected
     ${contentType}=    Output    response headers Content-Type
@@ -904,7 +904,7 @@ Get Individual NSD Management Subscription
     Log    Trying to get a single subscription identified by subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -912,7 +912,7 @@ GET individual NSD Management Subscription with invalid resource identifier
     Log    Trying to perform a request on a subscriptionID which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -920,7 +920,7 @@ Send Delete request for individual NSD Management Subscription
     Log    Trying to perform a DELETE on a subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -933,31 +933,31 @@ Send Delete request for individual NSD Management Subscription with invalid reso
     Log    Trying to perform a DELETE on a subscriptionId which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual NSD Management Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for individual NSD Management Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Send Patch request for individual NSD Management Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -996,7 +996,7 @@ Check HTTP Response Header Contain Link
 Check PostCondition GET Individual Network Service Descriptor Information
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
     Should Be Equal As Strings     ${response['status']}    200
     
 Wait for individual grant successful notification
@@ -1006,7 +1006,7 @@ Get single file NSD in Plain Format
     Log    Trying to get a NSD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1014,7 +1014,7 @@ Get NSD in Zip Format
     Log    Trying to get a NSD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1023,7 +1023,7 @@ Get single file NSD in Plain or Zip Format
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1032,7 +1032,7 @@ Get multi file NSD in Plain or Zip Format
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1040,7 +1040,7 @@ Get multi file NSD in Plain Format
     Log    Trying to get a negative case performing a get on a NSD present in the NFVO Catalogue. Accept will be text/plain but NSD is composed my multiple files.
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1049,7 +1049,7 @@ Get NSD with invalid resource identifier
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${erroneous_nsdInfoId}/nsd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${erroneous_nsdInfoId}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1058,7 +1058,7 @@ Get NSD with conflict due to onboarding state
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}/nsd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -1066,7 +1066,7 @@ Send POST Request for NSD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a POST. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1074,7 +1074,7 @@ Send PUT Request for NSD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1082,7 +1082,7 @@ Send PATCH Request for NSD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1090,7 +1090,7 @@ Send DELETE Request for NSD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -1098,14 +1098,14 @@ Get NSD with security information
     Log    Trying to get a NSD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd/include_signatures
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Get NSD Archive Manifest
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdPlain}/manifest
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdPlain}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1113,7 +1113,7 @@ Get NSD Archive Manifest with security information
     Log    Trying to get a NSD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest/include_signatures
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1122,7 +1122,7 @@ Get NSD Archive Manifest with conflict due to onboarding state
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}/manifest
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1130,7 +1130,7 @@ Send POST Request for NSD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a POST. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1138,7 +1138,7 @@ Send PUT Request for NSD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1146,7 +1146,7 @@ Send PATCH Request for NSD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1154,7 +1154,7 @@ Send DELETE Request for NSD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -1162,7 +1162,7 @@ Get single file PNFD in Plain Format
     Log    Trying to get a PNFD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1170,7 +1170,7 @@ Get PNFD in Zip Format
     Log    Trying to get a PNFD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1179,7 +1179,7 @@ Get single file PNFD in Plain or Zip Format
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1188,7 +1188,7 @@ Get multi file PNFD in Plain or Zip Format
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1196,7 +1196,7 @@ Get multi file PNFD in Plain Format
     Log    Trying to get a negative case performing a get on a PNFD present in the NFVO Catalogue. Accept will be text/plain but PNFD is composed my multiple files.
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1205,7 +1205,7 @@ Get PNFD with invalid resource identifier
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${erroneous_PNFDInfoId}/pnfd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${erroneous_PNFDInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1214,7 +1214,7 @@ Get PNFD with conflict due to onboarding state
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${onboardingStatePnfdId}/pnfd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${onboardingStatePnfdId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -1222,7 +1222,7 @@ Get PNFD with security information
     Log    Trying to get a PNFD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd/include_signatures
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1230,7 +1230,7 @@ Send POST Request for PNFD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a POST. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1238,7 +1238,7 @@ Send PUT Request for PNFD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1246,7 +1246,7 @@ Send PATCH Request for PNFD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1254,14 +1254,14 @@ Send DELETE Request for PNFD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
 Get PNFD Archive Manifest
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1269,7 +1269,7 @@ Get PNFD Archive Manifest with security information
     Log    Trying to get a PNFD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest/include_signatures
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1278,7 +1278,7 @@ Get PNFD Archive Manifest with conflict due to onboarding state
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}/manifest
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1286,7 +1286,7 @@ Send POST Request for PNFD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a POST. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1294,7 +1294,7 @@ Send PUT Request for PNFD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1302,7 +1302,7 @@ Send PATCH Request for PNFD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1310,6 +1310,6 @@ Send DELETE Request for PNFD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 38977de8b..e32dacda4 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -15,7 +15,7 @@ Get all VNF Packages
     Log    Trying to get all VNF Packages present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
 
@@ -47,7 +47,7 @@ GET VNF Packages with attribute-based filter
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?${POS_FILTER}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?${POS_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -62,7 +62,7 @@ GET VNF Packages with invalid attribute-based filter
     Log    Trying to perform a negative get, filtering by the inexistent filter 'nfvId'
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?${NEG_FILTER}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?${NEG_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -72,7 +72,7 @@ Get all VNF Packages with malformed authorization token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Authorization": "${BAD_AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -81,7 +81,7 @@ Get all VNF Packages without authorization token
     Log    The GET method queries omitting token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -89,7 +89,7 @@ GET VNF Packages with all_fields attribute selector
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?all_fields
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?all_fields
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
    
@@ -110,7 +110,7 @@ GET VNF Packages with exclude_default attribute selector
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using exclude_default filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?exclude_default   
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?exclude_default   
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -129,7 +129,7 @@ GET VNF Packages with fields attribute selector
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?fields=${fields}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -148,7 +148,7 @@ GET VNF Packages with exclude_fields attribute selector
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?exclude_fields=${fields}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -166,7 +166,7 @@ GET all VNF Packages with invalid resource endpoint
     Log    Trying to perform a GET on a erroneous URI
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -176,7 +176,7 @@ Send Post Request to create new VNF Package Resource
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${body}=    Get File    jsons/CreateVnfPkgInfoRequest.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages    ${body}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -184,7 +184,7 @@ Check Postcondition VNF Package Resource Exists
     Log    Checking that nsd info exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${response['body']['id']}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
@@ -194,7 +194,7 @@ Send PUT Request for all VNF Packages
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -202,7 +202,7 @@ Send PATCH Request for all VNF Packages
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -210,7 +210,7 @@ Send DELETE Request for all VNF Packages
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -218,7 +218,7 @@ GET Individual VNF Package
     Log    Trying to get a VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -231,7 +231,7 @@ GET Individual VNF Package with invalid resource identifier
     Log    Trying to perform a negative get, using wrong authorization bearer
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPackageId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -239,7 +239,7 @@ Send POST Request for individual VNF Package
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -247,7 +247,7 @@ Send PUT Request for individual VNF Package
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
@@ -257,7 +257,7 @@ Send PATCH to disable Individual VNF Package
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${body}=    Get File    jsons/VnfPkgInfoModificationsDisabled.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}    ${body}
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -272,7 +272,7 @@ Send PATCH to enable Individual VNF Package
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${body}=    Get File    jsons/VnfPkgInfoModifications.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}    ${body}
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -280,21 +280,21 @@ Send DELETE Request for individual VNF Package
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${disabledVnfPackageId}
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${disabledVnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Check Postcondition VNF Package is Deleted
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${disabledVnfPackageId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${disabledVnfPackageId}
     Integer    response status    404
 
 Send DELETE Request for Individual VNF Package in operational state ENABLED
     Log    Trying to perform a DELETE nsdInfo in ENABLED operational state
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -306,7 +306,7 @@ Send DELETE Request for Individual VNF Package used for instantiated VNF instanc
     Log    Trying to perform a DELETE nsdInfo in ENABLED operational state
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${instantiatedVnfPackageId}
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${instantiatedVnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -314,7 +314,7 @@ Get VNFD in Individual VNF Package in Zip Format
     Log    Trying to get a VNFD from a given VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -322,7 +322,7 @@ Get VNFD in Individual VNF Package with security information
     Log    Trying to get a VNFD from a given VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd/include_signatures
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -334,7 +334,7 @@ Get multi file VNFD in Individual VNF Package in Plain Format
     Log    Trying to get a negative case performing a get on a VNFD from a given VNF Package present in the NFVO Catalogue. Accept will be text/plain but VNFD is composed my multiple files.
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -343,7 +343,7 @@ Get VNFD in Individual VNF Package with invalid resource identifier
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}/vnfd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -352,7 +352,7 @@ Get VNFD in Individual VNF Package with conflict due to onboarding state
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/vnfd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -360,7 +360,7 @@ Send POST Request for VNFD in individual VNF Package
     Log    Trying to perform a POST. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/vnfd
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -368,7 +368,7 @@ Send PUT Request for VNFD in individual VNF Package
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/vnfd
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -376,7 +376,7 @@ Send PATCH Request for VNFD in individual VNF Package
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/vnfd
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -384,7 +384,7 @@ Send DELETE Request for VNFD in individual VNF Package
     Log    Trying to perform a DELETE. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -392,7 +392,7 @@ GET Individual VNF Package Content
     Log    Trying to get a VNF Package Content
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -406,7 +406,7 @@ GET Individual VNF Package Content with Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -428,7 +428,7 @@ GET Individual VNF Package Content with invalid Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -436,7 +436,7 @@ GET Individual VNF Package Content with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}/package_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -444,7 +444,7 @@ GET Content for VNF Package in onboarding state different from ONBOARDED
     Log    Trying to get a VNF Package content present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/package_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -452,7 +452,7 @@ Send POST Request for individual VNF Package Content
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -460,7 +460,7 @@ Send PUT Request for individual VNF Package Content
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -478,7 +478,7 @@ Check Postcondition VNF Package Content is uploaded and available in the NFVO
     Log    Trying to get a VNF Package Content
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${newVnfPackageId}/package_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${newVnfPackageId}/package_content
     Integer    response status    200
  
 Send PUT Request to upload VNF Package Content with conflict due to onboarding state
@@ -494,7 +494,7 @@ Send PATCH Request for individual VNF Package Content
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -502,21 +502,21 @@ Send DELETE Request for individual VNF Package Content
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 GET Individual VNF Package Artifact
     Log    Trying to get a VNF Package Artifact
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 GET Individual VNF Package Artifact in octet stream format  
     Log    Trying to get a VNF Package Artifact
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageOctetStreamId}/artifacts/${artifactPath}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageOctetStreamId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -525,7 +525,7 @@ GET Individual VNF Package Artifact with Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -535,21 +535,21 @@ GET Individual VNF Package Artifact with invalid Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
 GET Individual VNF Package Artifact with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}/artifacts/${artifactPath}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 GET Artifact for VNF Package in onboarding state different from ONBOARDED
     Log    Trying to get a VNF Package artifact present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/artifacts/${artifactPath}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -557,7 +557,7 @@ Send POST Request for individual VNF Package Artifact
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -565,7 +565,7 @@ Send PUT Request for individual VNF Package Artifact
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
@@ -573,7 +573,7 @@ Send PATCH Request for individual VNF Package Artifact
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -581,7 +581,7 @@ Send DELETE Request for individual VNF Package Artifact
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -591,7 +591,7 @@ Send POST Request to upload VNF Package Content from URI
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/UploadVnfPkgFromUriRequest.json
     ${body}=        Format String   ${template}     vnfPkgUri=${vnfPkgUri}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri    ${body}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -601,7 +601,7 @@ Send POST Request to upload VNF Package Content from URI with conflict due to on
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/UploadVnfPkgFromUriRequest.json
     ${body}=        Format String   ${template}     vnfPkgUri=${vnfPkgUri}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${creatingVnfPkgViaUriId}/package_content/upload_from_uri    ${body}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${creatingVnfPkgViaUriId}/package_content/upload_from_uri    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -609,7 +609,7 @@ Send GET Request for individual VNF Package Content from URI
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -617,7 +617,7 @@ Send PUT Request for individual VNF Package Content from URI
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -625,7 +625,7 @@ Send PATCH Request for individual VNF Package Content from URI
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -633,7 +633,7 @@ Send DELETE Request for individual VNF Package Content from URI
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -641,7 +641,7 @@ Get all VNF Package Subscriptions
     Log    Trying to get the list of subscriptions
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -649,7 +649,7 @@ Get VNF Package Subscriptions with attribute-based filters
     Log    Trying to get the list of subscriptions using filters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ok}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ok}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}    
 
@@ -657,7 +657,7 @@ Get VNF Package Subscriptions with invalid attribute-based filters
     Log    Trying to get the list of subscriptions using filters with wrong attribute name
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ko}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ko}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -665,7 +665,7 @@ Get VNF Package Subscriptions with invalid resource endpoint
     Log    Trying to perform a request on a Uri which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -676,7 +676,7 @@ Send Post Request for VNF Package Subscription
     ${template}=    Get File    jsons/subscriptions.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1
@@ -689,7 +689,7 @@ Send Post Request for Duplicated VNF Package Subscription
     ${template}=    Get File    jsons/subscriptions.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -697,7 +697,7 @@ Send Put Request for VNF Package Subscriptions
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -705,7 +705,7 @@ Send Patch Request for VNF Package Subscriptions
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -713,7 +713,7 @@ Send Delete Request for VNF Package Subscriptions
     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": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}    
 
@@ -732,9 +732,9 @@ Check Postcondition VNF Package Subscription Is Set
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Run Keyword If    ${location} == Location
-    ...    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
+    ...    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
     Run Keyword If    ${location} == Location
-    ...    GET    ${response['headers']['Location']}  
+    ...    REST.GET    ${response['headers']['Location']}  
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
@@ -742,7 +742,7 @@ Check Postcondition VNF Package Subscription Is Set
 Check Postcondition Subscription Resource Returned in Location Header Is Available
     Log    Going to check postcondition
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${response['headers']['Location']}
+    REST.GET    ${response['headers']['Location']}
     Integer    response status    200
     Log    Received a 200 OK as expected
     ${contentType}=    Output    response headers Content-Type
@@ -760,7 +760,7 @@ Get Individual VNF Package Subscription
     Log    Trying to get a single subscription identified by subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -768,7 +768,7 @@ GET individual VNF Package Subscription with invalid resource identifier
     Log    Trying to perform a request on a subscriptionID which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -776,7 +776,7 @@ Send Delete request for individual VNF Package Subscription
     Log    Trying to perform a DELETE on a subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -789,31 +789,31 @@ Send Delete request for individual VNF Package Subscription with invalid resourc
     Log    Trying to perform a DELETE on a subscriptionId which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual VNF Package Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for individual VNF Package Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Send Patch request for individual VNF Package Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
    
@@ -829,7 +829,7 @@ Check Postcondition VNF Package Subscription is not Created
     Log    Trying to get a new subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    404
@@ -863,7 +863,7 @@ Check HTTP Response Body Subscription Identifier matches the requested Subscript
     Log    Subscription identifier as expected
 
 Check Notification Endpoint
-    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}    
+    &{notification_request}=  Create Mock Request Matcher	REST.GET  ${callback_endpoint}    
     &{headers} =	Create Dictionary	Content-Type=application/json
     &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
@@ -892,7 +892,7 @@ Check HTTP Response Header Contains Location
 
 Get access configuration information for external artifacts
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -900,7 +900,7 @@ Send PUT Request to access configuration information for external artifacts
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${body}=  Get File     jsons/ExternalArtifactsAccessConfig.json
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access    ${body}
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -914,7 +914,7 @@ Send POST Request for access configuration for external artifacts
     Log    Trying to perform a POST. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -922,7 +922,7 @@ Send PATCH Request for access configuration for external artifacts
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -930,14 +930,14 @@ Send DELETE Request for Access configuration for external artifacts
     Log    Trying to perform a DELETE. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Get Manifest in Individual VNF Package in plainFormat
         Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -945,14 +945,14 @@ Get Manifest in Individual VNF Package with security information
     Log    Trying to get a manifest from a given VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest/include_signatures
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Get Manifest in Individual VNF Package with unacceptable request
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest/include_signatures
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -960,7 +960,7 @@ Send POST Request for manifest in individual VNF Package
     Log    Trying to perform a POST. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -968,7 +968,7 @@ Send PUT Request for manifest in individual VNF Package
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -976,7 +976,7 @@ Send PATCH Request for manifest in individual VNF Package
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -984,7 +984,7 @@ Send DELETE Request for manifest in individual VNF Package
     Log    Trying to perform a DELETE. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -992,7 +992,7 @@ Get Artifact in VNF Package
     Log    Trying to get Artifact in VNF Package
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1000,7 +1000,7 @@ Get Artifact in VNF Package with exclude_all_mano_artifacts parameter
     Log    Trying to get Artifact in VNF Package with exclude_all_mano_artifacts
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_mano_artifacts
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_mano_artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1008,7 +1008,7 @@ Get Artifact in VNF Package with exclude_all_non_mano_artifacts parameter
     Log    Trying to get Artifact in VNF Package with security certificates
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1017,7 +1017,7 @@ Get Artifact in VNF Package with select_non_mano_artifact_sets parameter
     Pass Execution If    ${NFVO_non-MANO_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/select_non_mano_artifact_sets=${non_mano_artifact_sets}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/select_non_mano_artifact_sets=${non_mano_artifact_sets}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1025,7 +1025,7 @@ Get Artifact in VNF Package with include_signatures parameter
     Log    Trying to get Artifact in VNF Package with security certificates
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/include_signatures
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1034,7 +1034,7 @@ Get Artifact in VNF Package with Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1042,7 +1042,7 @@ Get Artifact in VNF Package with exclude_all_non_mano_artifacts and select_non_m
     Log    Trying to get Artifact in VNF Package 
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&select_non_mano_artifact_sets=${non_mano_artifact_sets}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&select_non_mano_artifact_sets=${non_mano_artifact_sets}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1050,14 +1050,14 @@ Get Artifact in VNF Package with exclude_all_non_mano_artifacts and exclude_all_
     Log    Trying to get Artifact in VNF Package 
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&exclude_all_non_mano_artifacts
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&exclude_all_non_mano_artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 GET Artifact of VNF Package in onboarding state different from ONBOARDED
     Log    Trying to get a VNF Package artifact present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/artifacts
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1067,7 +1067,7 @@ GET VNF Package Artifact with invalid Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1075,7 +1075,7 @@ Send POST Request for VNF Package Artifact
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1083,7 +1083,7 @@ Send PUT Request for VNF Package Artifact
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
@@ -1091,7 +1091,7 @@ Send PATCH Request for VNF Package Artifact
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1099,6 +1099,6 @@ Send DELETE Request for VNF Package Artifact
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
\ No newline at end of file
+    Set Suite Variable    ${response}    ${output}
-- 
GitLab


From ea0aeb15c39629910ffcfa35bcec7451a3292c88 Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Fri, 8 Jan 2021 17:18:01 +0100
Subject: [PATCH 229/322] Fix on dockerFile

---
 requirements.txt          |  3 +--
 scripts/docker/Dockerfile | 17 ++++++-----------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index f6c9c6d5d..bafc102d3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,3 @@
-###### List of required python libraries ######
 ## To install the libraries, use:
 # pip -r requirements.txt
 
@@ -8,5 +7,5 @@ RESTinstance==1.0.0rc4
 robotframework-dependencylibrary==1.0.0.post1
 robotframework-jsonlibrary==0.3
 robotframework-jsonschemalibrary==1.0
-robotframework-mockserver==0.0.4
+robotframework-mockserver==0.0.7
 robotframework-requests==0.7.1
diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
index e6130d455..9f753df87 100644
--- a/scripts/docker/Dockerfile
+++ b/scripts/docker/Dockerfile
@@ -28,23 +28,13 @@ RUN DEBIAN_FRONTEND=noninteractive \
         && mkdir -p /home/etsi/dev/robot \
         && cd /home/etsi/dev/robot 
 
-RUN pip3 install robotframework
-
-RUN DEBIAN_FRONTEND=noninteractive \
-        && cd /home/etsi/dev/robot \
-	&& git clone https://github.com/etsi-cti-admin/robotframework-mockserver 
+#RUN pip3 install robotframework
 
 ADD requirements.txt /home/etsi/dev/robot/
 ADD extensions /home/etsi/dev/robot/extensions
 
 RUN ls /home/etsi/dev/robot
 
-RUN DEBIAN_FRONTEND=noninteractive \
-	&& cd /home/etsi/dev/robot \
-	&& pip3 install -r requirements.txt \
-	&& cd  robotframework-mockserver \
-	&& patch -p1 < ../extensions/mockserverlibrary.patch \
-	&& python3 -m pip install -e .
 
 RUN DEBIAN_FRONTED=noninteractive \
 	cd /home/etsi/dev/ \
@@ -54,6 +44,11 @@ RUN DEBIAN_FRONTED=noninteractive \
 	&& pip3 install -r requirements.txt \
 	&& python3 -m pip install -e .
 
+RUN DEBIAN_FRONTEND=noninteractive \
+	&& cd /home/etsi/dev/robot \
+	&& pip3 install -r requirements.txt
+
+
 ADD . /home/etsi/dev/robot
 
 RUN	chmod +x /home/etsi/dev/robot/scripts/*
-- 
GitLab


From 26dbefb4176078087f57dfbb3c39b5655450d78f Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Mon, 11 Jan 2021 15:28:53 +0100
Subject: [PATCH 230/322] Update requirements.txt

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 4255e98cb..bafc102d3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@
 # pip -r requirements.txt
 
 
-robotframework==3.2.2
+robotframework==3.1
 RESTinstance==1.0.0rc4
 robotframework-dependencylibrary==1.0.0.post1
 robotframework-jsonlibrary==0.3
-- 
GitLab


From f96f746f3b45e58c69832cd39dec78948cc97ab4 Mon Sep 17 00:00:00 2001
From: zafar <zafar@etsi.org>
Date: Thu, 14 Jan 2021 17:23:55 +0500
Subject: [PATCH 231/322] Reference descriptor YAMLs updated for both SOL001
 and SOL006

---
 .../reference_tst010_vnf_b_2vdu_SOL001.yaml   |  82 ++++----
 .../reference_tst010_vnf_b_2vdu_SOL006.yaml   | 185 +++++++++---------
 .../reference_tst010_vnf_b_2vdu_SOL001.yaml   |  82 ++++----
 .../reference_tst010_vnf_b_2vdu_SOL006.yaml   | 185 +++++++++---------
 .../environment/variables.txt                 |   2 +-
 5 files changed, 267 insertions(+), 269 deletions(-)

diff --git a/SOL005/NSLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml b/SOL005/NSLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
index 797d8bec3..e9159106a 100644
--- a/SOL005/NSLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
+++ b/SOL005/NSLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
@@ -15,44 +15,6 @@ topology_template:
       virtual_link_right:
         [right, virtual_link_right]
   node_templates:
-    VDU-B-1:
-      type: "tosca.nodes.nfv.Vdu.Compute"
-      properties:
-        name: "vdu-b-1-vcd"
-        descriptor: "Description of VDU-B-1"
-        vdu_profile:
-          min_number_of_instances: 1
-          max_number_of_instances: 2
-      capabilities:
-        virtual_compute:
-          properties:
-            virtual_memory:
-              virtual_mem_size: 4096
-              numa_enabled: false
-            virtual_cpu:
-              num_virtual_cpu: 2
-      requirements:
-        virtual_storage:
-        - "vdu-b-1-vsd"
-    VDU-B-2:
-      type: "tosca.nodes.nfv.Vdu.Compute"
-      properties:
-        name: "vdu-b-2-vcd"
-        descriptor: "Description of VDU-B-2"
-        vdu_profile:
-          min_number_of_instances: 1
-          max_number_of_instances: 4
-      capabilities:
-        virtual_compute:
-          properties:
-            virtual_memory:
-              virtual_mem_size: 6144
-              numa_enabled: false
-            virtual_cpu:
-              num_virtual_cpu: 2
-      requirements:
-        virtual_storage:
-        - "vdu-b-2-vsd"
     right:
       type: "tosca.nodes.nfv.VduCp"
       properties:
@@ -101,7 +63,7 @@ topology_template:
       requirements:
         - virtual_binding: VDU-B-2
         - virtual_link: internal_vl
-    vdu-b-1-vsd:
+    vdu_b_1_vsd:
       type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
       properties:
         virtual_block_storage_data:
@@ -122,14 +84,14 @@ topology_template:
         sw_image:
           type: "tosca.artifacts.nfv.SwImage"
           file: vdu-b-1.qcow2
-    vdu-b-1-vsd:
+    vdu_b_2_vsd:
       type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
       properties:
         virtual_block_storage_data:
           size_of_storage: 20
           rdma_enabled: false
         sw_image_data:
-          name: "vdu-b-1 image"
+          name: "vdu-b-2 image"
           version: "1.1"
           checksum: 
             algorithm: "sha-224"
@@ -166,3 +128,41 @@ topology_template:
                 implementation: terminate-example.yaml
               operate:
                 implementation: operate-example.yaml
+    VDU_B_1:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-1-vcd"
+        descriptor: "Description of VDU-B-1"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 2
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 4096
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-1-vsd"
+    VDU_B_2:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-2-vcd"
+        descriptor: "Description of VDU-B-2"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 4
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 6144
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-2-vsd"                
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml b/SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
index d033e5a2e..0ea9820f0 100644
--- a/SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
+++ b/SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
@@ -2,137 +2,136 @@ nfv:
   vnfd:
     - id: VNF-B-2vdu
       provider: ETSI TST WG
-      product-name: TST010 reference VNF-B with 2 VDUs
-      software-version: '2.2'
+      product_name: TST010 reference VNF-B with 2 VDUs
+      software_version: '2.2'
       version: '2.2'
-      vnfm-info: ETSI VNFM
+      vnfm_info: ETSI VNFM
       vdu:
-        id: vdu-b-1
-        name: VNF-B VDU 1
-        int-cpd:
-          - id: left
-            layer-protocol: ethernet
-          - id: management
-            layer-protocol: ethernet
-          - id: internal
-            layer-protocol: ethernet
-            int-virtual-link-desc: internal-vl
-        virtual-compute-desc: vdu-b-1-vcd
-        virtual-storage-desc: vdu-b-1-vsd
-        sw-image-desc: vdu-b-1-image
-      vdu:
-        id: vdu-b-2
-        name: VNF-B VDU 2
-        int-cpd:
-          - id: right
-            layer-protocol: ethernet
-          - id: management
-            layer-protocol: ethernet
-          - id: internal
-            layer-protocol: ethernet
-            int-virtual-link-desc: internal-vl
-        virtual-compute-desc: vdu-b-2-vcd
-        virtual-storage-desc: vdu-b-2-vsd
-        sw-image-desc: vdu-b-2-image
-      virtual-compute-desc:
+        - id: vdu-b-1
+          name: VNF-B VDU 1
+          int_cpd:
+           - id: left
+             layer_protocol: ethernet
+           - id: management
+             layer_protocol: ethernet
+           - id: internal
+             layer_protocol: ethernet
+             int_virtual_link_desc: internal-vl
+          virtual_compute_desc: vdu-b-1-vcd
+          virtual_storage_desc: vdu-b-1-vsd
+          sw_image_desc: vdu-b-1-image
+        - id: vdu-b-2
+          name: VNF-B VDU 2
+          int_cpd:
+           - id: right
+             layer_protocol: ethernet
+           - id: management
+             layer_protocol: ethernet
+           - id: internal
+             layer_protocol: ethernet
+             int_virtual_link_desc: internal-vl
+          virtual_compute_desc: vdu-b-2-vcd
+          virtual_storage_desc: vdu-b-2-vsd
+          sw_image_desc: vdu-b-2-image
+      virtual_compute_desc:
         id: vdu-b-1-vcd
-        virtual-memory:
+        virtual_memory:
           size: '4.0'
-        virtual-cpu:
-          num-virtual-cpu: '2'
-      virtual-storage-desc:
+        virtual_cpu:
+          num_virtual_cpu: '2'
+      virtual_storage_desc:
         id: vdu-b-1-vsd
-        type-of-storage: root-storage
-        size-of-storage: '0'
-      sw-image-desc:
+        type_of_storage: root-storage
+        size_of_storage: '0'
+      sw_image_desc:
         id: vdu-b-1-image
         name: VNF-B image
         version: '1.1'
         checksum:
           algorithm: sha-224
           hash: somehashfortst010
-        container-format: bare
-        disk-format: qcow2
-        min-disk: '1'
-        min-ram: '2.0'
+        container_format: bare
+        disk_format: qcow2
+        min_disk: '1'
+        min_ram: '2.0'
         size: '1'
         image: 'http://someurl.com/VNF-B.qcow2'
-      virtual-compute-desc:
+      virtual_compute_desc:
         id: vdu-b-2-vcd
-        virtual-memory:
+        virtual_memory:
           size: '6.0'
-        virtual-cpu:
-          num-virtual-cpu: '2'
-      virtual-storage-desc:
+        virtual_cpu:
+          num_virtual_cpu: '2'
+      virtual_storage_desc:
         id: vdu-b-2-vsd
-        type-of-storage: root-storage
-        size-of-storage: '0'
-      sw-image-desc:
+        type_of_storage: root-storage
+        size_of_storage: '0'
+      sw_image_desc:
         id: vdu-b-2-image
         name: VNF-B-2 image
         version: '1.1'
         checksum:
           algorithm: sha-224
           hash: somehashfortst010
-        container-format: bare
-        disk-format: qcow2
-        min-disk: '1'
-        min-ram: '2.0'
+        container_format: bare
+        disk_format: qcow2
+        min_disk: '1'
+        min_ram: '2.0'
         size: '1'
         image: 'http://someurl.com/VNF-B-2.qcow2'
-      int-virtual-link-desc:
+      int_virtual_link_desc:
         - id: internal-vl
           flavour:
             id: internal-vl-flavour
             qos:
               latency: '1'
-              packet-delay-variation: '1'
-              packet-loss-ratio: '0.05'
-          connectivity-type:
-            layer-protocol: ethernet     
-      ext-cpd:
+              packet_delay_variation: '1'
+              packet_loss_ratio: '0.05'
+          connectivity_type:
+            layer_protocol: ethernet     
+      ext_cpd:
         - id: ext-b-left
-          int-cpd:
-            vdu-id: vdu-b-1
+          int_cpd:
+            vdu_id: vdu-b-1
             cpd: left
-          layer-protocol: ethernet
+          layer_protocol: ethernet
         - id: management
-          int-cpd:
-            vdu-id: vdu-b-1
+          int_cpd:
+            vdu_id: vdu-b-1
             cpd: management
-          layer-protocol: ethernet
+          layer_protocol: ethernet
         - id: ext-b-right
-          int-cpd:
-            vdu-id: vdu-b-2
+          int_cpd:
+            vdu_id: vdu-b-2
             cpd: right
-          layer-protocol: ethernet
+          layer_protocol: ethernet
       df:
         id: normal
-        vdu-profile:
+        vdu_profile:
           - id: vdu-b-1
-            min-number-of-instances: '1'
-            max-number-of-instances: '2'
+            min_number_of_instances: '1'
+            max_number_of_instances: '2'
           - id: vdu-b-2
-            min-number-of-instances: '1'
-            max-number-of-instances: '4'          
-        instantiation-level:
+            min_number_of_instances: '1'
+            max_number_of_instances: '4'          
+        instantiation_level:
           - id: double
-            vdu-level:
-              - vdu-id: vdu-b-1
-                number-of-instances: '2'
-              - vdu-id: vdu-b-2
-                number-of-instances: '2'
+            vdu_level:
+              - vdu_id: vdu-b-1
+                number_of_instances: '2'
+              - vdu_id: vdu-b-2
+                number_of_instances: '2'
           - id: single
-            vdu-level:
-              - vdu-id: vdu-b-1
-                number-of-instances: '1'
-              - vdu-id: vdu-b-2
-                number-of-instances: '1'
-        default-instantiation-level: single
-        lcm-operations-configuration:
-          scale-vnf-to-level-op-config:
-            arbitrary-target-levels-supported: 'true'
-          terminate-vnf-op-config:
-            min-graceful-termination: '1'
-          operate-vnf-op-config:
-            min-graceful-stop-timeout: '1'
\ No newline at end of file
+            vdu_level:
+              - vdu_id: vdu-b-1
+                number_of_instances: '1'
+              - vdu_id: vdu-b-2
+                number_of_instances: '1'
+        default_instantiation_level: single
+        lcm_operations_configuration:
+          scale_vnf_to_level_op_config:
+            arbitrary_target_levels_supported: 'true'
+          terminate_vnf_op_config:
+            min_graceful_termination: '1'
+          operate_vnf_op_config:
+            min_graceful_stop_timeout: '1'
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml b/SOL005/VNFPackageManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
index 797d8bec3..e9159106a 100644
--- a/SOL005/VNFPackageManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
+++ b/SOL005/VNFPackageManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
@@ -15,44 +15,6 @@ topology_template:
       virtual_link_right:
         [right, virtual_link_right]
   node_templates:
-    VDU-B-1:
-      type: "tosca.nodes.nfv.Vdu.Compute"
-      properties:
-        name: "vdu-b-1-vcd"
-        descriptor: "Description of VDU-B-1"
-        vdu_profile:
-          min_number_of_instances: 1
-          max_number_of_instances: 2
-      capabilities:
-        virtual_compute:
-          properties:
-            virtual_memory:
-              virtual_mem_size: 4096
-              numa_enabled: false
-            virtual_cpu:
-              num_virtual_cpu: 2
-      requirements:
-        virtual_storage:
-        - "vdu-b-1-vsd"
-    VDU-B-2:
-      type: "tosca.nodes.nfv.Vdu.Compute"
-      properties:
-        name: "vdu-b-2-vcd"
-        descriptor: "Description of VDU-B-2"
-        vdu_profile:
-          min_number_of_instances: 1
-          max_number_of_instances: 4
-      capabilities:
-        virtual_compute:
-          properties:
-            virtual_memory:
-              virtual_mem_size: 6144
-              numa_enabled: false
-            virtual_cpu:
-              num_virtual_cpu: 2
-      requirements:
-        virtual_storage:
-        - "vdu-b-2-vsd"
     right:
       type: "tosca.nodes.nfv.VduCp"
       properties:
@@ -101,7 +63,7 @@ topology_template:
       requirements:
         - virtual_binding: VDU-B-2
         - virtual_link: internal_vl
-    vdu-b-1-vsd:
+    vdu_b_1_vsd:
       type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
       properties:
         virtual_block_storage_data:
@@ -122,14 +84,14 @@ topology_template:
         sw_image:
           type: "tosca.artifacts.nfv.SwImage"
           file: vdu-b-1.qcow2
-    vdu-b-1-vsd:
+    vdu_b_2_vsd:
       type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
       properties:
         virtual_block_storage_data:
           size_of_storage: 20
           rdma_enabled: false
         sw_image_data:
-          name: "vdu-b-1 image"
+          name: "vdu-b-2 image"
           version: "1.1"
           checksum: 
             algorithm: "sha-224"
@@ -166,3 +128,41 @@ topology_template:
                 implementation: terminate-example.yaml
               operate:
                 implementation: operate-example.yaml
+    VDU_B_1:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-1-vcd"
+        descriptor: "Description of VDU-B-1"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 2
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 4096
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-1-vsd"
+    VDU_B_2:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-2-vcd"
+        descriptor: "Description of VDU-B-2"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 4
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 6144
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-2-vsd"                
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml b/SOL005/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
index d033e5a2e..0ea9820f0 100644
--- a/SOL005/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
+++ b/SOL005/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
@@ -2,137 +2,136 @@ nfv:
   vnfd:
     - id: VNF-B-2vdu
       provider: ETSI TST WG
-      product-name: TST010 reference VNF-B with 2 VDUs
-      software-version: '2.2'
+      product_name: TST010 reference VNF-B with 2 VDUs
+      software_version: '2.2'
       version: '2.2'
-      vnfm-info: ETSI VNFM
+      vnfm_info: ETSI VNFM
       vdu:
-        id: vdu-b-1
-        name: VNF-B VDU 1
-        int-cpd:
-          - id: left
-            layer-protocol: ethernet
-          - id: management
-            layer-protocol: ethernet
-          - id: internal
-            layer-protocol: ethernet
-            int-virtual-link-desc: internal-vl
-        virtual-compute-desc: vdu-b-1-vcd
-        virtual-storage-desc: vdu-b-1-vsd
-        sw-image-desc: vdu-b-1-image
-      vdu:
-        id: vdu-b-2
-        name: VNF-B VDU 2
-        int-cpd:
-          - id: right
-            layer-protocol: ethernet
-          - id: management
-            layer-protocol: ethernet
-          - id: internal
-            layer-protocol: ethernet
-            int-virtual-link-desc: internal-vl
-        virtual-compute-desc: vdu-b-2-vcd
-        virtual-storage-desc: vdu-b-2-vsd
-        sw-image-desc: vdu-b-2-image
-      virtual-compute-desc:
+        - id: vdu-b-1
+          name: VNF-B VDU 1
+          int_cpd:
+           - id: left
+             layer_protocol: ethernet
+           - id: management
+             layer_protocol: ethernet
+           - id: internal
+             layer_protocol: ethernet
+             int_virtual_link_desc: internal-vl
+          virtual_compute_desc: vdu-b-1-vcd
+          virtual_storage_desc: vdu-b-1-vsd
+          sw_image_desc: vdu-b-1-image
+        - id: vdu-b-2
+          name: VNF-B VDU 2
+          int_cpd:
+           - id: right
+             layer_protocol: ethernet
+           - id: management
+             layer_protocol: ethernet
+           - id: internal
+             layer_protocol: ethernet
+             int_virtual_link_desc: internal-vl
+          virtual_compute_desc: vdu-b-2-vcd
+          virtual_storage_desc: vdu-b-2-vsd
+          sw_image_desc: vdu-b-2-image
+      virtual_compute_desc:
         id: vdu-b-1-vcd
-        virtual-memory:
+        virtual_memory:
           size: '4.0'
-        virtual-cpu:
-          num-virtual-cpu: '2'
-      virtual-storage-desc:
+        virtual_cpu:
+          num_virtual_cpu: '2'
+      virtual_storage_desc:
         id: vdu-b-1-vsd
-        type-of-storage: root-storage
-        size-of-storage: '0'
-      sw-image-desc:
+        type_of_storage: root-storage
+        size_of_storage: '0'
+      sw_image_desc:
         id: vdu-b-1-image
         name: VNF-B image
         version: '1.1'
         checksum:
           algorithm: sha-224
           hash: somehashfortst010
-        container-format: bare
-        disk-format: qcow2
-        min-disk: '1'
-        min-ram: '2.0'
+        container_format: bare
+        disk_format: qcow2
+        min_disk: '1'
+        min_ram: '2.0'
         size: '1'
         image: 'http://someurl.com/VNF-B.qcow2'
-      virtual-compute-desc:
+      virtual_compute_desc:
         id: vdu-b-2-vcd
-        virtual-memory:
+        virtual_memory:
           size: '6.0'
-        virtual-cpu:
-          num-virtual-cpu: '2'
-      virtual-storage-desc:
+        virtual_cpu:
+          num_virtual_cpu: '2'
+      virtual_storage_desc:
         id: vdu-b-2-vsd
-        type-of-storage: root-storage
-        size-of-storage: '0'
-      sw-image-desc:
+        type_of_storage: root-storage
+        size_of_storage: '0'
+      sw_image_desc:
         id: vdu-b-2-image
         name: VNF-B-2 image
         version: '1.1'
         checksum:
           algorithm: sha-224
           hash: somehashfortst010
-        container-format: bare
-        disk-format: qcow2
-        min-disk: '1'
-        min-ram: '2.0'
+        container_format: bare
+        disk_format: qcow2
+        min_disk: '1'
+        min_ram: '2.0'
         size: '1'
         image: 'http://someurl.com/VNF-B-2.qcow2'
-      int-virtual-link-desc:
+      int_virtual_link_desc:
         - id: internal-vl
           flavour:
             id: internal-vl-flavour
             qos:
               latency: '1'
-              packet-delay-variation: '1'
-              packet-loss-ratio: '0.05'
-          connectivity-type:
-            layer-protocol: ethernet     
-      ext-cpd:
+              packet_delay_variation: '1'
+              packet_loss_ratio: '0.05'
+          connectivity_type:
+            layer_protocol: ethernet     
+      ext_cpd:
         - id: ext-b-left
-          int-cpd:
-            vdu-id: vdu-b-1
+          int_cpd:
+            vdu_id: vdu-b-1
             cpd: left
-          layer-protocol: ethernet
+          layer_protocol: ethernet
         - id: management
-          int-cpd:
-            vdu-id: vdu-b-1
+          int_cpd:
+            vdu_id: vdu-b-1
             cpd: management
-          layer-protocol: ethernet
+          layer_protocol: ethernet
         - id: ext-b-right
-          int-cpd:
-            vdu-id: vdu-b-2
+          int_cpd:
+            vdu_id: vdu-b-2
             cpd: right
-          layer-protocol: ethernet
+          layer_protocol: ethernet
       df:
         id: normal
-        vdu-profile:
+        vdu_profile:
           - id: vdu-b-1
-            min-number-of-instances: '1'
-            max-number-of-instances: '2'
+            min_number_of_instances: '1'
+            max_number_of_instances: '2'
           - id: vdu-b-2
-            min-number-of-instances: '1'
-            max-number-of-instances: '4'          
-        instantiation-level:
+            min_number_of_instances: '1'
+            max_number_of_instances: '4'          
+        instantiation_level:
           - id: double
-            vdu-level:
-              - vdu-id: vdu-b-1
-                number-of-instances: '2'
-              - vdu-id: vdu-b-2
-                number-of-instances: '2'
+            vdu_level:
+              - vdu_id: vdu-b-1
+                number_of_instances: '2'
+              - vdu_id: vdu-b-2
+                number_of_instances: '2'
           - id: single
-            vdu-level:
-              - vdu-id: vdu-b-1
-                number-of-instances: '1'
-              - vdu-id: vdu-b-2
-                number-of-instances: '1'
-        default-instantiation-level: single
-        lcm-operations-configuration:
-          scale-vnf-to-level-op-config:
-            arbitrary-target-levels-supported: 'true'
-          terminate-vnf-op-config:
-            min-graceful-termination: '1'
-          operate-vnf-op-config:
-            min-graceful-stop-timeout: '1'
\ No newline at end of file
+            vdu_level:
+              - vdu_id: vdu-b-1
+                number_of_instances: '1'
+              - vdu_id: vdu-b-2
+                number_of_instances: '1'
+        default_instantiation_level: single
+        lcm_operations_configuration:
+          scale_vnf_to_level_op_config:
+            arbitrary_target_levels_supported: 'true'
+          terminate_vnf_op_config:
+            min_graceful_termination: '1'
+          operate_vnf_op_config:
+            min_graceful_stop_timeout: '1'
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/environment/variables.txt b/SOL005/VNFPackageManagement-API/environment/variables.txt
index 82d338955..22b71fb75 100644
--- a/SOL005/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFPackageManagement-API/environment/variables.txt
@@ -88,7 +88,7 @@ ${callbackResp}    127.0.0.1
 
 ${descriptorType}    SOL001
 ${vnfKey}    {}
-${check_descriptors}	1
+${check_descriptors}	1    # If True test suite will validate VNF/NS descriptors  
 
 ${descriptor_id}	
 ${provider}	
-- 
GitLab


From ba31126dcde29e2b2e2114a5f5571f027fbdde1d Mon Sep 17 00:00:00 2001
From: zafar <zafar@etsi.org>
Date: Thu, 14 Jan 2021 20:06:24 +0500
Subject: [PATCH 232/322] SOL001 & SOL006 Descriptor parsing and checking
 updated for VNFPackageManagement & NS-LCM APIs

---
 .../NSLCMOperationKeywords.robot              | 198 ++++++++++------
 .../NotificationConsumer.robot                |   9 +-
 .../environment/variables.txt                 |  33 ++-
 .../NotificationConsumer.robot                |   8 +-
 .../VNFPackageManagementKeywords.robot        | 220 +++++++++++-------
 .../environment/variables.txt                 |  32 ++-
 6 files changed, 319 insertions(+), 181 deletions(-)

diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index c7d01465b..c18055e35 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -8,6 +8,7 @@ Library    OperatingSystem
 Library    MockServerLibrary
 Library    Collections
 Library    String
+Variables  descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
 Variables  descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
 
 
@@ -228,55 +229,139 @@ Check HTTP Response Body NsInstance content against VNF Descriptor
     Run Keyword If    ${check_descriptors} == 1    Check Individual NsInstance Content
 
 Check Individual NsInstance Content    
-    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001    ELSE    Parse SOL006
-
-Parse SOL001
-    Get key for VNF Descriptor
+    PARSE the Descriptor File
+    Match the Response Attributes with Descriptors
     
-    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
-    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
-    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
-    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
-    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
-    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
+PARSE the Descriptor File
+    Run Keyword If  '${descriptorType}'=='SOL001'    Fetch Information from SOL001 descriptor file    ELSE    Fetch Information from SOL006 descriptor file
     
-    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfdId']}    ${descriptor_id}
-    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfProvider']}    ${provider}
-    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfProductName']}    ${product_name}
-    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfSoftwareVesion']}    ${software_version}
-    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfdVersion']}    ${descriptor_version}
-    Should Be Equal As Strings    ${response['body']['vnfInstance']['instantiatedVnfInfo']['flavourId']}    ${flavour_id}
+Fetch Information from SOL001 descriptor file
+    @{VDU_labels}=    Create List
+    @{VNF_labels}=    Create List
+    @{VirtualLink_labels}=    Create List
+    @{CP_labels}=    Create List
+    @{Storage_labels}=    Create List
+    FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
+        ${key_type}=    Get Variable Value    ${topology_template.node_templates.${key}.type}
+        ${VDU_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}   ${tosca_type_VDU_compute}
+        ${VNF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_VNF}
+        ${Link_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_virtual_link}
+        ${VDUcp_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_VDU_cp}
+        ${Storage_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_storage}
+        Run Keyword If    ${VDU_check}    Append To List    ${VDU_labels}    ${key}
+        Run Keyword If    ${VNF_check}    Append To List    ${VNF_labels}    ${key}
+        Run Keyword If    ${VNF_check}    Get VNF Attributes from SOL001    ${key}            
+        Run Keyword If    ${Link_check}    Append To List    ${VirtualLink_labels}    ${key}
+        Run Keyword If    ${VDUcp_check}    Append To List    ${CP_labels}    ${key}
+        Run Keyword If    ${Storage_check}    Append To List    ${Storage_labels}    ${key}
+    END
+    Set Global Variable    @{VDU_IDs}    @{VDU_labels}
+    Set Global Variable    @{VNF_IDs}    @{VNF_labels}
+    Set Global Variable    @{VirtualLink_IDs}    @{VirtualLink_labels}
+    Set Global Variable    @{CP_IDs}    @{CP_labels}
+    Set Global Variable    @{Storage_IDs}    @{Storage_labels}
+
+Get VNF Attributes from SOL001
+    [Arguments]    ${VNF_label}
+    ${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}
+    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.software_version}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.descriptor_version}
+    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.flavour_id}
     
-Parse SOL006
-     ${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}
-     ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
-     ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}
-     ${external_cp}=    Get Variable Value    ${nfv.vnfd[0].ext-cpd[0].id}
-     ${vdu_id}=    Get Variable Value    ${nfv.vnfd[0].vdu[0].id}
-     ${vdu_cpid}=    Get Variable Value    ${nfv.vnfd[0].vdu[0].int-cpd[2].id} 
-     ${virtual_storage}=    Get Variable Value    ${nfv.vnfd[0].virtual-storage-desc.id}
-     ${virtual_link}=    Get Variable Value    ${nfv.vnfd[0].int-virtual-link-desc.id}
+    Set Global Variable    ${Descriptor_ID}    ${descriptor_id}
+    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    ${Flavour_ID}    ${flavour_id}
 
-    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfdId']}    ${descriptor_id}
-    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfProvider']}    ${provider}
-    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfProductName']}    ${product_name}
-    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfSoftwareVesion']}    ${software_version}
-    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfdVersion']}    ${descriptor_version}
-    Should Be Equal As Strings    ${response['body']['vnfInstance']['instantiatedVnfInfo']['extCpInfo']['cpdId']}    ${external_cp}
-    Should Be Equal As Strings    ${response['body']['vnfInstance']['instantiatedVnfInfo']['vnfcResourceInfo']['vduId']}    ${vdu_id}
-    Should Be Equal As Strings    ${response['body']['vnfInstance']['instantiatedVnfInfo']['extCpInfo']['cpdId']}    ${vdu_cpid}
-    Should Be Equal As Strings    ${response['body']['vnfInstance']['instantiatedVnfInfo']['virtualStorageResourceInfo']['virtualStorageDescId']}    ${virtual_storage}
-    Should Be Equal As Strings    ${response['body']['vnfInstance']['instantiatedVnfInfo']['extManagedVirtualLinkInfo']['vnfVirtualLinkDescId']}    ${virtual_link}
+Fetch Information from SOL006 descriptor file
+    ${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}
+    ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
+    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}    
+    ${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}
+    ${instantiation_levels}=    Get Length    ${nfv.vnfd[0].df.instantiation_level}    
+    FOR    ${key}    IN    @{nfv.vnfd[0].keys()}
+        ${VDU_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    vdu
+        Run Keyword If    ${VDU_check}    Get VDU IDs    ${VDUcount}
+        ${extCP_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    ext_cpd
+        Run Keyword If    ${extCP_check}    Get External CP IDs    ${extCP_count}
+        ${virtualLink_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    int_virtual_link_desc
+        Run Keyword If    ${virtualLink_check}    Get Virtual Link IDs   ${virtualLink_count}    
+        ${DF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    df
+        Run Keyword If    ${DF_check}    Get Instantiation Levels    ${instantiation_levels}    
+    END
+    Set Global Variable    ${Descriptor_ID}    ${descriptor_id}
+    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}
 
+Get VDU IDs
+    [Arguments]    ${count}    
+    @{VDU_labels}=    Create List
+    ${Storage_labels}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${VDU_labels}    ${nfv.vnfd[0].vdu[${i}].id}
+        Append To List    ${Storage_labels}    ${nfv.vnfd[0].vdu[${i}].virtual_storage_desc} 
+        Get Internal CPs for each VDU    ${i}   
+    END
+    Set Global Variable    ${VDU_IDs}    ${VDU_labels}
+    Set Global Variable    ${Storage_IDs}    ${Storage_labels}
+            
+Get Internal CPs for each VDU
+    [Arguments]    ${vdu}
+    ${count}=    Get Length    ${nfv.vnfd[0].vdu[${vdu}].int_cpd}    
+    ${internal_CPs}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${internal_CPs}    ${nfv.vnfd[0].vdu[${vdu}].int_cpd[${i}].id} 
+    END
+    Set Global Variable    ${internalCP_IDs}    ${internal_CPs}
+    
+Get External CP IDs
+    [Arguments]    ${count}    
+    @{external_CPs}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${external_CPs}    ${nfv.vnfd[0].ext_cpd[${i}].id} 
+    END
+    Set Global Variable    ${externalCP_IDs}    ${external_CPs}
 
-Get key for VNF Descriptor
-    FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
-        Log    ${key}
-        ${check1}=    Run Keyword And Return Status    Should End With    ${key}    VNF
-        Run Keyword If     ${check1}     Set Global Variable    ${vnfKey}    ${key}   
+Get Virtual Link IDs
+    [Arguments]    ${count}    
+    ${VirtualLink_labels}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${VirtualLink_labels}    ${nfv.vnfd[0].int_virtual_link_desc[${i}].id} 
+    END
+    Set Global Variable    ${VirtualLink_IDs}    ${VirtualLink_labels}
+
+Get Instantiation Levels
+    [Arguments]    ${count}
+    @{Instantiation_Levels}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${Instantiation_Levels}    ${nfv.vnfd[0].df.instantiation_level[${i}].id} 
     END
+    Set Global Variable    ${InstantiationLevel_IDs}    ${Instantiation_Levels}
+
+Match the Response Attributes with Descriptors
+    #Checking Response attributes with VNF Descriptors
+    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfdId']}    ${Descriptor_ID}
+    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfProvider']}    ${Provider}
+    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfProductName']}    ${Product_Name}
+    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfSoftwareVesion']}    ${Software_Version}
+    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfdVersion']}    ${Descriptor_Version}
+    Should Be Equal As Strings    ${response['body']['vnfInstance']['instantiatedVnfInfo']['flavourId']}    ${Flavour_ID}
+    List Should Contain Value    ${VDU_IDs}    ${response['body']['vnfInstance']['instantiatedVnfInfo']['vnfcResourceInfo']['vduId']}        
+    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${externalCP_IDs}    ${response['body']['vnfInstance']['instantiatedVnfInfo']['extCpInfo']['cpdId']}
+    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${internalCP_IDs}    ${response['body']['vnfInstance']['instantiatedVnfInfo']['extCpInfo']['cpdId']}
+    Run Keyword If  '${descriptorType}'=='SOL001'    List Should Contain Value    @{CP_IDs}    ${response['body']['vnfInstance']['instantiatedVnfInfo']['extCpInfo']['cpdId']}
+    List Should Contain value    ${Storage_IDs}    ${response['body']['vnfInstance']['instantiatedVnfInfo']['virtualStorageResourceInfo']['virtualStorageDescId']}
+    List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['vnfInstance']['instantiatedVnfInfo']['extManagedVirtualLinkInfo']['vnfVirtualLinkDescId']}
 
 POST New nsInstance with DISABLED nsd
     Log    Create NS instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances
@@ -518,9 +603,9 @@ POST scale nsInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to NS Instance
+    Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File
     ${template}=    Get File    jsons/ScaleNs.json
-    ${body}=        Format String   ${template}     scaleType=${scaleType}   scaleTimeout=${scaleTimeout}   scaleVnfType=${scaleVnfType}   scaleGroupDescriptor=${scaleGroupDescriptor}   scaleMemberVnfIndex=${scaleMemberVnfIndex}    vnfInstantiationLevelId=${instantiationLevel_id}
+    ${body}=        Format String   ${template}     scaleType=${scaleType}   scaleTimeout=${scaleTimeout}   scaleVnfType=${scaleVnfType}   scaleGroupDescriptor=${scaleGroupDescriptor}   scaleMemberVnfIndex=${scaleMemberVnfIndex}    vnfInstantiationLevelId=${InstantiationLevel_IDs[0]}
 	Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/scale    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -564,33 +649,12 @@ POST Update NSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to NS Instance
+    Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File 
     ${template} =    Get File    jsons/UpdateNsRequest.json
-    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfFlavourId=${flavour_Id}    newFlavourId=${flavour_Id}    vnfVirtualLinkDescId=${virtualLink_id}    instantiationLevelId=${instantiationLevel_id}    vnfInstantiationLevelId=${instantiationLevel_id}    
+    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfFlavourId=${Flavour_ID}    newFlavourId=${Flavour_ID}    vnfVirtualLinkDescId=${VirtualLink_IDs[0]}    instantiationLevelId=${InstantiationLevel_IDs[1]}    vnfInstantiationLevelId=${InstantiationLevel_IDs[0]}    
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/update    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
-
-Add VNF Descriptor Content to NS Instance
-    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 NS Instance    ELSE    Parse SOL006 NS Instance
-   
-Parse SOL001 NS Instance
-    Get key for VNF Descriptor
-    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
-    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
-    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
-    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
-    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
-    ${flavour_Id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
-    
-Parse SOL006 NS Instance
-    ${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}
-    ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
-    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}
-    ${virtualLink_id}=    Get Variable Value    ${nfv.vnfd[0].int-virtual-link-desc.id}       
-    ${instantiationLevel_id}=    Get Variable Value    ${nfv.vnfd[0].df[0].instantiation-level[0].id}  
  
 DELETE Heal NSInstance
     log    Trying to Delete an Heal NS instance. This method should not be implemented
diff --git a/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot b/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot
index 546b10860..a76b3a899 100644
--- a/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot
+++ b/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot
@@ -66,16 +66,13 @@ Post Ns Lcm Operation Occurrence Notification
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to Notification
+    Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File
     ${template} =    Get File    jsons/NsLcmOperationOccurrenceNotification.json
-    ${body}=        Format String   ${template}    nsInstanceId=${nsInstanceId}    nsLcmOpOccId=${nsLcmOpOccId}    subscriptionId=${subscriptionId}    vnfdId=${descriptor_id}  
+    ${body}=        Format String   ${template}    nsInstanceId=${nsInstanceId}    nsLcmOpOccId=${nsLcmOpOccId}    subscriptionId=${subscriptionId}    vnfdId=${Descriptor_ID}  
     Post    ${callbackResp}    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
-	
-Add VNF Descriptor Content to Notification
-    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 NS Instance    ELSE    Parse SOL006 NS Instance
-	
+		
 Post Ns Identifier Creation Notification
     log    Trying to perform a POST to get notification
     Set Headers  {"Accept":"${ACCEPT}"}  
diff --git a/SOL005/NSLifecycleManagement-API/environment/variables.txt b/SOL005/NSLifecycleManagement-API/environment/variables.txt
index f13e6903c..f7346a6e5 100644
--- a/SOL005/NSLifecycleManagement-API/environment/variables.txt
+++ b/SOL005/NSLifecycleManagement-API/environment/variables.txt
@@ -78,16 +78,27 @@ ${json}    {"notificationStatus": ""}
 
 ${callbackResp}    127.0.0.1
 
-${descriptorType}    SOL001
-${vnfKey}    {}
-${check_descriptors}	1
+${check_descriptors}    1
+${descriptorType}    SOL006
 
-${descriptor_id}	
-${provider}	
-${product_name}    
-${software_version}    
-${descriptor_version}
-${flavour_id}
+${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute
+${tosca_type_VNF}    tosca.nodes.nfv.VNF
+${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
+${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
+${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage
+  
+@{VDU_IDs}
+@{VNF_IDs}
+@{virtualLink_IDs}
+@{CP_IDs}
+@{Storage_IDs}
+@{internalCP_IDs}
+@{externalCP_IDs}
+@{InstantiationLevel_IDs}
 
-${virtualLink_id}
-${instantiationLevel_id}
\ No newline at end of file
+${Descriptor_ID}
+${Provider}
+${Product_Name}
+${Software_Version}
+${Descriptor_Version}
+${Flavour_ID}
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/NotificationConsumer.robot b/SOL005/VNFPackageManagement-API/NotificationConsumer.robot
index d8a5f0087..62fd52bc1 100644
--- a/SOL005/VNFPackageManagement-API/NotificationConsumer.robot
+++ b/SOL005/VNFPackageManagement-API/NotificationConsumer.robot
@@ -53,9 +53,9 @@ Post VNF Package Onboarding Notification
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Package
+    Run Keyword If    ${check_descriptors} == 1    Parse the Descriptor File
     ${template} =    Get File    jsons/VnfPackageOnboardingNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPkgId=${vnfPkgId}    vnfdId=${descriptor_id}
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPkgId=${vnfPkgId}    vnfdId=${Descriptor_ID}
     Post    ${callbackResp}    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -65,9 +65,9 @@ Post VNF Package Change Notification
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Package
+    Run Keyword If    ${check_descriptors} == 1    Parse the Descriptor File
     ${template} =    Get File    jsons/VnfPackageChangeNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPkgId=${vnfPkgId}    vnfdId=${descriptor_id}
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPkgId=${vnfPkgId}    vnfdId=${Descriptor_ID}
     Post    ${callbackResp}    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index b1c600a40..6842187b1 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -8,8 +8,10 @@ Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_veri
 Library           Process
 Library           MockServerLibrary
 Library           String
+Library           Collections
+Library           String
 Variables         descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
-
+Variables         descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
 
 *** Keywords ***
 Get all VNF Packages
@@ -175,73 +177,143 @@ Send Post Request to create new VNF Package Resource
     Log    Creating a new VNF Package
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Package
     ${body} =    Get File    jsons/CreateVnfPkgInfoRequest.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
-
-Get key for VNF Descriptor
-    FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
-        Log    ${key}
-        ${check1}=    Run Keyword And Return Status    Should End With    ${key}    VNF
-        Run Keyword If     ${check1}     Set Global Variable    ${vnfKey}    ${key}   
-    END
     
-Add VNF Descriptor Content to VNF Package
-    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 VNF Package    ELSE    Parse SOL006 VNF Package
-
-Parse SOL001 VNF Package
-    Get key for VNF Descriptor
-    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
-    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
-    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
-    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
-    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
     
-Parse SOL006 VNF Package
-    ${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}
-    ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
-    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}     
-
 Check HTTP Response Body vnfPkginfo content against VNF Descriptor
     #${check_descriptors} flag, 1 to check descriptors
     Run Keyword If    ${check_descriptors} == 1    Check Individual VNFPkgInfo Content
-    
+
 Check Individual VNFPkgInfo Content    
-    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001    ELSE    Parse SOL006
-    
-Parse SOL001
-    Get key for VNF Descriptor
+    PARSE the Descriptor File
+    Match the Response Attributes of vnfPkgInfo with Descriptors
     
-    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
-    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
-    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
-    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
-    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
+PARSE the Descriptor File
+    Run Keyword If  '${descriptorType}'=='SOL001'    Fetch Information from SOL001 descriptor file    ELSE    Fetch Information from SOL006 descriptor file
     
-    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${descriptor_id}
-    Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${provider}
-    Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${product_name}
-    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}
-    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
+Fetch Information from SOL001 descriptor file
+    @{VDU_labels}=    Create List
+    @{VNF_labels}=    Create List
+    @{VirtualLink_labels}=    Create List
+    @{CP_labels}=    Create List
+    @{Storage_labels}=    Create List
+    FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
+        ${key_type}=    Get Variable Value    ${topology_template.node_templates.${key}.type}
+        ${VDU_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}   ${tosca_type_VDU_compute}
+        ${VNF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_VNF}
+        ${Link_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_virtual_link}
+        ${VDUcp_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_VDU_cp}
+        ${Storage_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_storage}
+        Run Keyword If    ${VDU_check}    Append To List    ${VDU_labels}    ${key}
+        Run Keyword If    ${VNF_check}    Append To List    ${VNF_labels}    ${key}
+        Run Keyword If    ${VNF_check}    Get VNF Attributes from SOL001    ${key}            
+        Run Keyword If    ${Link_check}    Append To List    ${VirtualLink_labels}    ${key}
+        Run Keyword If    ${VDUcp_check}    Append To List    ${CP_labels}    ${key}
+        Run Keyword If    ${Storage_check}    Append To List    ${Storage_labels}    ${key}
+    END
+    Set Global Variable    @{VDU_IDs}    @{VDU_labels}
+    Set Global Variable    @{VNF_IDs}    @{VNF_labels}
+    Set Global Variable    @{VirtualLink_IDs}    @{VirtualLink_labels}
+    Set Global Variable    @{CP_IDs}    @{CP_labels}
+    Set Global Variable    @{Storage_IDs}    @{Storage_labels}
+
+Get VNF Attributes from SOL001
+    [Arguments]    ${VNF_label}
+    ${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}
+    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.software_version}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.descriptor_version}
     
-Parse SOL006
-     ${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}
-     ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
-     ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}
-     
-    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${descriptor_id}
-    Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${provider}
-    Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${product_name}
-    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}
-    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
+    Set Global Variable    ${Descriptor_ID}    ${descriptor_id}
+    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}
+
+Fetch Information from SOL006 descriptor file
+    ${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}
+    ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
+    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}    
+    ${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}
+    ${instantiation_levels}=    Get Length    ${nfv.vnfd[0].df.instantiation_level}    
+    FOR    ${key}    IN    @{nfv.vnfd[0].keys()}
+        ${VDU_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    vdu
+        Run Keyword If    ${VDU_check}    Get VDU IDs    ${VDUcount}
+        ${extCP_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    ext_cpd
+        Run Keyword If    ${extCP_check}    Get External CP IDs    ${extCP_count}
+        ${virtualLink_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    int_virtual_link_desc
+        Run Keyword If    ${virtualLink_check}    Get Virtual Link IDs   ${virtualLink_count}    
+        ${DF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    df
+        Run Keyword If    ${DF_check}    Get Instantiation Levels    ${instantiation_levels}    
+    END
+    Set Global Variable    ${Descriptor_ID}    ${descriptor_id}
+    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}
+
+Get VDU IDs
+    [Arguments]    ${count}    
+    @{VDU_labels}=    Create List
+    ${Storage_labels}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${VDU_labels}    ${nfv.vnfd[0].vdu[${i}].id}
+        Append To List    ${Storage_labels}    ${nfv.vnfd[0].vdu[${i}].virtual_storage_desc} 
+        Get Internal CPs for each VDU    ${i}   
+    END
+    Set Global Variable    ${VDU_IDs}    ${VDU_labels}
+    Set Global Variable    ${Storage_IDs}    ${Storage_labels}
+            
+Get Internal CPs for each VDU
+    [Arguments]    ${vdu}
+    ${count}=    Get Length    ${nfv.vnfd[0].vdu[${vdu}].int_cpd}    
+    ${internal_CPs}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${internal_CPs}    ${nfv.vnfd[0].vdu[${vdu}].int_cpd[${i}].id} 
+    END
+    Set Global Variable    ${internalCP_IDs}    ${internal_CPs}
     
+Get External CP IDs
+    [Arguments]    ${count}    
+    @{external_CPs}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${external_CPs}    ${nfv.vnfd[0].ext_cpd[${i}].id} 
+    END
+    Set Global Variable    ${externalCP_IDs}    ${external_CPs}
+
+Get Virtual Link IDs
+    [Arguments]    ${count}    
+    ${VirtualLink_labels}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${VirtualLink_labels}    ${nfv.vnfd[0].int_virtual_link_desc[${i}].id} 
+    END
+    Set Global Variable    ${VirtualLink_IDs}    ${VirtualLink_labels}
+
+Get Instantiation Levels
+    [Arguments]    ${count}
+    @{Instantiation_Levels}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${Instantiation_Levels}    ${nfv.vnfd[0].df.instantiation_level[${i}].id} 
+    END
+    Set Global Variable    ${InstantiationLevel_IDs}    ${Instantiation_Levels}
+
+Match the Response Attributes of vnfPkgInfo with Descriptors
+    #Checking Response attributes with VNF Descriptors
+    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${Descriptor_Id}
+    Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${Provider}
+    Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${Product_Name}
+    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${Software_Version}
+    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${Descriptor_Version}
+
 Check Postcondition VNF Package Resource Exists
     Log    Checking that nsd info exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
@@ -735,9 +807,9 @@ Send Post Request for VNF Package Subscription
     Log    Trying to create a new subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Package
+    Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File
     ${template}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}    vnfdId=${descriptor_id}    vnfProvider=${provider}    vnfProductName=${product_name}    vnfSoftwareVersion=${software_version}    vnfdVersions=${descriptor_version}    
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}    vnfdId=${Descriptor_ID}    vnfProvider=${Provider}    vnfProductName=${Product_Name}    vnfSoftwareVersion=${Software_Version}    vnfdVersions=${Descriptor_Version}    
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
@@ -929,36 +1001,16 @@ Check HTTP Response Body PkgmSubscription content against VNF Descriptor
     #${check_descriptors} flag, 1 to check descriptors
     Run Keyword If    ${check_descriptors} == 1    Check Individual PkgmSubscription Content
 
-Check Individual PkgmSubscription Content    
-    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 for Subscription    ELSE    Parse SOL006 for Subscription
-
-Parse SOL001 for Subscription
-    Get key for VNF Descriptor
-    
-    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
-    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
-    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
-    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
-    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
-    
-    Should Be Equal As Strings    ${response['body']['filter']['vnfdId']}    ${descriptor_id}
-    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProvider']}    ${provider}
-    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['vnfProductName']}    ${product_name}
-    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['vnfProductName']['versions']['vnfSoftwareVersion']}    ${software_version}
-    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['vnfProductName']['versions']['vnfdVersion']}    ${descriptor_version}
+Check Individual PkgmSubscription Content
+    PARSE the Descriptor File
+    Match the Response Attributes of PkgmSubscription with Descriptors
     
-Parse SOL006 for Subscription
-     ${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}
-     ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
-     ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}
-     
-    Should Be Equal As Strings    ${response['body']['filter']['vnfdId']}    ${descriptor_id}
-    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProvider']}    ${provider}
-    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['vnfProductName']}    ${product_name}
-    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['vnfProductName']['versions']['vnfSoftwareVersion']}    ${software_version}
-    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['vnfProductName']['versions']['vnfdVersion']}    ${descriptor_version}
+Match the Response Attributes of PkgmSubscription with Descriptors
+    Should Be Equal As Strings    ${response['body']['filter']['vnfdId']}    ${Descriptor_ID}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProvider']}    ${Provider}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['vnfProductName']}    ${Product_Name}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['vnfProductName']['versions']['vnfSoftwareVersion']}    ${Software_Version}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['vnfProductName']['versions']['vnfdVersion']}    ${Descriptor_Version}
 
 Check Notification Endpoint
     &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}    
diff --git a/SOL005/VNFPackageManagement-API/environment/variables.txt b/SOL005/VNFPackageManagement-API/environment/variables.txt
index 22b71fb75..926a45ae2 100644
--- a/SOL005/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFPackageManagement-API/environment/variables.txt
@@ -86,12 +86,26 @@ ${NFVO_non-MANO_OK}    1    # If 1 means that non-MANO artifacts are supported b
 ${non_mano_artifact_sets} 
 ${callbackResp}    127.0.0.1
 
-${descriptorType}    SOL001
-${vnfKey}    {}
-${check_descriptors}	1    # If True test suite will validate VNF/NS descriptors  
-
-${descriptor_id}	
-${provider}	
-${product_name}    
-${software_version}    
-${descriptor_version}
\ No newline at end of file
+${check_descriptors}    1
+${descriptorType}    SOL006
+
+${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute
+${tosca_type_VNF}    tosca.nodes.nfv.VNF
+${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
+${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
+${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage
+  
+@{VDU_IDs}
+@{VNF_IDs}
+@{virtualLink_IDs}
+@{CP_IDs}
+@{Storage_IDs}
+@{internalCP_IDs}
+@{externalCP_IDs}
+@{InstantiationLevel_IDs}
+
+${Descriptor_ID}
+${Provider}
+${Product_Name}
+${Software_Version}
+${Descriptor_Version}
-- 
GitLab


From ad5297ca8ad07b952f3d1e7820db8a1622b4a8f2 Mon Sep 17 00:00:00 2001
From: zafar <zafar@etsi.org>
Date: Fri, 15 Jan 2021 13:08:17 +0500
Subject: [PATCH 233/322] Updated reference descriptor YAML files for SOL001
 and SOL006

---
 .../reference_tst010_vnf_b_2vdu_SOL001.yaml   |  82 ++++----
 .../reference_tst010_vnf_b_2vdu_SOL006.yaml   | 185 +++++++++---------
 .../environment/variables.txt                 |  33 +++-
 3 files changed, 156 insertions(+), 144 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml b/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
index 797d8bec3..e9159106a 100644
--- a/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
+++ b/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
@@ -15,44 +15,6 @@ topology_template:
       virtual_link_right:
         [right, virtual_link_right]
   node_templates:
-    VDU-B-1:
-      type: "tosca.nodes.nfv.Vdu.Compute"
-      properties:
-        name: "vdu-b-1-vcd"
-        descriptor: "Description of VDU-B-1"
-        vdu_profile:
-          min_number_of_instances: 1
-          max_number_of_instances: 2
-      capabilities:
-        virtual_compute:
-          properties:
-            virtual_memory:
-              virtual_mem_size: 4096
-              numa_enabled: false
-            virtual_cpu:
-              num_virtual_cpu: 2
-      requirements:
-        virtual_storage:
-        - "vdu-b-1-vsd"
-    VDU-B-2:
-      type: "tosca.nodes.nfv.Vdu.Compute"
-      properties:
-        name: "vdu-b-2-vcd"
-        descriptor: "Description of VDU-B-2"
-        vdu_profile:
-          min_number_of_instances: 1
-          max_number_of_instances: 4
-      capabilities:
-        virtual_compute:
-          properties:
-            virtual_memory:
-              virtual_mem_size: 6144
-              numa_enabled: false
-            virtual_cpu:
-              num_virtual_cpu: 2
-      requirements:
-        virtual_storage:
-        - "vdu-b-2-vsd"
     right:
       type: "tosca.nodes.nfv.VduCp"
       properties:
@@ -101,7 +63,7 @@ topology_template:
       requirements:
         - virtual_binding: VDU-B-2
         - virtual_link: internal_vl
-    vdu-b-1-vsd:
+    vdu_b_1_vsd:
       type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
       properties:
         virtual_block_storage_data:
@@ -122,14 +84,14 @@ topology_template:
         sw_image:
           type: "tosca.artifacts.nfv.SwImage"
           file: vdu-b-1.qcow2
-    vdu-b-1-vsd:
+    vdu_b_2_vsd:
       type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
       properties:
         virtual_block_storage_data:
           size_of_storage: 20
           rdma_enabled: false
         sw_image_data:
-          name: "vdu-b-1 image"
+          name: "vdu-b-2 image"
           version: "1.1"
           checksum: 
             algorithm: "sha-224"
@@ -166,3 +128,41 @@ topology_template:
                 implementation: terminate-example.yaml
               operate:
                 implementation: operate-example.yaml
+    VDU_B_1:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-1-vcd"
+        descriptor: "Description of VDU-B-1"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 2
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 4096
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-1-vsd"
+    VDU_B_2:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-2-vcd"
+        descriptor: "Description of VDU-B-2"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 4
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 6144
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-2-vsd"                
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml b/SOL002/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
index d033e5a2e..0ea9820f0 100644
--- a/SOL002/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
+++ b/SOL002/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
@@ -2,137 +2,136 @@ nfv:
   vnfd:
     - id: VNF-B-2vdu
       provider: ETSI TST WG
-      product-name: TST010 reference VNF-B with 2 VDUs
-      software-version: '2.2'
+      product_name: TST010 reference VNF-B with 2 VDUs
+      software_version: '2.2'
       version: '2.2'
-      vnfm-info: ETSI VNFM
+      vnfm_info: ETSI VNFM
       vdu:
-        id: vdu-b-1
-        name: VNF-B VDU 1
-        int-cpd:
-          - id: left
-            layer-protocol: ethernet
-          - id: management
-            layer-protocol: ethernet
-          - id: internal
-            layer-protocol: ethernet
-            int-virtual-link-desc: internal-vl
-        virtual-compute-desc: vdu-b-1-vcd
-        virtual-storage-desc: vdu-b-1-vsd
-        sw-image-desc: vdu-b-1-image
-      vdu:
-        id: vdu-b-2
-        name: VNF-B VDU 2
-        int-cpd:
-          - id: right
-            layer-protocol: ethernet
-          - id: management
-            layer-protocol: ethernet
-          - id: internal
-            layer-protocol: ethernet
-            int-virtual-link-desc: internal-vl
-        virtual-compute-desc: vdu-b-2-vcd
-        virtual-storage-desc: vdu-b-2-vsd
-        sw-image-desc: vdu-b-2-image
-      virtual-compute-desc:
+        - id: vdu-b-1
+          name: VNF-B VDU 1
+          int_cpd:
+           - id: left
+             layer_protocol: ethernet
+           - id: management
+             layer_protocol: ethernet
+           - id: internal
+             layer_protocol: ethernet
+             int_virtual_link_desc: internal-vl
+          virtual_compute_desc: vdu-b-1-vcd
+          virtual_storage_desc: vdu-b-1-vsd
+          sw_image_desc: vdu-b-1-image
+        - id: vdu-b-2
+          name: VNF-B VDU 2
+          int_cpd:
+           - id: right
+             layer_protocol: ethernet
+           - id: management
+             layer_protocol: ethernet
+           - id: internal
+             layer_protocol: ethernet
+             int_virtual_link_desc: internal-vl
+          virtual_compute_desc: vdu-b-2-vcd
+          virtual_storage_desc: vdu-b-2-vsd
+          sw_image_desc: vdu-b-2-image
+      virtual_compute_desc:
         id: vdu-b-1-vcd
-        virtual-memory:
+        virtual_memory:
           size: '4.0'
-        virtual-cpu:
-          num-virtual-cpu: '2'
-      virtual-storage-desc:
+        virtual_cpu:
+          num_virtual_cpu: '2'
+      virtual_storage_desc:
         id: vdu-b-1-vsd
-        type-of-storage: root-storage
-        size-of-storage: '0'
-      sw-image-desc:
+        type_of_storage: root-storage
+        size_of_storage: '0'
+      sw_image_desc:
         id: vdu-b-1-image
         name: VNF-B image
         version: '1.1'
         checksum:
           algorithm: sha-224
           hash: somehashfortst010
-        container-format: bare
-        disk-format: qcow2
-        min-disk: '1'
-        min-ram: '2.0'
+        container_format: bare
+        disk_format: qcow2
+        min_disk: '1'
+        min_ram: '2.0'
         size: '1'
         image: 'http://someurl.com/VNF-B.qcow2'
-      virtual-compute-desc:
+      virtual_compute_desc:
         id: vdu-b-2-vcd
-        virtual-memory:
+        virtual_memory:
           size: '6.0'
-        virtual-cpu:
-          num-virtual-cpu: '2'
-      virtual-storage-desc:
+        virtual_cpu:
+          num_virtual_cpu: '2'
+      virtual_storage_desc:
         id: vdu-b-2-vsd
-        type-of-storage: root-storage
-        size-of-storage: '0'
-      sw-image-desc:
+        type_of_storage: root-storage
+        size_of_storage: '0'
+      sw_image_desc:
         id: vdu-b-2-image
         name: VNF-B-2 image
         version: '1.1'
         checksum:
           algorithm: sha-224
           hash: somehashfortst010
-        container-format: bare
-        disk-format: qcow2
-        min-disk: '1'
-        min-ram: '2.0'
+        container_format: bare
+        disk_format: qcow2
+        min_disk: '1'
+        min_ram: '2.0'
         size: '1'
         image: 'http://someurl.com/VNF-B-2.qcow2'
-      int-virtual-link-desc:
+      int_virtual_link_desc:
         - id: internal-vl
           flavour:
             id: internal-vl-flavour
             qos:
               latency: '1'
-              packet-delay-variation: '1'
-              packet-loss-ratio: '0.05'
-          connectivity-type:
-            layer-protocol: ethernet     
-      ext-cpd:
+              packet_delay_variation: '1'
+              packet_loss_ratio: '0.05'
+          connectivity_type:
+            layer_protocol: ethernet     
+      ext_cpd:
         - id: ext-b-left
-          int-cpd:
-            vdu-id: vdu-b-1
+          int_cpd:
+            vdu_id: vdu-b-1
             cpd: left
-          layer-protocol: ethernet
+          layer_protocol: ethernet
         - id: management
-          int-cpd:
-            vdu-id: vdu-b-1
+          int_cpd:
+            vdu_id: vdu-b-1
             cpd: management
-          layer-protocol: ethernet
+          layer_protocol: ethernet
         - id: ext-b-right
-          int-cpd:
-            vdu-id: vdu-b-2
+          int_cpd:
+            vdu_id: vdu-b-2
             cpd: right
-          layer-protocol: ethernet
+          layer_protocol: ethernet
       df:
         id: normal
-        vdu-profile:
+        vdu_profile:
           - id: vdu-b-1
-            min-number-of-instances: '1'
-            max-number-of-instances: '2'
+            min_number_of_instances: '1'
+            max_number_of_instances: '2'
           - id: vdu-b-2
-            min-number-of-instances: '1'
-            max-number-of-instances: '4'          
-        instantiation-level:
+            min_number_of_instances: '1'
+            max_number_of_instances: '4'          
+        instantiation_level:
           - id: double
-            vdu-level:
-              - vdu-id: vdu-b-1
-                number-of-instances: '2'
-              - vdu-id: vdu-b-2
-                number-of-instances: '2'
+            vdu_level:
+              - vdu_id: vdu-b-1
+                number_of_instances: '2'
+              - vdu_id: vdu-b-2
+                number_of_instances: '2'
           - id: single
-            vdu-level:
-              - vdu-id: vdu-b-1
-                number-of-instances: '1'
-              - vdu-id: vdu-b-2
-                number-of-instances: '1'
-        default-instantiation-level: single
-        lcm-operations-configuration:
-          scale-vnf-to-level-op-config:
-            arbitrary-target-levels-supported: 'true'
-          terminate-vnf-op-config:
-            min-graceful-termination: '1'
-          operate-vnf-op-config:
-            min-graceful-stop-timeout: '1'
\ No newline at end of file
+            vdu_level:
+              - vdu_id: vdu-b-1
+                number_of_instances: '1'
+              - vdu_id: vdu-b-2
+                number_of_instances: '1'
+        default_instantiation_level: single
+        lcm_operations_configuration:
+          scale_vnf_to_level_op_config:
+            arbitrary_target_levels_supported: 'true'
+          terminate_vnf_op_config:
+            min_graceful_termination: '1'
+          operate_vnf_op_config:
+            min_graceful_stop_timeout: '1'
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/environment/variables.txt b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
index f0679b13b..08edc6357 100644
--- a/SOL002/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
@@ -79,13 +79,26 @@ ${vnfdIds}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
 
 ${callbackResp}    localhost
 
-${descriptorType}    SOL001
-${vnfKey}    {}
-${check_descriptors}	1
-
-${descriptor_id}	
-${provider}	
-${product_name}    
-${software_version}    
-${descriptor_version}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances    ${body}
\ No newline at end of file
+${check_descriptors}    1
+${descriptorType}    SOL006
+
+${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute
+${tosca_type_VNF}    tosca.nodes.nfv.VNF
+${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
+${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
+${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage
+ 
+@{VDU_IDs}
+@{VNF_IDs}
+@{virtualLink_IDs}
+@{CP_IDs}
+@{Storage_IDs}
+@{internalCP_IDs}
+@{externalCP_IDs}
+@{InstantiationLevel_IDs}
+
+${Descriptor_ID}
+${Provider}
+${Product_Name}
+${Software_Version}
+${Descriptor_Version}
-- 
GitLab


From 861199659f2dbd43ec6fecc8368352c98b7ef66c Mon Sep 17 00:00:00 2001
From: zafar <zafar@etsi.org>
Date: Fri, 15 Jan 2021 16:43:07 +0500
Subject: [PATCH 234/322] SOL001 & SOL006 Descriptor parsing and checking
 updated for VNFLCM-API

---
 .../VNFInstances.robot                        |   1 +
 .../VnfLcmOperationKeywords.robot             | 255 +++++++++++-------
 .../VnfLcmOperationOccurences.robot           |   3 +-
 .../environment/variables.txt                 |   2 +
 4 files changed, 169 insertions(+), 92 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/VNFInstances.robot b/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
index 6c042d821..c2d5451b4 100644
--- a/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
+++ b/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
@@ -33,6 +33,7 @@ GET information about multiple VNF instances
     GET multiple vnfInstances
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    vnfInstances
+    Check HTTP Response Body vnfInstances content against VNF Descriptor    
     
 GET information about multiple VNF instances Bad Request Invalid attribute-based filtering parameters
     [Documentation]    Test ID: 6.3.5.1.3
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index 1119823c3..3cf609f26 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -11,6 +11,7 @@ Library    Collections
 Library    JSONSchemaLibrary    schemas/
 Library           String
 Variables    descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
+Variables    descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
 
 *** Keywords ***
 
@@ -80,9 +81,9 @@ POST Create a new vnfInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Instance
+    Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File
     ${template} =    Get File    jsons/createVnfRequest.json
-    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}
+    ${body}=        Format String   ${template}     vnfdId=${Descriptor_ID}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
@@ -1020,107 +1021,179 @@ Get VNF LCM Operation occurrences with exclude_fields attribute selector
 Check HTTP Response Header Contain Link
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
+
+Check HTTP Response Body vnfInstances content against VNF Descriptor
+    #{check_multiple_instances} flag, set to 1 to check multiple instances against descriptors
+    Run Keyword If    ${check_multiple_instances} == 1    Check Multiple VNF Instances Content
     
-Get key for VNF Descriptor
-    FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
-        Log    ${key}
-        ${check1}=    Run Keyword And Return Status    Should End With    ${key}    VNF
-        Run Keyword If     ${check1}     Set Global Variable    ${vnfKey}    ${key}   
-    END
+Check Multiple VNF Instances Content
+    #${number_of_instances}=    Get Length    ${response['body']}
+    #FOR    ${i}    IN RANGE    ${number_of_instances}
+    ${response['body']}=    Get Variable Value    ${response['body'][0]}    #Gets the first instance at index 0
+    Check Individual VNF Instance Content
+    #END
 
 Check HTTP Response Body vnfInstance content against VNF Descriptor
     #${check_descriptors} flag, 1 to check descriptors
     Run Keyword If    ${check_descriptors} == 1    Check Individual VNF Instance Content
-    
-Check Individual VNF Instance Content    
-    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001    ELSE    Parse SOL006
-    
-Parse SOL001
-    Get key for VNF Descriptor
-    
-    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
-    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
-    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
-    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
-    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
-    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
-    
-    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${descriptor_id}
-    Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${provider}
-    Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${product_name}
-    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}
-    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
-    Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['flavourId']}    ${flavour_id}
-    
-Parse SOL006
-     ${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}
-     ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
-     ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}
-     ${external_cp}=    Get Variable Value    ${nfv.vnfd[0].ext-cpd[0].id}
-     ${vdu_id}=    Get Variable Value    ${nfv.vnfd[0].vdu[0].id}
-     ${vdu_cpid}=    Get Variable Value    ${nfv.vnfd[0].vdu[0].int-cpd[2].id} 
-     ${virtual_storage}=    Get Variable Value    ${nfv.vnfd[0].virtual-storage-desc.id}
-     ${virtual_link}=    Get Variable Value    ${nfv.vnfd[0].int-virtual-link-desc.id}
-
-     
-    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${descriptor_id}
-    Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${provider}
-    Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${product_name}
-    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}
-    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
-    Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['extCpInfo']['cpdId']}    ${external_cp}
-    Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo']['vduId']}    ${vdu_id}
-    Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo']['vnfcCpInfo']['cpdId']}    ${vdu_cpid}
-    Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['virtualStorageResourceInfo']['virtualStorageDescId']}    ${virtual_storage}
-    Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['extManagedVirtualLinkInfo']['vnfVirtualLinkDescId']}    ${virtual_link}
 
-
-
-Add VNF Descriptor Content to VNF Instance
-    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 VNF Instance    ELSE    Parse SOL006 VNF Instance
+Check Individual VNF Instance Content  
+    PARSE the Descriptor File
+    Match the VNF Instance Response Attributes with Descriptors  
+  
+PARSE the Descriptor File
+    Run Keyword If  '${descriptorType}'=='SOL001'    Fetch Information from SOL001 descriptor file    ELSE    Fetch Information from SOL006 descriptor file
     
-Parse SOL001 VNF Instance
-    Get key for VNF Descriptor
-    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
-    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
-    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
-    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
-    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
+Fetch Information from SOL001 descriptor file
+    @{VDU_labels}=    Create List
+    @{VNF_labels}=    Create List
+    @{VirtualLink_labels}=    Create List
+    @{CP_labels}=    Create List
+    @{Storage_labels}=    Create List
+    FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
+        ${key_type}=    Get Variable Value    ${topology_template.node_templates.${key}.type}
+        ${VDU_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}   ${tosca_type_VDU_compute}
+        ${VNF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_VNF}
+        ${Link_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_virtual_link}
+        ${VDUcp_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_VDU_cp}
+        ${Storage_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_storage}
+        Run Keyword If    ${VDU_check}    Append To List    ${VDU_labels}    ${key}
+        Run Keyword If    ${VNF_check}    Append To List    ${VNF_labels}    ${key}
+        Run Keyword If    ${VNF_check}    Get VNF Attributes from SOL001    ${key}            
+        Run Keyword If    ${Link_check}    Append To List    ${VirtualLink_labels}    ${key}
+        Run Keyword If    ${VDUcp_check}    Append To List    ${CP_labels}    ${key}
+        Run Keyword If    ${Storage_check}    Append To List    ${Storage_labels}    ${key}
+    END
+    Set Global Variable    @{VDU_IDs}    @{VDU_labels}
+    Set Global Variable    @{VNF_IDs}    @{VNF_labels}
+    Set Global Variable    @{VirtualLink_IDs}    @{VirtualLink_labels}
+    Set Global Variable    @{CP_IDs}    @{CP_labels}
+    Set Global Variable    @{Storage_IDs}    @{Storage_labels}
+
+Get VNF Attributes from SOL001
+    [Arguments]    ${VNF_label}
+    ${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}
+    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.software_version}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.descriptor_version}
+    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.flavour_id}
     
-Parse SOL006 VNF Instance
+    Set Global Variable    ${Descriptor_ID}    ${descriptor_id}
+    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    ${Flavour_ID}    ${flavour_id}
+
+Fetch Information from SOL006 descriptor file
     ${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}
     ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
-    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}     
-    
-Check HTTP Response Body vnf LCM OpOCC content against VNF Descriptor
-    Run Keyword If    ${check_descriptors} == 1    Check Individual VNF LCM Operation Occurence Content
-    
-Check Individual VNF LCM Operation Occurence Content    
-    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 LCM Op Occ   ELSE    Parse SOL006 LCM Op Occ
-    
-Parse SOL001 LCM Op Occ
-    Get key for VNF Descriptor
+    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}    
+    ${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}
+    ${instantiation_levels}=    Get Length    ${nfv.vnfd[0].df.instantiation_level}    
+    FOR    ${key}    IN    @{nfv.vnfd[0].keys()}
+        ${VDU_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    vdu
+        Run Keyword If    ${VDU_check}    Get VDU IDs    ${VDUcount}
+        ${extCP_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    ext_cpd
+        Run Keyword If    ${extCP_check}    Get External CP IDs    ${extCP_count}
+        ${virtualLink_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    int_virtual_link_desc
+        Run Keyword If    ${virtualLink_check}    Get Virtual Link IDs   ${virtualLink_count}    
+        ${DF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    df
+        Run Keyword If    ${DF_check}    Get Instantiation Levels    ${instantiation_levels}    
+    END
+    Set Global Variable    ${Descriptor_ID}    ${descriptor_id}
+    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}
+
+Get VDU IDs
+    [Arguments]    ${count}    
+    @{VDU_labels}=    Create List
+    ${Storage_labels}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${VDU_labels}    ${nfv.vnfd[0].vdu[${i}].id}
+        Append To List    ${Storage_labels}    ${nfv.vnfd[0].vdu[${i}].virtual_storage_desc} 
+        Get Internal CPs for each VDU    ${i}   
+    END
+    Set Global Variable    ${VDU_IDs}    ${VDU_labels}
+    Set Global Variable    ${Storage_IDs}    ${Storage_labels}
+            
+Get Internal CPs for each VDU
+    [Arguments]    ${vdu}
+    ${count}=    Get Length    ${nfv.vnfd[0].vdu[${vdu}].int_cpd}    
+    ${internal_CPs}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${internal_CPs}    ${nfv.vnfd[0].vdu[${vdu}].int_cpd[${i}].id} 
+    END
+    Set Global Variable    ${internalCP_IDs}    ${internal_CPs}
     
-    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
-    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
+Get External CP IDs
+    [Arguments]    ${count}    
+    @{external_CPs}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${external_CPs}    ${nfv.vnfd[0].ext_cpd[${i}].id} 
+    END
+    Set Global Variable    ${externalCP_IDs}    ${external_CPs}
+
+Get Virtual Link IDs
+    [Arguments]    ${count}    
+    ${VirtualLink_labels}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${VirtualLink_labels}    ${nfv.vnfd[0].int_virtual_link_desc[${i}].id} 
+    END
+    Set Global Variable    ${VirtualLink_IDs}    ${VirtualLink_labels}
+
+Get Instantiation Levels
+    [Arguments]    ${count}
+    @{Instantiation_Levels}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${Instantiation_Levels}    ${nfv.vnfd[0].df.instantiation_level[${i}].id} 
+    END
+    Set Global Variable    ${InstantiationLevel_IDs}    ${Instantiation_Levels}
+
+Match the VNF Instance Response Attributes with Descriptors
+    #Checking Response attributes with VNF Descriptors
+    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${Descriptor_ID}
+    Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${Provider}
+    Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${Product_Name}
+    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${Software_Version}
+    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${Descriptor_Version}
+    Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['flavourId']}    ${Flavour_ID}
+    List Should Contain Value    ${VDU_IDs}    ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo']['vduId']}        
+    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${externalCP_IDs}    ${response['body']['instantiatedVnfInfo']['extCpInfo']['cpdId']}
+    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${internalCP_IDs}    ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo']['vnfcCpInfo']['cpdId']}
+    Run Keyword If  '${descriptorType}'=='SOL001'    List Should Contain Value    @{CP_IDs}    ${response['body']['instantiatedVnfInfo']['extCpInfo']['cpdId']}
+    Run Keyword If  '${descriptorType}'=='SOL001'    List Should Contain Value    @{CP_IDs}    ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo']['vnfcCpInfo']['cpdId']}
+    List Should Contain value    ${Storage_IDs}    ${response['body']['instantiatedVnfInfo']['virtualStorageResourceInfo']['virtualStorageDescId']}
+    List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['instantiatedVnfInfo']['extManagedVirtualLinkInfo']['vnfVirtualLinkDescId']}
     
-    Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdId']}    ${descriptor_id}
-    Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdVersion']}    ${descriptor_version}
+Check HTTP Response Body vnf LCM OpOCCs content against VNF Descriptor
+    #{check_multiple_instances} flag, set to 1 to check multiple instances against descriptors
+    Run Keyword If    ${check_multiple_instances} == 1    Check Multiple VNF LCM OpOCCs Content
     
-Parse SOL006 LCM Op Occ
-     ${descriptor_id}=    Get Variable Value    ${nfv.vnfd[0].id}
-     ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}
-     ${vdu_id}=    Get Variable Value    ${nfv.vnfd[0].vdu[0].id}
-     ${virtual_storage}=    Get Variable Value    ${nfv.vnfd[0].virtual-storage-desc.id}
-     ${virtual_link}=    Get Variable Value    ${nfv.vnfd[0].int-virtual-link-desc.id}
-     
-    Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdId']}    ${descriptor_id}
-    Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdVersion']}    ${descriptor_version}
-    Should Be Equal As Strings    ${response['body']['resourceChanges']['affectedVirtualLinks']['vnfVirtualLinkDescId']}    ${virtual_link}
-    Should Be Equal As Strings    ${response['body']['resourceChanges']['affectedVnfcs']['vduId']}    ${vdu_id}
-    Should Be Equal As Strings    ${response['body']['resourceChanges']['affectedVirtualStorages']['virtualStorageDescId']}    ${virtual_storage}
-    
\ No newline at end of file
+Check Multiple VNF LCM OpOCCs Content
+    #${number_of_instances}=    Get Length    ${response['body']}
+    #FOR    ${i}    IN RANGE    ${number_of_instances}
+    ${response['body']}=    Get Variable Value    ${response['body'][0]}    #Gets the first instance at index 0
+    Check Individual VNF LCM Operation Occurence Content
+    #END
+
+Check HTTP Response Body vnf LCM OpOCC content against VNF Descriptor
+    Run Keyword If    ${check_descriptors} == 1    Check Individual VNF LCM Operation Occurence Content
+
+Check Individual VNF LCM Operation Occurence Content
+    PARSE the Descriptor File
+    Match the VNF LCM Operation Occurence Response Attributes with Descriptors  
+
+Match the VNF LCM Operation Occurence Response Attributes with Descriptors  
+    Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdId']}    ${Descriptor_ID}
+    Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdVersion']}    ${Descriptor_Version}
+    List Should Contain Value    ${VDU_IDs}    ${response['body']['resourceChanges']['affectedVnfcs']['vduId']}    
+    List Should Contain value    ${Storage_IDs}    ${response['body']['resourceChanges']['affectedVirtualStorages']['virtualStorageDescId']}
+    List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['resourceChanges']['affectedVirtualLinks']['vnfVirtualLinkDescId']}
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
index 687c6f711..d5e329d38 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
@@ -32,7 +32,8 @@ GET status information about multiple VNF LCM operation occurrences
     GET VNF LCM OP occurrences
     Check HTTP Response Status Code Is    202
     Check HTTP Response Body Json Schema Is    VnfLcmOpOccs 
-
+    Check HTTP Response Body vnf LCM OpOCCs content against VNF Descriptor
+    
 GET status information about multiple VNF LCM operation occurrences Bad Request Invalid attribute-based filtering parameters
     [Documentation]    Test ID: 6.3.5.11.3
     ...    Test title: GET status information about multiple VNF LCM operation occurrences Bad Request Invalid attribute-based filtering parameters
diff --git a/SOL002/VNFLifecycleManagement-API/environment/variables.txt b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
index 08edc6357..ee664f186 100644
--- a/SOL002/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
@@ -81,6 +81,7 @@ ${callbackResp}    localhost
 
 ${check_descriptors}    1
 ${descriptorType}    SOL006
+${check_multiple_instances}    0
 
 ${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute
 ${tosca_type_VNF}    tosca.nodes.nfv.VNF
@@ -102,3 +103,4 @@ ${Provider}
 ${Product_Name}
 ${Software_Version}
 ${Descriptor_Version}
+${Flavour_ID}
-- 
GitLab


From 96ac9300e7914a6780fe89b3344e8f81d44f71f8 Mon Sep 17 00:00:00 2001
From: zulfiqar <sana.zulfiqar@xflowresearch.com>
Date: Mon, 18 Jan 2021 12:55:53 +0100
Subject: [PATCH 235/322] Updated reference descriptor files for SOL001 and
 SOL006

---
 ...1_reference_tst010_vnf_b_2vdu_SOL001.yaml} | 337 +++++++++---------
 ...06_reference_tst010_vnf_b_2vdu_SOL006.yaml | 137 +++++++
 .../reference_tst010_vnf_b_2df_SOL006.yaml    | 105 ------
 3 files changed, 305 insertions(+), 274 deletions(-)
 rename SOL003/VNFLifecycleManagement-API/descriptors/SOL001/{vnf-b-1_VNF.yaml => SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml} (91%)
 create mode 100644 SOL003/VNFLifecycleManagement-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml
 delete mode 100644 SOL003/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml

diff --git a/SOL003/VNFLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml b/SOL003/VNFLifecycleManagement-API/descriptors/SOL001/SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml
similarity index 91%
rename from SOL003/VNFLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
rename to SOL003/VNFLifecycleManagement-API/descriptors/SOL001/SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml
index 357d2b351..e9159106a 100644
--- a/SOL003/VNFLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
+++ b/SOL003/VNFLifecycleManagement-API/descriptors/SOL001/SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml
@@ -1,169 +1,168 @@
-tosca_definitions_version: tosca_simple_yaml_1_2
-description: "TST010 reference VNF-B"
-metadata:
-  descriptor_id: "VNF-B"
-  vendor: "ETSI TST WG"
-  version: "2.0"
-topology_template:
-  substitution_mappings:
-    node_type: "tosca.nodes.nfv.VNF"
-    requirements:
-      virtual_link_management:
-        [management, virtual_link_management]
-      virtual_link_left:
-        [left, virtual_link_left]
-      virtual_link_right:
-        [right, virtual_link_right]
-  node_templates:
-    VDU-B-1:
-      type: "tosca.nodes.nfv.Vdu.Compute"
-      properties:
-        name: "vdu-b-1-vcd"
-        descriptor: "Description of VDU-B-1"
-        vdu_profile:
-          min_number_of_instances: 1
-          max_number_of_instances: 2
-      capabilities:
-        virtual_compute:
-          properties:
-            virtual_memory:
-              virtual_mem_size: 4096
-              numa_enabled: false
-            virtual_cpu:
-              num_virtual_cpu: 2
-      requirements:
-        virtual_storage:
-        - "vdu-b-1-vsd"
-    VDU-B-2:
-      type: "tosca.nodes.nfv.Vdu.Compute"
-      properties:
-        name: "vdu-b-2-vcd"
-        descriptor: "Description of VDU-B-2"
-        vdu_profile:
-          min_number_of_instances: 1
-          max_number_of_instances: 4
-      capabilities:
-        virtual_compute:
-          properties:
-            virtual_memory:
-              virtual_mem_size: 6144
-              numa_enabled: false
-            virtual_cpu:
-              num_virtual_cpu: 2
-      requirements:
-        virtual_storage:
-        - "vdu-b-2-vsd"
-    right:
-      type: "tosca.nodes.nfv.VduCp"
-      properties:
-        order: 1
-      requirements:
-        virtual_link_right:
-        virtual_binding: VDU-B-2
-    management:
-      type: "tosca.nodes.nfv.VduCp"
-      properties:
-        order: 0
-      requirements:
-        virtual_link_management:
-        virtual_binding: VDU-B-1
-    left:
-      type: "tosca.nodes.nfv.VduCp"
-      properties:
-        order: 2
-      requirements:
-        virtual_link_left:
-        virtual_binding: VDU-B-1
-    internal_vl:
-      type: tosca.nodes.nfv.VnfVirtualLink
-      properties:
-        connectivity_type:
-          layer_protocols: [ ipv4 ]
-        description: Internal Virtual link in the VNF
-        vl_profile:
-          max_bitrate_requirements:
-            root: 100000
-            leaf: 20000
-          min_bitrate_requirements:
-            root: 10000
-            leaf: 10000
-    internal_vdu_b_1_cp:
-      type: tosca.nodes.nfv.VduCp
-      properties:
-        order: 2
-      requirements:
-        - virtual_binding: VDU-B-1
-        - virtual_link: internal_vl
-    internal_vdu_b_2_cp:
-      type: tosca.nodes.nfv.VduCp
-      properties:
-        order: 0
-      requirements:
-        - virtual_binding: VDU-B-2
-        - virtual_link: internal_vl
-    vdu-b-1-vsd:
-      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
-      properties:
-        virtual_block_storage_data:
-          size_of_storage: 20
-          rdma_enabled: false
-        sw_image_data:
-          name: "vdu-b-1 image"
-          version: "1.1"
-          checksum: 
-            algorithm: "sha-224"
-            hash: "somehashfortst010"
-          container_format: "bare"
-          disk-format: qcow2
-          min-disk: '1'
-          min-ram: '2'
-          size: '1'
-      artifacts:
-        sw_image:
-          type: tosca.artifacts.nfv.SwImage
-          file: vdu-b-1.qcow2
-    vdu-b-1-vsd:
-      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
-      properties:
-        virtual_block_storage_data:
-          size_of_storage: 20
-          rdma_enabled: false
-        sw_image_data:
-          name: "vdu-b-1 image"
-          version: "1.1"
-          checksum: 
-            algorithm: "sha-224"
-            hash: "somehashfortst010"
-          container_format: "bare"
-          disk-format: qcow2
-          min-disk: '1'
-          min-ram: '2'
-          size: '1'
-      artifacts:
-        sw_image:
-          type: tosca.artifacts.nfv.SwImage
-          file: vdu-b-2.qcow2
-    vnf_b_1_VNF:
-      type: "tosca.nodes.nfv.VNF"
-      properties:
-        descriptor_id: "VNF-B-2VDUs"
-        descriptor_version: "2.0"
-        provider: "ETSI TST WG"
-        product_name: "VNF-B-2VDUs"
-        software_version: "2.0"
-        product_info_name: "VNF-B-2VDUs"
-        product_info_description: "TST010 reference VNF-B with 2 VDUs"
-        flavour_id: "VNF-B-2VDU_flavor"
-        flavour_description: "VNF-B with 2 VDUs flavor"
-        vnfm_info: 
-          etsivnfm: 
-          - v2.3.1 
-        interfaces:
-            Vnflcm:
-              scale:
-                implementation: scale-example.yaml
-              terminate:
-                implementation: terminate-example.yaml
-              operate:
-                implementation: operate-example.yaml
-
+tosca_definitions_version: tosca_simple_yaml_1_2
+description: "TST010 reference VNF-B"
+metadata:
+  descriptor_id: "VNF-B"
+  vendor: "ETSI TST WG"
+  version: "2.0"
+topology_template:
+  substitution_mappings:
+    node_type: "tosca.nodes.nfv.VNF"
+    requirements:
+      virtual_link_management:
+        [management, virtual_link_management]
+      virtual_link_left:
+        [left, virtual_link_left]
+      virtual_link_right:
+        [right, virtual_link_right]
+  node_templates:
+    right:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 1
+      requirements:
+        virtual_link_right:
+        virtual_binding: VDU-B-2
+    management:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 0
+      requirements:
+        virtual_link_management:
+        virtual_binding: VDU-B-1
+    left:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 2
+      requirements:
+        virtual_link_left:
+        virtual_binding: VDU-B-1
+    internal_vl:
+      type: "tosca.nodes.nfv.VnfVirtualLink"
+      properties:
+        connectivity_type:
+          layer_protocols: [ ipv4 ]
+        description: Internal Virtual link in the VNF
+        vl_profile:
+          max_bitrate_requirements:
+            root: 100000
+            leaf: 20000
+          min_bitrate_requirements:
+            root: 10000
+            leaf: 10000
+    internal_vdu_b_1_cp:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 2
+      requirements:
+        - virtual_binding: VDU-B-1
+        - virtual_link: internal_vl
+    internal_vdu_b_2_cp:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 0
+      requirements:
+        - virtual_binding: VDU-B-2
+        - virtual_link: internal_vl
+    vdu_b_1_vsd:
+      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
+      properties:
+        virtual_block_storage_data:
+          size_of_storage: 20
+          rdma_enabled: false
+        sw_image_data:
+          name: "vdu-b-1 image"
+          version: "1.1"
+          checksum: 
+            algorithm: "sha-224"
+            hash: "somehashfortst010"
+          container_format: "bare"
+          disk-format: qcow2
+          min-disk: '1'
+          min-ram: '2'
+          size: '1'
+      artifacts:
+        sw_image:
+          type: "tosca.artifacts.nfv.SwImage"
+          file: vdu-b-1.qcow2
+    vdu_b_2_vsd:
+      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
+      properties:
+        virtual_block_storage_data:
+          size_of_storage: 20
+          rdma_enabled: false
+        sw_image_data:
+          name: "vdu-b-2 image"
+          version: "1.1"
+          checksum: 
+            algorithm: "sha-224"
+            hash: "somehashfortst010"
+          container_format: "bare"
+          disk-format: qcow2
+          min-disk: '1'
+          min-ram: '2'
+          size: '1'
+      artifacts:
+        sw_image:
+          type: tosca.artifacts.nfv.SwImage
+          file: vdu-b-2.qcow2
+    vnf_b_1_VNF:
+      type: "tosca.nodes.nfv.VNF"
+      properties:
+        descriptor_id: "VNF-B-2VDUs"
+        descriptor_version: "2.0"
+        provider: "ETSI TST WG"
+        product_name: "VNF-B-2VDUs"
+        software_version: "2.0"
+        product_info_name: "VNF-B-2VDUs"
+        product_info_description: "TST010 reference VNF-B with 2 VDUs"
+        flavour_id: "VNF-B-2VDU_flavor"
+        flavour_description: "VNF-B with 2 VDUs flavor"
+        vnfm_info: 
+          etsivnfm: 
+          - v2.3.1 
+        interfaces:
+            Vnflcm:
+              scale:
+                implementation: scale-example.yaml
+              terminate:
+                implementation: terminate-example.yaml
+              operate:
+                implementation: operate-example.yaml
+    VDU_B_1:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-1-vcd"
+        descriptor: "Description of VDU-B-1"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 2
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 4096
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-1-vsd"
+    VDU_B_2:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-2-vcd"
+        descriptor: "Description of VDU-B-2"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 4
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 6144
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-2-vsd"                
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml b/SOL003/VNFLifecycleManagement-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml
new file mode 100644
index 000000000..0ea9820f0
--- /dev/null
+++ b/SOL003/VNFLifecycleManagement-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml
@@ -0,0 +1,137 @@
+nfv:
+  vnfd:
+    - id: VNF-B-2vdu
+      provider: ETSI TST WG
+      product_name: TST010 reference VNF-B with 2 VDUs
+      software_version: '2.2'
+      version: '2.2'
+      vnfm_info: ETSI VNFM
+      vdu:
+        - id: vdu-b-1
+          name: VNF-B VDU 1
+          int_cpd:
+           - id: left
+             layer_protocol: ethernet
+           - id: management
+             layer_protocol: ethernet
+           - id: internal
+             layer_protocol: ethernet
+             int_virtual_link_desc: internal-vl
+          virtual_compute_desc: vdu-b-1-vcd
+          virtual_storage_desc: vdu-b-1-vsd
+          sw_image_desc: vdu-b-1-image
+        - id: vdu-b-2
+          name: VNF-B VDU 2
+          int_cpd:
+           - id: right
+             layer_protocol: ethernet
+           - id: management
+             layer_protocol: ethernet
+           - id: internal
+             layer_protocol: ethernet
+             int_virtual_link_desc: internal-vl
+          virtual_compute_desc: vdu-b-2-vcd
+          virtual_storage_desc: vdu-b-2-vsd
+          sw_image_desc: vdu-b-2-image
+      virtual_compute_desc:
+        id: vdu-b-1-vcd
+        virtual_memory:
+          size: '4.0'
+        virtual_cpu:
+          num_virtual_cpu: '2'
+      virtual_storage_desc:
+        id: vdu-b-1-vsd
+        type_of_storage: root-storage
+        size_of_storage: '0'
+      sw_image_desc:
+        id: vdu-b-1-image
+        name: VNF-B image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container_format: bare
+        disk_format: qcow2
+        min_disk: '1'
+        min_ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B.qcow2'
+      virtual_compute_desc:
+        id: vdu-b-2-vcd
+        virtual_memory:
+          size: '6.0'
+        virtual_cpu:
+          num_virtual_cpu: '2'
+      virtual_storage_desc:
+        id: vdu-b-2-vsd
+        type_of_storage: root-storage
+        size_of_storage: '0'
+      sw_image_desc:
+        id: vdu-b-2-image
+        name: VNF-B-2 image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container_format: bare
+        disk_format: qcow2
+        min_disk: '1'
+        min_ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B-2.qcow2'
+      int_virtual_link_desc:
+        - id: internal-vl
+          flavour:
+            id: internal-vl-flavour
+            qos:
+              latency: '1'
+              packet_delay_variation: '1'
+              packet_loss_ratio: '0.05'
+          connectivity_type:
+            layer_protocol: ethernet     
+      ext_cpd:
+        - id: ext-b-left
+          int_cpd:
+            vdu_id: vdu-b-1
+            cpd: left
+          layer_protocol: ethernet
+        - id: management
+          int_cpd:
+            vdu_id: vdu-b-1
+            cpd: management
+          layer_protocol: ethernet
+        - id: ext-b-right
+          int_cpd:
+            vdu_id: vdu-b-2
+            cpd: right
+          layer_protocol: ethernet
+      df:
+        id: normal
+        vdu_profile:
+          - id: vdu-b-1
+            min_number_of_instances: '1'
+            max_number_of_instances: '2'
+          - id: vdu-b-2
+            min_number_of_instances: '1'
+            max_number_of_instances: '4'          
+        instantiation_level:
+          - id: double
+            vdu_level:
+              - vdu_id: vdu-b-1
+                number_of_instances: '2'
+              - vdu_id: vdu-b-2
+                number_of_instances: '2'
+          - id: single
+            vdu_level:
+              - vdu_id: vdu-b-1
+                number_of_instances: '1'
+              - vdu_id: vdu-b-2
+                number_of_instances: '1'
+        default_instantiation_level: single
+        lcm_operations_configuration:
+          scale_vnf_to_level_op_config:
+            arbitrary_target_levels_supported: 'true'
+          terminate_vnf_op_config:
+            min_graceful_termination: '1'
+          operate_vnf_op_config:
+            min_graceful_stop_timeout: '1'
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml b/SOL003/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
deleted file mode 100644
index fe0909358..000000000
--- a/SOL003/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
+++ /dev/null
@@ -1,105 +0,0 @@
-nfv:
-  vnfd:
-    - id: VNF-B-2df
-      provider: ETSI TST WG
-      product-name: TST010 reference VNF-B with 2 DFs
-      software-version: '2.1'
-      version: '2.1'
-      vnfm-info: ETSI VNFM
-      vdu:
-        id: vdu-b-1
-        name: VNF-B VDU 1
-        int-cpd:
-          - id: left
-            layer-protocol: ethernet
-          - id: management
-            layer-protocol: ethernet
-          - id: right
-            layer-protocol: ethernet
-        virtual-compute-desc: vdu-b-1-vcd
-        virtual-storage-desc: vdu-b-1-vsd
-        sw-image-desc: vdu-b-1-image
-      virtual-compute-desc:
-        id: vdu-b-1-vcd
-        virtual-memory:
-          size: '4.0'
-        virtual-cpu:
-          num-virtual-cpu: '2'
-      virtual-storage-desc:
-        id: vdu-b-1-vsd
-        type-of-storage: root-storage
-        size-of-storage: '0'
-      sw-image-desc:
-        id: vdu-b-1-image
-        name: VNF-B image
-        version: '1.1'
-        checksum:
-          algorithm: sha-224
-          hash: somehashfortst010
-        container-format: bare
-        disk-format: qcow2
-        min-disk: '1'
-        min-ram: '2.0'
-        size: '1'
-        image: 'http://someurl.com/VNF-B.qcow2'
-      ext-cpd:
-        - id: ext-b-left
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: left
-          layer-protocol: ethernet
-        - id: management
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: management
-          layer-protocol: ethernet
-        - id: ext-b-right
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: right
-          layer-protocol: ethernet
-      df:
-        - id: small
-          vdu-profile:
-            id: vdu-b-1
-            min-number-of-instances: '1'
-            max-number-of-instances: '2'
-          instantiation-level:
-            - id: double
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '2'
-            - id: single
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '1'
-          default-instantiation-level: single
-          lcm-operations-configuration:
-            scale-vnf-to-level-op-config:
-              arbitrary-target-levels-supported: 'true'
-            terminate-vnf-op-config:
-              min-graceful-termination: '1'
-            operate-vnf-op-config:
-              min-graceful-stop-timeout: '1'
-        - id: big
-          vdu-profile:
-            id: vdu-b-1
-            min-number-of-instances: '1'
-            max-number-of-instances: '4'
-          instantiation-level:
-            - id: double
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '2'
-            - id: triple
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '3'
-          default-instantiation-level: double
-          lcm-operations-configuration:
-            scale-vnf-to-level-op-config:
-              arbitrary-target-levels-supported: 'true'
-            terminate-vnf-op-config:
-              min-graceful-termination: '1'
-            operate-vnf-op-config:
-              min-graceful-stop-timeout: '1'
\ No newline at end of file
-- 
GitLab


From 28ecd83a42d550e0c2cbdb027bf11fc6187c29a7 Mon Sep 17 00:00:00 2001
From: zafar <zafar@etsi.org>
Date: Tue, 19 Jan 2021 14:54:50 +0500
Subject: [PATCH 236/322] SOL006 reference descriptor file and checking
 functionality updated (with dashes instead of  underscores)

---
 .../VnfLcmOperationKeywords.robot             |  30 ++--
 .../reference_tst010_vnf_b_2vdu_SOL006.yaml   | 164 +++++++++---------
 2 files changed, 96 insertions(+), 98 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index 3cf609f26..2b541dd46 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -1077,31 +1077,29 @@ Get VNF Attributes from SOL001
     ${product_name}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.product_name}
     ${software_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.software_version}
     ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.descriptor_version}
-    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.flavour_id}
     
     Set Global Variable    ${Descriptor_ID}    ${descriptor_id}
     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    ${Flavour_ID}    ${flavour_id}
 
 Fetch Information from SOL006 descriptor file
     ${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}
-    ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
+    ${product_name}=    Get Variable Value    ${nfv.vnfd[0]['product-name']}
+    ${software_version}=    Get Variable Value    ${nfv.vnfd[0]['software-version']}
     ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}    
     ${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}
-    ${instantiation_levels}=    Get Length    ${nfv.vnfd[0].df.instantiation_level}    
+    ${extCP_count}=    Get Length    ${nfv.vnfd[0]['ext-cpd']}
+    ${virtualLink_count}=    Get length    ${nfv.vnfd[0]['int-virtual-link-desc']}
+    ${instantiation_levels}=    Get Length    ${nfv.vnfd[0].df['instantiation-level']}    
     FOR    ${key}    IN    @{nfv.vnfd[0].keys()}
         ${VDU_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    vdu
         Run Keyword If    ${VDU_check}    Get VDU IDs    ${VDUcount}
-        ${extCP_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    ext_cpd
+        ${extCP_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    ext-cpd
         Run Keyword If    ${extCP_check}    Get External CP IDs    ${extCP_count}
-        ${virtualLink_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    int_virtual_link_desc
+        ${virtualLink_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    int-virtual-link-desc
         Run Keyword If    ${virtualLink_check}    Get Virtual Link IDs   ${virtualLink_count}    
         ${DF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    df
         Run Keyword If    ${DF_check}    Get Instantiation Levels    ${instantiation_levels}    
@@ -1117,8 +1115,8 @@ Get VDU IDs
     @{VDU_labels}=    Create List
     ${Storage_labels}=    Create List
     FOR    ${i}    IN RANGE    ${count}
-        Append To List    ${VDU_labels}    ${nfv.vnfd[0].vdu[${i}].id}
-        Append To List    ${Storage_labels}    ${nfv.vnfd[0].vdu[${i}].virtual_storage_desc} 
+        Append To List    ${VDU_labels}    ${nfv.vnfd[0].vdu[${i}]['id']}
+        Append To List    ${Storage_labels}    ${nfv.vnfd[0].vdu[${i}]['virtual-storage-desc']} 
         Get Internal CPs for each VDU    ${i}   
     END
     Set Global Variable    ${VDU_IDs}    ${VDU_labels}
@@ -1126,10 +1124,10 @@ Get VDU IDs
             
 Get Internal CPs for each VDU
     [Arguments]    ${vdu}
-    ${count}=    Get Length    ${nfv.vnfd[0].vdu[${vdu}].int_cpd}    
+    ${count}=    Get Length    ${nfv.vnfd[0].vdu[${vdu}]['int-cpd']}    
     ${internal_CPs}=    Create List
     FOR    ${i}    IN RANGE    ${count}
-        Append To List    ${internal_CPs}    ${nfv.vnfd[0].vdu[${vdu}].int_cpd[${i}].id} 
+        Append To List    ${internal_CPs}    ${nfv.vnfd[0].vdu[${vdu}]['int-cpd'][${i}]['id']} 
     END
     Set Global Variable    ${internalCP_IDs}    ${internal_CPs}
     
@@ -1137,7 +1135,7 @@ Get External CP IDs
     [Arguments]    ${count}    
     @{external_CPs}=    Create List
     FOR    ${i}    IN RANGE    ${count}
-        Append To List    ${external_CPs}    ${nfv.vnfd[0].ext_cpd[${i}].id} 
+        Append To List    ${external_CPs}    ${nfv.vnfd[0]['ext-cpd'][${i}]['id']} 
     END
     Set Global Variable    ${externalCP_IDs}    ${external_CPs}
 
@@ -1145,7 +1143,7 @@ Get Virtual Link IDs
     [Arguments]    ${count}    
     ${VirtualLink_labels}=    Create List
     FOR    ${i}    IN RANGE    ${count}
-        Append To List    ${VirtualLink_labels}    ${nfv.vnfd[0].int_virtual_link_desc[${i}].id} 
+        Append To List    ${VirtualLink_labels}    ${nfv.vnfd[0]['int-virtual-link-desc'][${i}]['id']} 
     END
     Set Global Variable    ${VirtualLink_IDs}    ${VirtualLink_labels}
 
@@ -1153,7 +1151,7 @@ Get Instantiation Levels
     [Arguments]    ${count}
     @{Instantiation_Levels}=    Create List
     FOR    ${i}    IN RANGE    ${count}
-        Append To List    ${Instantiation_Levels}    ${nfv.vnfd[0].df.instantiation_level[${i}].id} 
+        Append To List    ${Instantiation_Levels}    ${nfv.vnfd[0].df['instantiation-level'][${i}]['id']} 
     END
     Set Global Variable    ${InstantiationLevel_IDs}    ${Instantiation_Levels}
 
diff --git a/SOL002/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml b/SOL002/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
index 0ea9820f0..d902779a2 100644
--- a/SOL002/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
+++ b/SOL002/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
@@ -2,136 +2,136 @@ nfv:
   vnfd:
     - id: VNF-B-2vdu
       provider: ETSI TST WG
-      product_name: TST010 reference VNF-B with 2 VDUs
-      software_version: '2.2'
+      product-name: TST010 reference VNF-B with 2 VDUs
+      software-version: '2.2'
       version: '2.2'
-      vnfm_info: ETSI VNFM
+      vnfm-info: ETSI VNFM
       vdu:
         - id: vdu-b-1
           name: VNF-B VDU 1
-          int_cpd:
+          int-cpd:
            - id: left
-             layer_protocol: ethernet
+             layer-protocol: ethernet
            - id: management
-             layer_protocol: ethernet
+             layer-protocol: ethernet
            - id: internal
-             layer_protocol: ethernet
-             int_virtual_link_desc: internal-vl
-          virtual_compute_desc: vdu-b-1-vcd
-          virtual_storage_desc: vdu-b-1-vsd
-          sw_image_desc: vdu-b-1-image
+             layer-protocol: ethernet
+             int-virtual-link-desc: internal-vl
+          virtual-compute-desc: vdu-b-1-vcd
+          virtual-storage-desc: vdu-b-1-vsd
+          sw-image-desc: vdu-b-1-image
         - id: vdu-b-2
           name: VNF-B VDU 2
-          int_cpd:
+          int-cpd:
            - id: right
-             layer_protocol: ethernet
+             layer-protocol: ethernet
            - id: management
-             layer_protocol: ethernet
+             layer-protocol: ethernet
            - id: internal
-             layer_protocol: ethernet
-             int_virtual_link_desc: internal-vl
-          virtual_compute_desc: vdu-b-2-vcd
-          virtual_storage_desc: vdu-b-2-vsd
-          sw_image_desc: vdu-b-2-image
-      virtual_compute_desc:
+             layer-protocol: ethernet
+             int-virtual-link-desc: internal-vl
+          virtual-compute-desc: vdu-b-2-vcd
+          virtual-storage-desc: vdu-b-2-vsd
+          sw-image-desc: vdu-b-2-image
+      virtual-compute-desc:
         id: vdu-b-1-vcd
-        virtual_memory:
+        virtual-memory:
           size: '4.0'
-        virtual_cpu:
-          num_virtual_cpu: '2'
-      virtual_storage_desc:
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
         id: vdu-b-1-vsd
-        type_of_storage: root-storage
-        size_of_storage: '0'
-      sw_image_desc:
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
         id: vdu-b-1-image
         name: VNF-B image
         version: '1.1'
         checksum:
           algorithm: sha-224
           hash: somehashfortst010
-        container_format: bare
-        disk_format: qcow2
-        min_disk: '1'
-        min_ram: '2.0'
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
         size: '1'
         image: 'http://someurl.com/VNF-B.qcow2'
-      virtual_compute_desc:
+      virtual-compute-desc:
         id: vdu-b-2-vcd
-        virtual_memory:
+        virtual-memory:
           size: '6.0'
-        virtual_cpu:
-          num_virtual_cpu: '2'
-      virtual_storage_desc:
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
         id: vdu-b-2-vsd
-        type_of_storage: root-storage
-        size_of_storage: '0'
-      sw_image_desc:
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
         id: vdu-b-2-image
         name: VNF-B-2 image
         version: '1.1'
         checksum:
           algorithm: sha-224
           hash: somehashfortst010
-        container_format: bare
-        disk_format: qcow2
-        min_disk: '1'
-        min_ram: '2.0'
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
         size: '1'
         image: 'http://someurl.com/VNF-B-2.qcow2'
-      int_virtual_link_desc:
+      int-virtual-link-desc:
         - id: internal-vl
           flavour:
             id: internal-vl-flavour
             qos:
               latency: '1'
-              packet_delay_variation: '1'
-              packet_loss_ratio: '0.05'
-          connectivity_type:
-            layer_protocol: ethernet     
-      ext_cpd:
+              packet-delay-variation: '1'
+              packet-loss-ratio: '0.05'
+          connectivity-type:
+            layer-protocol: ethernet     
+      ext-cpd:
         - id: ext-b-left
-          int_cpd:
-            vdu_id: vdu-b-1
+          int-cpd:
+            vdu-id: vdu-b-1
             cpd: left
-          layer_protocol: ethernet
+          layer-protocol: ethernet
         - id: management
-          int_cpd:
-            vdu_id: vdu-b-1
+          int-cpd:
+            vdu-id: vdu-b-1
             cpd: management
-          layer_protocol: ethernet
+          layer-protocol: ethernet
         - id: ext-b-right
-          int_cpd:
-            vdu_id: vdu-b-2
+          int-cpd:
+            vdu-id: vdu-b-2
             cpd: right
-          layer_protocol: ethernet
+          layer-protocol: ethernet
       df:
         id: normal
-        vdu_profile:
+        vdu-profile:
           - id: vdu-b-1
-            min_number_of_instances: '1'
-            max_number_of_instances: '2'
+            min-number-of-instances: '1'
+            max-number-of-instances: '2'
           - id: vdu-b-2
-            min_number_of_instances: '1'
-            max_number_of_instances: '4'          
-        instantiation_level:
+            min-number-of-instances: '1'
+            max-number-of-instances: '4'          
+        instantiation-level:
           - id: double
-            vdu_level:
-              - vdu_id: vdu-b-1
-                number_of_instances: '2'
-              - vdu_id: vdu-b-2
-                number_of_instances: '2'
+            vdu-level:
+              - vdu-id: vdu-b-1
+                number-of-instances: '2'
+              - vdu-id: vdu-b-2
+                number-of-instances: '2'
           - id: single
-            vdu_level:
-              - vdu_id: vdu-b-1
-                number_of_instances: '1'
-              - vdu_id: vdu-b-2
-                number_of_instances: '1'
-        default_instantiation_level: single
-        lcm_operations_configuration:
-          scale_vnf_to_level_op_config:
-            arbitrary_target_levels_supported: 'true'
-          terminate_vnf_op_config:
-            min_graceful_termination: '1'
-          operate_vnf_op_config:
-            min_graceful_stop_timeout: '1'
\ No newline at end of file
+            vdu-level:
+              - vdu-id: vdu-b-1
+                number-of-instances: '1'
+              - vdu-id: vdu-b-2
+                number-of-instances: '1'
+        default-instantiation-level: single
+        lcm-operations-configuration:
+          scale-vnf-to-level-op-config:
+            arbitrary-target-levels-supported: 'true'
+          terminate-vnf-op-config:
+            min-graceful-termination: '1'
+          operate-vnf-op-config:
+            min-graceful-stop-timeout: '1'
\ No newline at end of file
-- 
GitLab


From 5a464a59d134c710e77bd6edfc91429ce920bd4b Mon Sep 17 00:00:00 2001
From: zafar <zafar@etsi.org>
Date: Tue, 19 Jan 2021 15:01:31 +0500
Subject: [PATCH 237/322] minor bug fix for previous commit (FlavorId got
 deleted by mistake)

---
 SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index 2b541dd46..97fae54e4 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -1077,12 +1077,14 @@ Get VNF Attributes from SOL001
     ${product_name}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.product_name}
     ${software_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.software_version}
     ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.descriptor_version}
+    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.flavour_id}
     
     Set Global Variable    ${Descriptor_ID}    ${descriptor_id}
     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    ${Flavour_ID}    ${flavour_id}
 
 Fetch Information from SOL006 descriptor file
     ${descriptor_id}=    Get Variable Value    ${nfv.vnfd[0].id}
-- 
GitLab


From b6598a734a2deb99bcf1f72ea1faa3d6cbc631ae Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Tue, 19 Jan 2021 15:25:04 +0100
Subject: [PATCH 238/322] Fix on mockserver configuration

---
 SOL002/VNFFaultManagement-API/Subscriptions.robot      |  2 +-
 SOL002/VNFIndicator-API/Subscriptions.robot            |  4 ++--
 .../VnfLcmOperationKeywords.robot                      |  6 +++---
 SOL002/VNFPerformanceManagement-API/PMJobs.robot       |  2 +-
 SOL002/VNFPerformanceManagement-API/Thresholds.robot   |  2 +-
 .../FaultManagement-APIKeyword.robot                   |  6 +++---
 .../VNFFaultManagement-API/environment/variables.txt   |  1 +
 .../VnfLcmMntOperationKeywords.robot                   |  6 +++---
 .../VRQANOperationKeywords.robot                       |  6 +++---
 ...uest .json => vrQuotaAvailSubscriptionRequest.json} |  0
 .../NSFaultManagement-API/NSFMOperationKeywords.robot  |  6 +++---
 .../NSPerformanceManagementKeywords.robot              |  2 +-
 .../environment/variables.txt                          |  2 +-
 .../VNFPackageManagementKeywords.robot                 | 10 +++++-----
 14 files changed, 28 insertions(+), 27 deletions(-)
 rename SOL003/VirtualisedResourcesQuotaAvailableNotification-API/jsons/{vrQuotaAvailSubscriptionRequest .json => vrQuotaAvailSubscriptionRequest.json} (100%)

diff --git a/SOL002/VNFFaultManagement-API/Subscriptions.robot b/SOL002/VNFFaultManagement-API/Subscriptions.robot
index 7885715f0..df7d5d84d 100644
--- a/SOL002/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL002/VNFFaultManagement-API/Subscriptions.robot
@@ -320,7 +320,7 @@ Post Create subscription
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}				
diff --git a/SOL002/VNFIndicator-API/Subscriptions.robot b/SOL002/VNFIndicator-API/Subscriptions.robot
index d0f7f89dd..b12f6693f 100644
--- a/SOL002/VNFIndicator-API/Subscriptions.robot
+++ b/SOL002/VNFIndicator-API/Subscriptions.robot
@@ -207,7 +207,7 @@ Get VNF Indicators Subscriptions with invalid filter
     Set Suite Variable    ${response}    ${output}   
     
 Get VNF Indicators Subscriptions with invalid resource endpoint
-        Log    Trying to perform a request on a Uri which doesn't exist
+    Log    Trying to perform a request on a Uri which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
@@ -219,7 +219,7 @@ Send Post Request for VNF Indicator Subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${template}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String    ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    ${body}=        Format String    ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index f4dd79745..83832de65 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -789,7 +789,7 @@ Post Create subscription
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
-    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}				
@@ -800,7 +800,7 @@ Post Create subscription - DUPLICATION
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
-    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}			
@@ -811,7 +811,7 @@ Post Create subscription - NO-DUPLICATION
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
-    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
diff --git a/SOL002/VNFPerformanceManagement-API/PMJobs.robot b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
index 160d12642..1c7dc8e97 100644
--- a/SOL002/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
@@ -285,7 +285,7 @@ Send Post Request Create new VNF Performance Monitoring Job
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/CreatePmJobRequest.json
-    ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}    callback_uri=${callback_uri}
+    ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}    callback_uri=${callback_uri}:${callback_port}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL002/VNFPerformanceManagement-API/Thresholds.robot b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
index 5ed05061c..7505e15f2 100644
--- a/SOL002/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
@@ -176,7 +176,7 @@ Send Post Request Create new Performance Threshold
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${template}=    Get File    jsons/CreateThresholdRequest.json
-    ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}    callback_uri=${callback_uri}
+    ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}    callback_uri=${callback_uri}:${callback_port}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
index cbf26efb8..b833c9354 100644
--- a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
+++ b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
@@ -256,7 +256,7 @@ POST Subscription
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
-    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}      callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}      callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -268,7 +268,7 @@ Send POST Request for duplicated subscription
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
-    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -280,7 +280,7 @@ Send POST Request for duplicated subscription not permitted
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
-    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
diff --git a/SOL003/VNFFaultManagement-API/environment/variables.txt b/SOL003/VNFFaultManagement-API/environment/variables.txt
index 5908e8e4a..8f264481e 100644
--- a/SOL003/VNFFaultManagement-API/environment/variables.txt
+++ b/SOL003/VNFFaultManagement-API/environment/variables.txt
@@ -52,6 +52,7 @@ ${invalidAlarmId}    invalidIdAlarm
 ${fields}         criteria,objectInstanceIds
 
 ${callback_uri}  http://127.0.0.1
+${callback_port}    9091
 ${callback_endpoint}    /subscribe
 
 ${vnfdIds}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index f01d3b2d9..0ef1ebdeb 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -974,7 +974,7 @@ Post Create subscription
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_notification=${callback_notification}
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_notification=${callback_notification}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}				
@@ -985,7 +985,7 @@ Post Create subscription - DUPLICATION
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_notification=${callback_notification}
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_notification=${callback_notification}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}			
@@ -996,7 +996,7 @@ Post Create subscription - NO-DUPLICATION
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_notification=${callback_notification}
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_notification=${callback_notification}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot
index 8aab471ed..237409f64 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot
@@ -95,7 +95,7 @@ Send Post request for new Virtualised Resources Quota Available Notification sub
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/vrQuotaAvailSubscriptionRequest.json
-    ${body}=        Format String   ${template}    callback_uri=${callback_uri}    callback_subscribe=${callback_subscribe}
+    ${body}=        Format String   ${template}    callback_uri=${callback_uri}:${callback_port}    callback_subscribe=${callback_subscribe}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
@@ -107,7 +107,7 @@ Send Post request for new Virtualised Resources Quota Available Notification sub
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/vrQuotaAvailSubscriptionRequest.json
-    ${body}=        Format String   ${template}    callback_uri=${callback_uri}    callback_subscribe=${callback_subscribe}
+    ${body}=        Format String   ${template}    callback_uri=${callback_uri}:${callback_port}    callback_subscribe=${callback_subscribe}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
@@ -119,7 +119,7 @@ Send Post request for new Virtualised Resources Quota Available Notification sub
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/vrQuotaAvailSubscriptionRequest.json
-    ${body}=        Format String   ${template}    callback_uri=${callback_uri}    callback_subscribe=${callback_subscribe}
+    ${body}=        Format String   ${template}    callback_uri=${callback_uri}:${callback_port}    callback_subscribe=${callback_subscribe}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/jsons/vrQuotaAvailSubscriptionRequest .json b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/jsons/vrQuotaAvailSubscriptionRequest.json
similarity index 100%
rename from SOL003/VirtualisedResourcesQuotaAvailableNotification-API/jsons/vrQuotaAvailSubscriptionRequest .json
rename to SOL003/VirtualisedResourcesQuotaAvailableNotification-API/jsons/vrQuotaAvailSubscriptionRequest.json
diff --git a/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot b/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
index 20e4d62ac..d67a251d2 100644
--- a/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
+++ b/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
@@ -214,7 +214,7 @@ POST Subscription
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -226,7 +226,7 @@ POST Subscription
     # Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     # Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     # ${template}=    Get File    jsons/fmSubscriptionRequest.json
-    # ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    # ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     # Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}		
     # ${outputResponse}=    Output    response
 	# Set Global Variable    ${response}    ${outputResponse}	
@@ -238,7 +238,7 @@ POST Subscription
     # Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     # Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     # ${template}=    Get File    jsons/fmSubscriptionRequest.json
-    # ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    # ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     # Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     # ${outputResponse}=    Output    response
 	# Set Global Variable    ${response}    ${outputResponse}	
diff --git a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
index 3da49c3c0..d70330ae1 100644
--- a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
+++ b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
@@ -508,7 +508,7 @@ Create Sessions
     Pass Execution If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 0    MockServer not started as NFVO is not checking the notification endpoint
     Start Process  java  -jar  ${MOCK_SERVER_JAR}    -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
-    Create Mock Session  ${callback_uri}
+    Create Mock Session  ${callback_uri}:${callback_port}
        
 Check Notification Endpoint
     &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
diff --git a/SOL005/NSPerformanceManagement-API/environment/variables.txt b/SOL005/NSPerformanceManagement-API/environment/variables.txt
index b2e1aacbd..ff91e2963 100644
--- a/SOL005/NSPerformanceManagement-API/environment/variables.txt
+++ b/SOL005/NSPerformanceManagement-API/environment/variables.txt
@@ -18,7 +18,7 @@ ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.
 ${testOptionalMethods}    0
 
 ${callback_port}    9091
-${callback_uri}    http://172.22.1.7:${callback_port}
+${callback_uri}    http://172.22.1.7
 ${callback_endpoint}    /nspm/subscriptions
 ${callback_endpoint_error}    /subs_404
 ${sleep_interval}    20s
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index e32dacda4..aaecf440d 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -674,7 +674,7 @@ Send Post Request for VNF Package Subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${template}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
@@ -687,7 +687,7 @@ Send Post Request for Duplicated VNF Package Subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${template}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
@@ -720,7 +720,7 @@ Send Delete Request for VNF Package Subscriptions
 Check HTTP Response Body PkgmSubscription Attributes Values Match the Issued Subscription
     Log    Check Response matches subscription
     ${template}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
     ${subscription}=    evaluate    json.loads('''${body}''')    json
     Should Be Equal    ${response['body']['callbackUri']}    ${subscription['callbackUri']}
 
@@ -751,7 +751,7 @@ Check Postcondition Subscription Resource Returned in Location Header Is Availab
     Validate Json    PkgmSubscription.schema.json    ${result}
     Log    Validated PkgmSubscription schema
     ${template}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
     ${subscription}=    evaluate    json.loads('''${body}''')    json
     Should Be Equal    ${result['callbackUri']}    ${subscription['callbackUri']}
     Log    Validated Issued subscription is same as original
@@ -873,7 +873,7 @@ Check Notification Endpoint
 Check HTTP Response Body Matches the Subscription
     Log    Check Response matches subscription
     ${template}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
     ${subscription}=    evaluate    json.loads('''${body}''')    json
     Should Be Equal As Strings    ${response['body']['callbackUri']}    ${subscription['callbackUri']}
     
-- 
GitLab


From d506d7cc5897c8433da959c235a073a05303778c Mon Sep 17 00:00:00 2001
From: zulfiqar <sana.zulfiqar@xflowresearch.com>
Date: Wed, 20 Jan 2021 08:22:44 +0100
Subject: [PATCH 239/322] Descriptor checks added for 7.3.1.1.1

---
 .../VnfLcmMntOperationKeywords.robot          | 171 ++++++++++++++----
 .../environment/variables.txt                 |  27 ++-
 2 files changed, 156 insertions(+), 42 deletions(-)

diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index e9baab89a..7581de58c 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -8,7 +8,8 @@ Library    BuiltIn
 Library    JSONLibrary
 Library    Collections
 Library    JSONSchemaLibrary    schemas/
-Variables    descriptors/SOL001/vnf-b-1_VNF.yaml
+Variables    descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
+Variables    descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
 
 *** Keywords ***
 Get Vnf Instance 
@@ -371,9 +372,9 @@ POST Create a new vnfInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Instance
+    Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File
     ${template}=    Get File    jsons/createVnfRequest.json
-    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfProvider=${provider}    vnfProductName=${product_name}    vnfSoftwareVersion=${software_version}    vnfdVersion= ${descriptor_version} 
+    ${body}=        Format String   ${template}     vnfdId=${Descriptor_ID}    vnfProvider=${Provider}    vnfProductName=${Product_Name}    vnfSoftwareVersion=${Software_Version}    vnfdVersion= ${Descriptor_Version} 
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
@@ -1200,46 +1201,144 @@ Check HTTP Response Body vnfInstance content against VNF Descriptor
     Run Keyword If    ${check_descriptors} == 1    Check Individual VNF Instance Content
     
 Check Individual VNF Instance Content    
-    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001    ELSE    Parse SOL006
+    PARSE the Descriptor File
+    Match the VNF Instance Response Attributes with Descriptors
     
-Parse SOL001
-    Get key for VNF Descriptor
+PARSE the Descriptor File
+    Run Keyword If  '${descriptorType}'=='SOL001'    Fetch Information from SOL001 descriptor file    ELSE    Fetch Information from SOL006 descriptor file
     
-    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
-    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
-    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
-    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
-    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
-    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
+Fetch Information from SOL001 descriptor file
+    @{VDU_labels}=    Create List
+    @{VNF_labels}=    Create List
+    @{VirtualLink_labels}=    Create List
+    @{CP_labels}=    Create List
+    @{Storage_labels}=    Create List
+    FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
+        ${key_type}=    Get Variable Value    ${topology_template.node_templates.${key}.type}
+        ${VDU_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}   ${tosca_type_VDU_compute}
+        ${VNF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_VNF}
+        ${Link_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_virtual_link}
+        ${VDUcp_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_VDU_cp}
+        ${Storage_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_storage}
+        Run Keyword If    ${VDU_check}    Append To List    ${VDU_labels}    ${key}
+        Run Keyword If    ${VNF_check}    Append To List    ${VNF_labels}    ${key}
+        Run Keyword If    ${VNF_check}    Get VNF Attributes from SOL001    ${key}            
+        Run Keyword If    ${Link_check}    Append To List    ${VirtualLink_labels}    ${key}
+        Run Keyword If    ${VDUcp_check}    Append To List    ${CP_labels}    ${key}
+        Run Keyword If    ${Storage_check}    Append To List    ${Storage_labels}    ${key}
+    END
+    Set Global Variable    @{VDU_IDs}    @{VDU_labels}
+    Set Global Variable    @{VNF_IDs}    @{VNF_labels}
+    Set Global Variable    @{VirtualLink_IDs}    @{VirtualLink_labels}
+    Set Global Variable    @{CP_IDs}    @{CP_labels}
+    Set Global Variable    @{Storage_IDs}    @{Storage_labels}
+
+Get VNF Attributes from SOL001
+     [Arguments]    ${VNF_label}
+    ${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}
+    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.software_version}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.descriptor_version}
+    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.flavour_id}
     
-    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${descriptor_id}
-    Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${provider}
-    Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${product_name}
-    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}
-    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
-    Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['flavourId']}    ${flavour_id}
+    Set Global Variable    ${Descriptor_ID}    ${descriptor_id}
+    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    ${Flavour_ID}    ${flavour_id}
+
+
+Fetch Information from SOL006 descriptor file
+    ${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']}
+    ${software_version}=    Get Variable Value    ${nfv.vnfd[0]['software-version']}
+    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}    
+    ${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']}
+    ${instantiation_levels}=    Get Length    ${nfv.vnfd[0].df['instantiation-level']}    
+    FOR    ${key}    IN    @{nfv.vnfd[0].keys()}
+        ${VDU_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    vdu
+        Run Keyword If    ${VDU_check}    Get VDU IDs    ${VDUcount}
+        ${extCP_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    ext-cpd
+        Run Keyword If    ${extCP_check}    Get External CP IDs    ${extCP_count}
+        ${virtualLink_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    int-virtual-link-desc
+        Run Keyword If    ${virtualLink_check}    Get Virtual Link IDs   ${virtualLink_count}    
+        ${DF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    df
+        Run Keyword If    ${DF_check}    Get Instantiation Levels    ${instantiation_levels}    
+    END
+    Set Global Variable    ${Descriptor_ID}    ${descriptor_id}
+    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}
     
-Parse SOL006
-    #Log    SOL006 code
-     ${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}
-     ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
-     ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}
-     
-    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${descriptor_id}
-    Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${provider}
-    Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${product_name}
-    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}
-    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
+Get VDU IDs
+    [Arguments]    ${count}    
+    @{VDU_labels}=    Create List
+    ${Storage_labels}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${VDU_labels}    ${nfv.vnfd[0].vdu[${i}]['id']}
+        Append To List    ${Storage_labels}    ${nfv.vnfd[0].vdu[${i}]['virtual-storage-desc']} 
+        Get Internal CPs for each VDU    ${i}   
+    END
+    Set Global Variable    ${VDU_IDs}    ${VDU_labels}
+    Set Global Variable    ${Storage_IDs}    ${Storage_labels}
+            
+Get Internal CPs for each VDU
+    [Arguments]    ${vdu}
+    ${count}=    Get Length    ${nfv.vnfd[0].vdu[${vdu}]['int-cpd']}    
+    ${internal_CPs}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${internal_CPs}    ${nfv.vnfd[0].vdu[${vdu}]['int-cpd'][${i}]['id']} 
+    END
+    Set Global Variable    ${internalCP_IDs}    ${internal_CPs}
     
-Get key for VNF Descriptor
-    FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
-        Log    ${key}
-        ${check1}=    Run Keyword And Return Status    Should Be Equal As Strings    ${topology_template.node_templates.${key}.type}    tosca.nodes.nfv.VNF
-        Run Keyword If     ${check1}     Set Global Variable    ${vnfKey}    ${key}   
+Get External CP IDs
+    [Arguments]    ${count}    
+    @{external_CPs}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${external_CPs}    ${nfv.vnfd[0].ext_cpd[${i}].id} 
     END
+    Set Global Variable    ${externalCP_IDs}    ${external_CPs}
+
+Get Virtual Link IDs
+    [Arguments]    ${count}    
+    ${VirtualLink_labels}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${VirtualLink_labels}    ${nfv.vnfd[0]['int-virtual-link-desc'][${i}]['id']} 
+    END
+    Set Global Variable    ${VirtualLink_IDs}    ${VirtualLink_labels}
+
+Get Instantiation Levels
+    [Arguments]    ${count}
+    @{Instantiation_Levels}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${Instantiation_Levels}    ${nfv.vnfd[0].df['instantiation-level'][${i}]['id']} 
+    END
+    Set Global Variable    ${InstantiationLevel_IDs}    ${Instantiation_Levels}
     
+Match the VNF Instance Response Attributes with Descriptors
+    #Checking Response attributes with VNF Descriptors
+    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${Descriptor_ID}
+    Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${Provider}
+    Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${Product_Name}
+    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${Software_Version}
+    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${Descriptor_Version}
+    Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['flavourId']}    ${Flavour_ID}
+    List Should Contain Value    ${VDU_IDs}    ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo']['vduId']}        
+    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${externalCP_IDs}    ${response['body']['instantiatedVnfInfo']['extCpInfo']['cpdId']}
+    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${internalCP_IDs}    ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo']['vnfcCpInfo']['cpdId']}
+    Run Keyword If  '${descriptorType}'=='SOL001'    List Should Contain Value    @{CP_IDs}    ${response['body']['instantiatedVnfInfo']['extCpInfo']['cpdId']}
+    Run Keyword If  '${descriptorType}'=='SOL001'    List Should Contain Value    @{CP_IDs}    ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo']['vnfcCpInfo']['cpdId']}
+    List Should Contain value    ${Storage_IDs}    ${response['body']['instantiatedVnfInfo']['virtualStorageResourceInfo']['virtualStorageDescId']}
+    List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['instantiatedVnfInfo']['extManagedVirtualLinkInfo']['vnfVirtualLinkDescId']}
+
+    
+
 Check HTTP Response Body of Individual VNF LCM Operation occurrences content against VNF Descriptor
     Run Keyword If    ${check_descriptors} == 1    Check Individual VNF LCM Operation Occurence Content
     
diff --git a/SOL003/VNFLifecycleManagement-API/environment/variables.txt b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
index cb28b2f2a..9d110b13a 100644
--- a/SOL003/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
@@ -100,11 +100,26 @@ ${scaleOutResponse}
 ${callbackResp}    localhost
 
 ${descriptorType}    SOL001
-${vnfKey}    {}
 ${check_descriptors}	1
 
-${descriptor_id}    
-${provider}    
-${product_name}    
-${software_version}    
-${descriptor_version}
\ No newline at end of file
+${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute
+${tosca_type_VNF}    tosca.nodes.nfv.VNF
+${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
+${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
+${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage
+ 
+@{VDU_IDs}
+@{VNF_IDs}
+@{virtualLink_IDs}
+@{CP_IDs}
+@{Storage_IDs}
+@{internalCP_IDs}
+@{externalCP_IDs}
+@{InstantiationLevel_IDs}
+
+${Descriptor_ID}
+${Provider}
+${Product_Name}
+${Software_Version}
+${Descriptor_Version}
+${Flavour_ID}
\ No newline at end of file
-- 
GitLab


From 2e63adf7930cf42ede64a26980749de54e25772f Mon Sep 17 00:00:00 2001
From: zulfiqar <sana.zulfiqar@xflowresearch.com>
Date: Wed, 20 Jan 2021 09:54:56 +0100
Subject: [PATCH 240/322] Descriptor checks added for 7.3.1.2.4 and 7.3.1.6.1-2

---
 .../VnfLcmMntOperationKeywords.robot          |  24 +--
 ...06_reference_tst010_vnf_b_2vdu_SOL006.yaml | 164 +++++++++---------
 2 files changed, 89 insertions(+), 99 deletions(-)

diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index 7581de58c..ddcee119d 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -333,12 +333,13 @@ POST Change VNF deployment flavour
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to Change VNF Flavour
+    Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File
     ${template}=    Get File    jsons/changeVnfFlavourRequest.json
-    ${body}=        Format String   ${template}     newFlavourId=${newFlavourId}
+    ${body}=        Format String   ${template}     newFlavourId=${Flavour_ID}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_flavour    ${body} 
     ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}  	 
+	Set Global Variable    ${response}    ${outputResponse}	 
+
 GET Change VNF deployment flavour
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
@@ -504,9 +505,9 @@ PATCH individual vnfInstance
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE_PATCH}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Instance
+    Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File
     ${template}=    Get File    jsons/patchBodyRequest.json
-    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfdVersion= ${descriptor_version}
+    ${body}=        Format String   ${template}     vnfdId=${Descriptor_ID}    vnfdVersion= ${Descriptor_Version}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}    ${body}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -1337,8 +1338,6 @@ Match the VNF Instance Response Attributes with Descriptors
     List Should Contain value    ${Storage_IDs}    ${response['body']['instantiatedVnfInfo']['virtualStorageResourceInfo']['virtualStorageDescId']}
     List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['instantiatedVnfInfo']['extManagedVirtualLinkInfo']['vnfVirtualLinkDescId']}
 
-    
-
 Check HTTP Response Body of Individual VNF LCM Operation occurrences content against VNF Descriptor
     Run Keyword If    ${check_descriptors} == 1    Check Individual VNF LCM Operation Occurence Content
     
@@ -1376,13 +1375,4 @@ Parse SOL006 VNF Instance
     ${product_name}=    Get Variable Value    ${nfv.vnfd[0].product-name}
     ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
     ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version} 
-    
-Add VNF Descriptor Content to Change VNF Flavour
-    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 Change VNF Flavour    ELSE    Parse SOL006 Change VNF Flavour
-    
-Parse SOL001 Change VNF Flavour
-    Get key for VNF Descriptor
-    ${newFlavourId}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
-    
-Parse SOL006 Change VNF Flavour
-    Log    flavour id is not present in SOL006 descriptors
\ No newline at end of file
+    
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml b/SOL003/VNFLifecycleManagement-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml
index 0ea9820f0..d902779a2 100644
--- a/SOL003/VNFLifecycleManagement-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml
+++ b/SOL003/VNFLifecycleManagement-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml
@@ -2,136 +2,136 @@ nfv:
   vnfd:
     - id: VNF-B-2vdu
       provider: ETSI TST WG
-      product_name: TST010 reference VNF-B with 2 VDUs
-      software_version: '2.2'
+      product-name: TST010 reference VNF-B with 2 VDUs
+      software-version: '2.2'
       version: '2.2'
-      vnfm_info: ETSI VNFM
+      vnfm-info: ETSI VNFM
       vdu:
         - id: vdu-b-1
           name: VNF-B VDU 1
-          int_cpd:
+          int-cpd:
            - id: left
-             layer_protocol: ethernet
+             layer-protocol: ethernet
            - id: management
-             layer_protocol: ethernet
+             layer-protocol: ethernet
            - id: internal
-             layer_protocol: ethernet
-             int_virtual_link_desc: internal-vl
-          virtual_compute_desc: vdu-b-1-vcd
-          virtual_storage_desc: vdu-b-1-vsd
-          sw_image_desc: vdu-b-1-image
+             layer-protocol: ethernet
+             int-virtual-link-desc: internal-vl
+          virtual-compute-desc: vdu-b-1-vcd
+          virtual-storage-desc: vdu-b-1-vsd
+          sw-image-desc: vdu-b-1-image
         - id: vdu-b-2
           name: VNF-B VDU 2
-          int_cpd:
+          int-cpd:
            - id: right
-             layer_protocol: ethernet
+             layer-protocol: ethernet
            - id: management
-             layer_protocol: ethernet
+             layer-protocol: ethernet
            - id: internal
-             layer_protocol: ethernet
-             int_virtual_link_desc: internal-vl
-          virtual_compute_desc: vdu-b-2-vcd
-          virtual_storage_desc: vdu-b-2-vsd
-          sw_image_desc: vdu-b-2-image
-      virtual_compute_desc:
+             layer-protocol: ethernet
+             int-virtual-link-desc: internal-vl
+          virtual-compute-desc: vdu-b-2-vcd
+          virtual-storage-desc: vdu-b-2-vsd
+          sw-image-desc: vdu-b-2-image
+      virtual-compute-desc:
         id: vdu-b-1-vcd
-        virtual_memory:
+        virtual-memory:
           size: '4.0'
-        virtual_cpu:
-          num_virtual_cpu: '2'
-      virtual_storage_desc:
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
         id: vdu-b-1-vsd
-        type_of_storage: root-storage
-        size_of_storage: '0'
-      sw_image_desc:
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
         id: vdu-b-1-image
         name: VNF-B image
         version: '1.1'
         checksum:
           algorithm: sha-224
           hash: somehashfortst010
-        container_format: bare
-        disk_format: qcow2
-        min_disk: '1'
-        min_ram: '2.0'
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
         size: '1'
         image: 'http://someurl.com/VNF-B.qcow2'
-      virtual_compute_desc:
+      virtual-compute-desc:
         id: vdu-b-2-vcd
-        virtual_memory:
+        virtual-memory:
           size: '6.0'
-        virtual_cpu:
-          num_virtual_cpu: '2'
-      virtual_storage_desc:
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
         id: vdu-b-2-vsd
-        type_of_storage: root-storage
-        size_of_storage: '0'
-      sw_image_desc:
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
         id: vdu-b-2-image
         name: VNF-B-2 image
         version: '1.1'
         checksum:
           algorithm: sha-224
           hash: somehashfortst010
-        container_format: bare
-        disk_format: qcow2
-        min_disk: '1'
-        min_ram: '2.0'
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
         size: '1'
         image: 'http://someurl.com/VNF-B-2.qcow2'
-      int_virtual_link_desc:
+      int-virtual-link-desc:
         - id: internal-vl
           flavour:
             id: internal-vl-flavour
             qos:
               latency: '1'
-              packet_delay_variation: '1'
-              packet_loss_ratio: '0.05'
-          connectivity_type:
-            layer_protocol: ethernet     
-      ext_cpd:
+              packet-delay-variation: '1'
+              packet-loss-ratio: '0.05'
+          connectivity-type:
+            layer-protocol: ethernet     
+      ext-cpd:
         - id: ext-b-left
-          int_cpd:
-            vdu_id: vdu-b-1
+          int-cpd:
+            vdu-id: vdu-b-1
             cpd: left
-          layer_protocol: ethernet
+          layer-protocol: ethernet
         - id: management
-          int_cpd:
-            vdu_id: vdu-b-1
+          int-cpd:
+            vdu-id: vdu-b-1
             cpd: management
-          layer_protocol: ethernet
+          layer-protocol: ethernet
         - id: ext-b-right
-          int_cpd:
-            vdu_id: vdu-b-2
+          int-cpd:
+            vdu-id: vdu-b-2
             cpd: right
-          layer_protocol: ethernet
+          layer-protocol: ethernet
       df:
         id: normal
-        vdu_profile:
+        vdu-profile:
           - id: vdu-b-1
-            min_number_of_instances: '1'
-            max_number_of_instances: '2'
+            min-number-of-instances: '1'
+            max-number-of-instances: '2'
           - id: vdu-b-2
-            min_number_of_instances: '1'
-            max_number_of_instances: '4'          
-        instantiation_level:
+            min-number-of-instances: '1'
+            max-number-of-instances: '4'          
+        instantiation-level:
           - id: double
-            vdu_level:
-              - vdu_id: vdu-b-1
-                number_of_instances: '2'
-              - vdu_id: vdu-b-2
-                number_of_instances: '2'
+            vdu-level:
+              - vdu-id: vdu-b-1
+                number-of-instances: '2'
+              - vdu-id: vdu-b-2
+                number-of-instances: '2'
           - id: single
-            vdu_level:
-              - vdu_id: vdu-b-1
-                number_of_instances: '1'
-              - vdu_id: vdu-b-2
-                number_of_instances: '1'
-        default_instantiation_level: single
-        lcm_operations_configuration:
-          scale_vnf_to_level_op_config:
-            arbitrary_target_levels_supported: 'true'
-          terminate_vnf_op_config:
-            min_graceful_termination: '1'
-          operate_vnf_op_config:
-            min_graceful_stop_timeout: '1'
\ No newline at end of file
+            vdu-level:
+              - vdu-id: vdu-b-1
+                number-of-instances: '1'
+              - vdu-id: vdu-b-2
+                number-of-instances: '1'
+        default-instantiation-level: single
+        lcm-operations-configuration:
+          scale-vnf-to-level-op-config:
+            arbitrary-target-levels-supported: 'true'
+          terminate-vnf-op-config:
+            min-graceful-termination: '1'
+          operate-vnf-op-config:
+            min-graceful-stop-timeout: '1'
\ No newline at end of file
-- 
GitLab


From 46830e431c1a18a058d9808f16e53294f919ee69 Mon Sep 17 00:00:00 2001
From: zulfiqar <sana.zulfiqar@xflowresearch.com>
Date: Wed, 20 Jan 2021 15:13:46 +0100
Subject: [PATCH 241/322] Descriptor checks added in 7.3.1.12.2

---
 .../VnfLcmMntOperationKeywords.robot          | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index ddcee119d..b45510731 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -1342,21 +1342,18 @@ Check HTTP Response Body of Individual VNF LCM Operation occurrences content aga
     Run Keyword If    ${check_descriptors} == 1    Check Individual VNF LCM Operation Occurence Content
     
 Check Individual VNF LCM Operation Occurence Content
-    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 VNF LCM    ELSE    Parse SOL006 VNF LCM
+    PARSE the Descriptor File
+    Match the VNF LCM Operation Occurence Response Attributes with Descriptors
     
-Parse SOL001 Individual VNF LCM
-    Get key for VNF Descriptor
+Match the VNF LCM Operation Occurence Response Attributes with Descriptors
+    #Checking Response attributes with VNF Descriptors
+    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${Descriptor_ID}
+    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${Descriptor_Version}
+    List Should Contain Value    ${VDU_IDs}    ${response['body']['resourceChanges']['AffectedVnfc']['vduId']}
+    List Should Contain value    ${Storage_IDs}    ${response['body']['resourceChanges']['affectedVirtualStorages']['virtualStorageDescId']}
+    List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['resourceChanges']['affectedVirtualLinks']['vnfVirtualLinkDescId']}
     
-    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
-    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
-    Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdId']}    ${descriptor_id}
-    Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdVersion']}    ${descriptor_version}
     
-Parse SOL006 Individual VNF LCM
-    ${descriptor_id}=    Get Variable Value    ${nfv.vnfd[0].id}
-    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}
-    Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdId']}    ${descriptor_id}
-    Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdVersion']}    ${descriptor_version}
          
 Add VNF Descriptor Content to VNF Instance
     Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 VNF Instance    ELSE    Parse SOL006 VNF Instance
-- 
GitLab


From 480667a6a4ac7ada25e97c9ad83d312bc32212fb Mon Sep 17 00:00:00 2001
From: zulfiqar <sana.zulfiqar@xflowresearch.com>
Date: Wed, 20 Jan 2021 16:01:10 +0100
Subject: [PATCH 242/322] Descriptor checks added for 7.3.3.1.1

---
 .../IndividualVNFPackage.robot                |   1 +
 .../VNFPackageManagementKeywords.robot        |  90 +++++++-----
 ...1_reference_tst010_vnf_b_2vdu_SOL001.yaml} |  90 ++++++------
 ...06_reference_tst010_vnf_b_2vdu_SOL006.yaml | 137 ++++++++++++++++++
 .../reference_tst010_vnf_b_2df_SOL006.yaml    | 105 --------------
 .../environment/variables.txt                 |  14 +-
 6 files changed, 252 insertions(+), 185 deletions(-)
 rename SOL003/VNFPackageManagement-API/descriptors/SOL001/{vnf-b-1_VNF.yaml => SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml} (93%)
 create mode 100644 SOL003/VNFPackageManagement-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml
 delete mode 100644 SOL003/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml

diff --git a/SOL003/VNFPackageManagement-API/IndividualVNFPackage.robot b/SOL003/VNFPackageManagement-API/IndividualVNFPackage.robot
index 67fda5b2c..875b06bf8 100644
--- a/SOL003/VNFPackageManagement-API/IndividualVNFPackage.robot
+++ b/SOL003/VNFPackageManagement-API/IndividualVNFPackage.robot
@@ -5,6 +5,7 @@ Resource          VNFPackageManagementKeywords.robot
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
 
+
 *** Test Cases ***
 GET Individual VNF Package
     [Documentation]    Test ID: 7.3.3.2.1
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 009ef0e6d..7dd71a838 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -9,7 +9,8 @@ Library    Collections
 Library    JSONSchemaLibrary    schemas/
 Library    Process
 Library    String
-Variables    descriptors/SOL001/vnf-b-1_VNF.yaml
+Variables    descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
+Variables    descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
 
 *** Keywords ***
 Get all VNF Packages
@@ -1530,42 +1531,65 @@ Check HTTP Response Body of Individual VNF Package content against VNF Descripto
     Run Keyword If    ${check_descriptors} == 1    Check Individual VNF Package Content
     
 Check Individual VNF Package Content
-    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 VNF Package    ELSE    Parse SOL006 VNF Package    
-    
-Parse SOL001 VNF Package
-    Get key for VNF Descriptor
-    
-    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
-    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
-    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
-    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
-    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
-    
-    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${descriptor_id}
-    Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${provider}
-    Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${product_name}
-    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}
-    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
-    
-Get key for VNF Descriptor
+    PARSE the Descriptor File
+    Match the VNF Package Response Attributes with Descriptors
+    
+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
+    @{VDU_labels}=    Create List
+    @{VNF_labels}=    Create List
+    @{VirtualLink_labels}=    Create List
+    @{CP_labels}=    Create List
+    @{Storage_labels}=    Create List
     FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
-        Log    ${key}
-        ${check1}=    Run Keyword And Return Status    Should Be Equal As Strings    ${topology_template.node_templates.${key}.type}    tosca.nodes.nfv.VNF
-        Run Keyword If     ${check1}     Set Global Variable    ${vnfKey}    ${key}   
+        ${key_type}=    Get Variable Value    ${topology_template.node_templates.${key}.type}
+
+        ${VNF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_VNF}
+        Run Keyword If    ${VNF_check}    Append To List    ${VNF_labels}    ${key}
+        Run Keyword If    ${VNF_check}    Get VNF Attributes from SOL001    ${key}            
     END
-    
-Parse SOL006 VNF Package
+    Set Global Variable    @{VNF_IDs}    @{VNF_labels}
+
+    
+Get VNF Attributes from SOL001
+     [Arguments]    ${VNF_label}
+    ${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}
+    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.software_version}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.descriptor_version}
+    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.flavour_id}
+    
+    Set Global Variable    ${Descriptor_ID}    ${descriptor_id}
+    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    ${Flavour_ID}    ${flavour_id}
+    
+Fetch Information from SOL006 descriptor file
     ${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}
-    ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
-    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}
-     
-    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${descriptor_id}
-    Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${provider}
-    Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${product_name}
-    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}
-    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
+    ${product_name}=    Get Variable Value    ${nfv.vnfd[0]['product-name']}
+    ${software_version}=    Get Variable Value    ${nfv.vnfd[0]['software-version']}
+    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}    
+
+    Set Global Variable    ${Descriptor_ID}    ${descriptor_id}
+    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}
+    
+Match the VNF Package Response Attributes with Descriptors
+    #Checking Response attributes with VNF Descriptors
+    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${Descriptor_ID}
+    Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${Provider}
+    Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${Product_Name}
+    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${Software_Version}
+    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${Descriptor_Version}
+
     
 Check HTTP Response Body of Individual Subscription content against VNF Descriptor
     Run Keyword If    ${check_descriptors} == 1    Check Individual VNF Subscription Content
diff --git a/SOL003/VNFPackageManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml b/SOL003/VNFPackageManagement-API/descriptors/SOL001/SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml
similarity index 93%
rename from SOL003/VNFPackageManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
rename to SOL003/VNFPackageManagement-API/descriptors/SOL001/SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml
index 1712e2b33..e9159106a 100644
--- a/SOL003/VNFPackageManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
+++ b/SOL003/VNFPackageManagement-API/descriptors/SOL001/SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml
@@ -15,44 +15,6 @@ topology_template:
       virtual_link_right:
         [right, virtual_link_right]
   node_templates:
-    VDU-B-1:
-      type: "tosca.nodes.nfv.Vdu.Compute"
-      properties:
-        name: "vdu-b-1-vcd"
-        descriptor: "Description of VDU-B-1"
-        vdu_profile:
-          min_number_of_instances: 1
-          max_number_of_instances: 2
-      capabilities:
-        virtual_compute:
-          properties:
-            virtual_memory:
-              virtual_mem_size: 4096
-              numa_enabled: false
-            virtual_cpu:
-              num_virtual_cpu: 2
-      requirements:
-        virtual_storage:
-        - "vdu-b-1-vsd"
-    VDU-B-2:
-      type: "tosca.nodes.nfv.Vdu.Compute"
-      properties:
-        name: "vdu-b-2-vcd"
-        descriptor: "Description of VDU-B-2"
-        vdu_profile:
-          min_number_of_instances: 1
-          max_number_of_instances: 4
-      capabilities:
-        virtual_compute:
-          properties:
-            virtual_memory:
-              virtual_mem_size: 6144
-              numa_enabled: false
-            virtual_cpu:
-              num_virtual_cpu: 2
-      requirements:
-        virtual_storage:
-        - "vdu-b-2-vsd"
     right:
       type: "tosca.nodes.nfv.VduCp"
       properties:
@@ -75,7 +37,7 @@ topology_template:
         virtual_link_left:
         virtual_binding: VDU-B-1
     internal_vl:
-      type: tosca.nodes.nfv.VnfVirtualLink
+      type: "tosca.nodes.nfv.VnfVirtualLink"
       properties:
         connectivity_type:
           layer_protocols: [ ipv4 ]
@@ -88,20 +50,20 @@ topology_template:
             root: 10000
             leaf: 10000
     internal_vdu_b_1_cp:
-      type: tosca.nodes.nfv.VduCp
+      type: "tosca.nodes.nfv.VduCp"
       properties:
         order: 2
       requirements:
         - virtual_binding: VDU-B-1
         - virtual_link: internal_vl
     internal_vdu_b_2_cp:
-      type: tosca.nodes.nfv.VduCp
+      type: "tosca.nodes.nfv.VduCp"
       properties:
         order: 0
       requirements:
         - virtual_binding: VDU-B-2
         - virtual_link: internal_vl
-    vdu-b-1-vsd:
+    vdu_b_1_vsd:
       type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
       properties:
         virtual_block_storage_data:
@@ -120,16 +82,16 @@ topology_template:
           size: '1'
       artifacts:
         sw_image:
-          type: tosca.artifacts.nfv.SwImage
+          type: "tosca.artifacts.nfv.SwImage"
           file: vdu-b-1.qcow2
-    vdu-b-1-vsd:
+    vdu_b_2_vsd:
       type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
       properties:
         virtual_block_storage_data:
           size_of_storage: 20
           rdma_enabled: false
         sw_image_data:
-          name: "vdu-b-1 image"
+          name: "vdu-b-2 image"
           version: "1.1"
           checksum: 
             algorithm: "sha-224"
@@ -166,3 +128,41 @@ topology_template:
                 implementation: terminate-example.yaml
               operate:
                 implementation: operate-example.yaml
+    VDU_B_1:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-1-vcd"
+        descriptor: "Description of VDU-B-1"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 2
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 4096
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-1-vsd"
+    VDU_B_2:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-2-vcd"
+        descriptor: "Description of VDU-B-2"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 4
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 6144
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-2-vsd"                
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml b/SOL003/VNFPackageManagement-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml
new file mode 100644
index 000000000..d902779a2
--- /dev/null
+++ b/SOL003/VNFPackageManagement-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml
@@ -0,0 +1,137 @@
+nfv:
+  vnfd:
+    - id: VNF-B-2vdu
+      provider: ETSI TST WG
+      product-name: TST010 reference VNF-B with 2 VDUs
+      software-version: '2.2'
+      version: '2.2'
+      vnfm-info: ETSI VNFM
+      vdu:
+        - id: vdu-b-1
+          name: VNF-B VDU 1
+          int-cpd:
+           - id: left
+             layer-protocol: ethernet
+           - id: management
+             layer-protocol: ethernet
+           - id: internal
+             layer-protocol: ethernet
+             int-virtual-link-desc: internal-vl
+          virtual-compute-desc: vdu-b-1-vcd
+          virtual-storage-desc: vdu-b-1-vsd
+          sw-image-desc: vdu-b-1-image
+        - id: vdu-b-2
+          name: VNF-B VDU 2
+          int-cpd:
+           - id: right
+             layer-protocol: ethernet
+           - id: management
+             layer-protocol: ethernet
+           - id: internal
+             layer-protocol: ethernet
+             int-virtual-link-desc: internal-vl
+          virtual-compute-desc: vdu-b-2-vcd
+          virtual-storage-desc: vdu-b-2-vsd
+          sw-image-desc: vdu-b-2-image
+      virtual-compute-desc:
+        id: vdu-b-1-vcd
+        virtual-memory:
+          size: '4.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-1-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-1-image
+        name: VNF-B image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B.qcow2'
+      virtual-compute-desc:
+        id: vdu-b-2-vcd
+        virtual-memory:
+          size: '6.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-2-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-2-image
+        name: VNF-B-2 image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B-2.qcow2'
+      int-virtual-link-desc:
+        - id: internal-vl
+          flavour:
+            id: internal-vl-flavour
+            qos:
+              latency: '1'
+              packet-delay-variation: '1'
+              packet-loss-ratio: '0.05'
+          connectivity-type:
+            layer-protocol: ethernet     
+      ext-cpd:
+        - id: ext-b-left
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: left
+          layer-protocol: ethernet
+        - id: management
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: management
+          layer-protocol: ethernet
+        - id: ext-b-right
+          int-cpd:
+            vdu-id: vdu-b-2
+            cpd: right
+          layer-protocol: ethernet
+      df:
+        id: normal
+        vdu-profile:
+          - id: vdu-b-1
+            min-number-of-instances: '1'
+            max-number-of-instances: '2'
+          - id: vdu-b-2
+            min-number-of-instances: '1'
+            max-number-of-instances: '4'          
+        instantiation-level:
+          - id: double
+            vdu-level:
+              - vdu-id: vdu-b-1
+                number-of-instances: '2'
+              - vdu-id: vdu-b-2
+                number-of-instances: '2'
+          - id: single
+            vdu-level:
+              - vdu-id: vdu-b-1
+                number-of-instances: '1'
+              - vdu-id: vdu-b-2
+                number-of-instances: '1'
+        default-instantiation-level: single
+        lcm-operations-configuration:
+          scale-vnf-to-level-op-config:
+            arbitrary-target-levels-supported: 'true'
+          terminate-vnf-op-config:
+            min-graceful-termination: '1'
+          operate-vnf-op-config:
+            min-graceful-stop-timeout: '1'
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml b/SOL003/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
deleted file mode 100644
index 4b84be92b..000000000
--- a/SOL003/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
+++ /dev/null
@@ -1,105 +0,0 @@
-nfv:
-  vnfd:
-    - id: VNF-B-2df
-      provider: ETSI TST WG
-      product-name: TST010 reference VNF-B with 2 DFs
-      software-version: '2.1'
-      version: '2.1'
-      vnfm-info: ETSI VNFM
-      vdu:
-        id: vdu-b-1
-        name: VNF-B VDU 1
-        int-cpd:
-          - id: left
-            layer-protocol: ethernet
-          - id: management
-            layer-protocol: ethernet
-          - id: right
-            layer-protocol: ethernet
-        virtual-compute-desc: vdu-b-1-vcd
-        virtual-storage-desc: vdu-b-1-vsd
-        sw-image-desc: vdu-b-1-image
-      virtual-compute-desc:
-        id: vdu-b-1-vcd
-        virtual-memory:
-          size: '4.0'
-        virtual-cpu:
-          num-virtual-cpu: '2'
-      virtual-storage-desc:
-        id: vdu-b-1-vsd
-        type-of-storage: root-storage
-        size-of-storage: '0'
-      sw-image-desc:
-        id: vdu-b-1-image
-        name: VNF-B image
-        version: '1.1'
-        checksum:
-          algorithm: sha-224
-          hash: somehashfortst010
-        container-format: bare
-        disk-format: qcow2
-        min-disk: '1'
-        min-ram: '2.0'
-        size: '1'
-        image: 'http://someurl.com/VNF-B.qcow2'
-      ext-cpd:
-        - id: ext-b-left
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: left
-          layer-protocol: ethernet
-        - id: management
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: management
-          layer-protocol: ethernet
-        - id: ext-b-right
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: right
-          layer-protocol: ethernet
-      df:
-        - id: small
-          vdu-profile:
-            id: vdu-b-1
-            min-number-of-instances: '1'
-            max-number-of-instances: '2'
-          instantiation-level:
-            - id: double
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '2'
-            - id: single
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '1'
-          default-instantiation-level: single
-          lcm-operations-configuration:
-            scale-vnf-to-level-op-config:
-              arbitrary-target-levels-supported: 'true'
-            terminate-vnf-op-config:
-              min-graceful-termination: '1'
-            operate-vnf-op-config:
-              min-graceful-stop-timeout: '1'
-        - id: big
-          vdu-profile:
-            id: vdu-b-1
-            min-number-of-instances: '1'
-            max-number-of-instances: '4'
-          instantiation-level:
-            - id: double
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '2'
-            - id: triple
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '3'
-          default-instantiation-level: double
-          lcm-operations-configuration:
-            scale-vnf-to-level-op-config:
-              arbitrary-target-levels-supported: 'true'
-            terminate-vnf-op-config:
-              min-graceful-termination: '1'
-            operate-vnf-op-config:
-              min-graceful-stop-timeout: '1'
diff --git a/SOL003/VNFPackageManagement-API/environment/variables.txt b/SOL003/VNFPackageManagement-API/environment/variables.txt
index e2621e31d..d45836b12 100644
--- a/SOL003/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL003/VNFPackageManagement-API/environment/variables.txt
@@ -90,5 +90,15 @@ ${VAR_SEPERATOR}    &
 ${callbackResp}    localhost
 
 ${descriptorType}    SOL001
-${vnfKey}    {}
-${check_descriptors}	1
\ No newline at end of file
+${check_descriptors}	1
+
+${tosca_type_VNF}    tosca.nodes.nfv.VNF
+ 
+@{VNF_IDs}
+
+${Descriptor_ID}
+${Provider}
+${Product_Name}
+${Software_Version}
+${Descriptor_Version}
+${Flavour_ID}
-- 
GitLab


From 73e16fb84f0ec70bb720fc2d1cb03530fafebbbb Mon Sep 17 00:00:00 2001
From: zulfiqar <sana.zulfiqar@xflowresearch.com>
Date: Wed, 20 Jan 2021 16:48:04 +0100
Subject: [PATCH 243/322] Descriptor checks added in 7.3.3.7.1

---
 .../VnfLcmMntOperationKeywords.robot          |  2 +-
 .../VNFPackageManagementKeywords.robot        | 44 +++++--------------
 2 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index b45510731..c9758467c 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -1327,7 +1327,7 @@ Match the VNF Instance Response Attributes with Descriptors
     Should Be Equal As Strings    ${response['body']['vnfdId']}    ${Descriptor_ID}
     Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${Provider}
     Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${Product_Name}
-    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${Software_Version}
+    Should Be Equal As Strings    ${response['body']['vnfSoftwareVersion']}    ${Software_Version}
     Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${Descriptor_Version}
     Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['flavourId']}    ${Flavour_ID}
     List Should Contain Value    ${VDU_IDs}    ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo']['vduId']}        
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 7dd71a838..2775dba47 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -1538,11 +1538,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
-    @{VDU_labels}=    Create List
     @{VNF_labels}=    Create List
-    @{VirtualLink_labels}=    Create List
-    @{CP_labels}=    Create List
-    @{Storage_labels}=    Create List
     FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
         ${key_type}=    Get Variable Value    ${topology_template.node_templates.${key}.type}
 
@@ -1587,7 +1583,7 @@ Match the VNF Package Response Attributes with Descriptors
     Should Be Equal As Strings    ${response['body']['vnfdId']}    ${Descriptor_ID}
     Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${Provider}
     Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${Product_Name}
-    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${Software_Version}
+    Should Be Equal As Strings    ${response['body']['vnfSoftwareVersion']}    ${Software_Version}
     Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${Descriptor_Version}
 
     
@@ -1595,32 +1591,14 @@ Check HTTP Response Body of Individual Subscription content against VNF Descript
     Run Keyword If    ${check_descriptors} == 1    Check Individual VNF Subscription Content
     
 Check Individual VNF Subscription Content
-    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 Package Subscription    ELSE    Parse SOL006 Package Subscription
-    
-Parse SOL001 Package Subscription
-    Get key for VNF Descriptor
-    
-    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
-    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
-    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
-    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
-    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
-    
-    Should Be Equal As Strings    ${response['body']['filter']['vnfdId']}    ${descriptor_id}
-    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProvider']}    ${provider}
-    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['vnfProductName']}    ${product_name}
-    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['versions']['vnfSoftwareVesion']}    ${software_version}
-    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['versions']['vnfdVersion']}    ${descriptor_version}
+    PARSE the Descriptor File
+    Match the VNF subscription Response Attributes with Descriptors
     
-Parse SOL006 Package Subscription
-    ${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}
-    ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
-    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}
-     
-    Should Be Equal As Strings    ${response['body']['filter']['vnfdId']}    ${descriptor_id}
-    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProvider']}    ${provider}
-    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['vnfProductName']}    ${product_name}
-    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['versions']['vnfSoftwareVesion']}    ${software_version}
-    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['versions']['vnfdVersion']}    ${descriptor_version}
\ No newline at end of file
+Match the VNF subscription Response Attributes with Descriptors
+    #Checking Response attributes with VNF Descriptors
+    Should Be Equal As Strings    ${response['body']['filter']['vnfdId']}    ${Descriptor_ID}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProvider']}    ${Provider}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['vnfProductName']}    ${Product_Name}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['versions']['vnfSoftwareVersion']}    ${Software_Version}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['versions']['vnfdVersion']}    ${Descriptor_Version}
+    
\ No newline at end of file
-- 
GitLab


From 2e51b6bd665810f65b2c7811416eefcce6e61ac7 Mon Sep 17 00:00:00 2001
From: zulfiqar <sana.zulfiqar@xflowresearch.com>
Date: Thu, 21 Jan 2021 10:01:10 +0100
Subject: [PATCH 244/322] Descriptor checks added in 7.3.2.2.2

---
 .../IndividualGrant.robot                     | 139 ++++++++++++++++++
 ...1_reference_tst010_vnf_b_2vdu_SOL001.yaml} |  90 ++++++------
 ...06_reference_tst010_vnf_b_2vdu_SOL006.yaml | 137 +++++++++++++++++
 .../reference_tst010_vnf_b_2df_SOL006.yaml    | 105 -------------
 .../environment/variables.txt                 |  26 +++-
 5 files changed, 345 insertions(+), 152 deletions(-)
 rename SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/{vnf-b-1_VNF.yaml => SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml} (93%)
 create mode 100644 SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml
 delete mode 100644 SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml

diff --git a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
index 52b961997..b25baa69a 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
@@ -4,6 +4,8 @@ Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+Variables    descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
+Variables    descriptors/SOL006/reference_tst010_vnf_b_2vdu_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.
@@ -33,6 +35,7 @@ GET an individual grant - Successful
     Get individual grant
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    grant
+    Check HTTP Response Body grant content against VNF Descriptor
     
 GET an individual grant - Process ongoing
     [Tags]    no-synchronous-mode
@@ -160,3 +163,139 @@ Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
     ${schema} =    Catenate    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
+    
+Check HTTP Response Body grant content against VNF Descriptor
+    Run Keyword If    ${check_descriptors} == 1    Check Individual grant Content
+    
+Check Individual grant Content    
+    PARSE the Descriptor File
+    Match the grant Response Attributes with Descriptors
+    
+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
+    @{VDU_labels}=    Create List
+    @{VNF_labels}=    Create List
+    @{VirtualLink_labels}=    Create List
+    @{CP_labels}=    Create List
+    @{Storage_labels}=    Create List
+    FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
+        ${key_type}=    Get Variable Value    ${topology_template.node_templates.${key}.type}
+        ${VDU_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}   ${tosca_type_VDU_compute}
+        ${VNF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_VNF}
+        ${Link_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_virtual_link}
+        ${VDUcp_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_VDU_cp}
+        ${Storage_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_storage}
+        Run Keyword If    ${VDU_check}    Append To List    ${VDU_labels}    ${key}
+        Run Keyword If    ${VNF_check}    Append To List    ${VNF_labels}    ${key}
+        Run Keyword If    ${VNF_check}    Get VNF Attributes from SOL001    ${key}            
+        Run Keyword If    ${Link_check}    Append To List    ${VirtualLink_labels}    ${key}
+        Run Keyword If    ${VDUcp_check}    Append To List    ${CP_labels}    ${key}
+        Run Keyword If    ${Storage_check}    Append To List    ${Storage_labels}    ${key}
+    END
+    Set Global Variable    @{VDU_IDs}    @{VDU_labels}
+    Set Global Variable    @{VNF_IDs}    @{VNF_labels}
+    Set Global Variable    @{VirtualLink_IDs}    @{VirtualLink_labels}
+    Set Global Variable    @{CP_IDs}    @{CP_labels}
+    Set Global Variable    @{Storage_IDs}    @{Storage_labels}
+
+Get VNF Attributes from SOL001
+     [Arguments]    ${VNF_label}
+    ${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}
+    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.software_version}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.descriptor_version}
+    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.flavour_id}
+    
+    Set Global Variable    ${Descriptor_ID}    ${descriptor_id}
+    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    ${Flavour_ID}    ${flavour_id}
+    
+Fetch Information from SOL006 descriptor file
+    ${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']}
+    ${software_version}=    Get Variable Value    ${nfv.vnfd[0]['software-version']}
+    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}    
+    ${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']}
+    ${instantiation_levels}=    Get Length    ${nfv.vnfd[0].df['instantiation-level']}    
+    FOR    ${key}    IN    @{nfv.vnfd[0].keys()}
+        ${VDU_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    vdu
+        Run Keyword If    ${VDU_check}    Get VDU IDs    ${VDUcount}
+        ${extCP_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    ext-cpd
+        Run Keyword If    ${extCP_check}    Get External CP IDs    ${extCP_count}
+        ${virtualLink_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    int-virtual-link-desc
+        Run Keyword If    ${virtualLink_check}    Get Virtual Link IDs   ${virtualLink_count}    
+        ${DF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    df
+        Run Keyword If    ${DF_check}    Get Instantiation Levels    ${instantiation_levels}    
+    END
+    Set Global Variable    ${Descriptor_ID}    ${descriptor_id}
+    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}
+    
+Get VDU IDs
+    [Arguments]    ${count}    
+    @{VDU_labels}=    Create List
+    ${Storage_labels}=    Create List
+    ${Compute_labels}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${VDU_labels}    ${nfv.vnfd[0].vdu[${i}]['id']}
+        Append To List    ${Storage_labels}    ${nfv.vnfd[0].vdu[${i}]['virtual-storage-desc']}
+        Append To List    ${Compute_labels}    ${nfv.vnfd[0].vdu[${i}]['virtual-compute-desc']} 
+        Get Internal CPs for each VDU    ${i}   
+    END
+    Set Global Variable    ${VDU_IDs}    ${VDU_labels}
+    Set Global Variable    ${Storage_IDs}    ${Storage_labels}
+    Set Global Variable    ${Compute_IDs}    ${Compute_labels}
+            
+Get Internal CPs for each VDU
+    [Arguments]    ${vdu}
+    ${count}=    Get Length    ${nfv.vnfd[0].vdu[${vdu}]['int-cpd']}    
+    ${internal_CPs}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${internal_CPs}    ${nfv.vnfd[0].vdu[${vdu}]['int-cpd'][${i}]['id']} 
+    END
+    Set Global Variable    ${internalCP_IDs}    ${internal_CPs}
+    
+Get External CP IDs
+    [Arguments]    ${count}    
+    @{external_CPs}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${external_CPs}    ${nfv.vnfd[0].ext_cpd[${i}].id} 
+    END
+    Set Global Variable    ${externalCP_IDs}    ${external_CPs}
+
+Get Virtual Link IDs
+    [Arguments]    ${count}    
+    ${VirtualLink_labels}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${VirtualLink_labels}    ${nfv.vnfd[0]['int-virtual-link-desc'][${i}]['id']} 
+    END
+    Set Global Variable    ${VirtualLink_IDs}    ${VirtualLink_labels}
+    
+Get Instantiation Levels
+    [Arguments]    ${count}
+    @{Instantiation_Levels}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${Instantiation_Levels}    ${nfv.vnfd[0].df['instantiation-level'][${i}]['id']} 
+    END
+    Set Global Variable    ${InstantiationLevel_IDs}    ${Instantiation_Levels}
+    
+Match the grant Response Attributes with Descriptors
+    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${externalCP_IDs}    ${response['body']['Grant']['extVirtualLinks']['extCps']['cpdId']}
+    Run Keyword If  '${descriptorType}'=='SOL001'    List Should Contain Value    @{CP_IDs}    ${response['body']['Grant']['extVirtualLinks']['extCps']['cpdId']}
+    List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['Grant']['ExtManagedVirtualLinkData']['vnfVirtualLinkDescId']}
+    List Should Contain value    ${Compute_IDs}    ${response['body']['Grant']['vimAssets']['computeResourceFlavours']['vnfdVirtualComputeDescId']}
+    
+
+
+    
diff --git a/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/vnf-b-1_VNF.yaml b/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml
similarity index 93%
rename from SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/vnf-b-1_VNF.yaml
rename to SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml
index 1712e2b33..e9159106a 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/vnf-b-1_VNF.yaml
+++ b/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml
@@ -15,44 +15,6 @@ topology_template:
       virtual_link_right:
         [right, virtual_link_right]
   node_templates:
-    VDU-B-1:
-      type: "tosca.nodes.nfv.Vdu.Compute"
-      properties:
-        name: "vdu-b-1-vcd"
-        descriptor: "Description of VDU-B-1"
-        vdu_profile:
-          min_number_of_instances: 1
-          max_number_of_instances: 2
-      capabilities:
-        virtual_compute:
-          properties:
-            virtual_memory:
-              virtual_mem_size: 4096
-              numa_enabled: false
-            virtual_cpu:
-              num_virtual_cpu: 2
-      requirements:
-        virtual_storage:
-        - "vdu-b-1-vsd"
-    VDU-B-2:
-      type: "tosca.nodes.nfv.Vdu.Compute"
-      properties:
-        name: "vdu-b-2-vcd"
-        descriptor: "Description of VDU-B-2"
-        vdu_profile:
-          min_number_of_instances: 1
-          max_number_of_instances: 4
-      capabilities:
-        virtual_compute:
-          properties:
-            virtual_memory:
-              virtual_mem_size: 6144
-              numa_enabled: false
-            virtual_cpu:
-              num_virtual_cpu: 2
-      requirements:
-        virtual_storage:
-        - "vdu-b-2-vsd"
     right:
       type: "tosca.nodes.nfv.VduCp"
       properties:
@@ -75,7 +37,7 @@ topology_template:
         virtual_link_left:
         virtual_binding: VDU-B-1
     internal_vl:
-      type: tosca.nodes.nfv.VnfVirtualLink
+      type: "tosca.nodes.nfv.VnfVirtualLink"
       properties:
         connectivity_type:
           layer_protocols: [ ipv4 ]
@@ -88,20 +50,20 @@ topology_template:
             root: 10000
             leaf: 10000
     internal_vdu_b_1_cp:
-      type: tosca.nodes.nfv.VduCp
+      type: "tosca.nodes.nfv.VduCp"
       properties:
         order: 2
       requirements:
         - virtual_binding: VDU-B-1
         - virtual_link: internal_vl
     internal_vdu_b_2_cp:
-      type: tosca.nodes.nfv.VduCp
+      type: "tosca.nodes.nfv.VduCp"
       properties:
         order: 0
       requirements:
         - virtual_binding: VDU-B-2
         - virtual_link: internal_vl
-    vdu-b-1-vsd:
+    vdu_b_1_vsd:
       type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
       properties:
         virtual_block_storage_data:
@@ -120,16 +82,16 @@ topology_template:
           size: '1'
       artifacts:
         sw_image:
-          type: tosca.artifacts.nfv.SwImage
+          type: "tosca.artifacts.nfv.SwImage"
           file: vdu-b-1.qcow2
-    vdu-b-1-vsd:
+    vdu_b_2_vsd:
       type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
       properties:
         virtual_block_storage_data:
           size_of_storage: 20
           rdma_enabled: false
         sw_image_data:
-          name: "vdu-b-1 image"
+          name: "vdu-b-2 image"
           version: "1.1"
           checksum: 
             algorithm: "sha-224"
@@ -166,3 +128,41 @@ topology_template:
                 implementation: terminate-example.yaml
               operate:
                 implementation: operate-example.yaml
+    VDU_B_1:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-1-vcd"
+        descriptor: "Description of VDU-B-1"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 2
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 4096
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-1-vsd"
+    VDU_B_2:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-2-vcd"
+        descriptor: "Description of VDU-B-2"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 4
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 6144
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-2-vsd"                
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml b/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml
new file mode 100644
index 000000000..d902779a2
--- /dev/null
+++ b/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml
@@ -0,0 +1,137 @@
+nfv:
+  vnfd:
+    - id: VNF-B-2vdu
+      provider: ETSI TST WG
+      product-name: TST010 reference VNF-B with 2 VDUs
+      software-version: '2.2'
+      version: '2.2'
+      vnfm-info: ETSI VNFM
+      vdu:
+        - id: vdu-b-1
+          name: VNF-B VDU 1
+          int-cpd:
+           - id: left
+             layer-protocol: ethernet
+           - id: management
+             layer-protocol: ethernet
+           - id: internal
+             layer-protocol: ethernet
+             int-virtual-link-desc: internal-vl
+          virtual-compute-desc: vdu-b-1-vcd
+          virtual-storage-desc: vdu-b-1-vsd
+          sw-image-desc: vdu-b-1-image
+        - id: vdu-b-2
+          name: VNF-B VDU 2
+          int-cpd:
+           - id: right
+             layer-protocol: ethernet
+           - id: management
+             layer-protocol: ethernet
+           - id: internal
+             layer-protocol: ethernet
+             int-virtual-link-desc: internal-vl
+          virtual-compute-desc: vdu-b-2-vcd
+          virtual-storage-desc: vdu-b-2-vsd
+          sw-image-desc: vdu-b-2-image
+      virtual-compute-desc:
+        id: vdu-b-1-vcd
+        virtual-memory:
+          size: '4.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-1-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-1-image
+        name: VNF-B image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B.qcow2'
+      virtual-compute-desc:
+        id: vdu-b-2-vcd
+        virtual-memory:
+          size: '6.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-2-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-2-image
+        name: VNF-B-2 image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B-2.qcow2'
+      int-virtual-link-desc:
+        - id: internal-vl
+          flavour:
+            id: internal-vl-flavour
+            qos:
+              latency: '1'
+              packet-delay-variation: '1'
+              packet-loss-ratio: '0.05'
+          connectivity-type:
+            layer-protocol: ethernet     
+      ext-cpd:
+        - id: ext-b-left
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: left
+          layer-protocol: ethernet
+        - id: management
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: management
+          layer-protocol: ethernet
+        - id: ext-b-right
+          int-cpd:
+            vdu-id: vdu-b-2
+            cpd: right
+          layer-protocol: ethernet
+      df:
+        id: normal
+        vdu-profile:
+          - id: vdu-b-1
+            min-number-of-instances: '1'
+            max-number-of-instances: '2'
+          - id: vdu-b-2
+            min-number-of-instances: '1'
+            max-number-of-instances: '4'          
+        instantiation-level:
+          - id: double
+            vdu-level:
+              - vdu-id: vdu-b-1
+                number-of-instances: '2'
+              - vdu-id: vdu-b-2
+                number-of-instances: '2'
+          - id: single
+            vdu-level:
+              - vdu-id: vdu-b-1
+                number-of-instances: '1'
+              - vdu-id: vdu-b-2
+                number-of-instances: '1'
+        default-instantiation-level: single
+        lcm-operations-configuration:
+          scale-vnf-to-level-op-config:
+            arbitrary-target-levels-supported: 'true'
+          terminate-vnf-op-config:
+            min-graceful-termination: '1'
+          operate-vnf-op-config:
+            min-graceful-stop-timeout: '1'
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml b/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
deleted file mode 100644
index 4b84be92b..000000000
--- a/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
+++ /dev/null
@@ -1,105 +0,0 @@
-nfv:
-  vnfd:
-    - id: VNF-B-2df
-      provider: ETSI TST WG
-      product-name: TST010 reference VNF-B with 2 DFs
-      software-version: '2.1'
-      version: '2.1'
-      vnfm-info: ETSI VNFM
-      vdu:
-        id: vdu-b-1
-        name: VNF-B VDU 1
-        int-cpd:
-          - id: left
-            layer-protocol: ethernet
-          - id: management
-            layer-protocol: ethernet
-          - id: right
-            layer-protocol: ethernet
-        virtual-compute-desc: vdu-b-1-vcd
-        virtual-storage-desc: vdu-b-1-vsd
-        sw-image-desc: vdu-b-1-image
-      virtual-compute-desc:
-        id: vdu-b-1-vcd
-        virtual-memory:
-          size: '4.0'
-        virtual-cpu:
-          num-virtual-cpu: '2'
-      virtual-storage-desc:
-        id: vdu-b-1-vsd
-        type-of-storage: root-storage
-        size-of-storage: '0'
-      sw-image-desc:
-        id: vdu-b-1-image
-        name: VNF-B image
-        version: '1.1'
-        checksum:
-          algorithm: sha-224
-          hash: somehashfortst010
-        container-format: bare
-        disk-format: qcow2
-        min-disk: '1'
-        min-ram: '2.0'
-        size: '1'
-        image: 'http://someurl.com/VNF-B.qcow2'
-      ext-cpd:
-        - id: ext-b-left
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: left
-          layer-protocol: ethernet
-        - id: management
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: management
-          layer-protocol: ethernet
-        - id: ext-b-right
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: right
-          layer-protocol: ethernet
-      df:
-        - id: small
-          vdu-profile:
-            id: vdu-b-1
-            min-number-of-instances: '1'
-            max-number-of-instances: '2'
-          instantiation-level:
-            - id: double
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '2'
-            - id: single
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '1'
-          default-instantiation-level: single
-          lcm-operations-configuration:
-            scale-vnf-to-level-op-config:
-              arbitrary-target-levels-supported: 'true'
-            terminate-vnf-op-config:
-              min-graceful-termination: '1'
-            operate-vnf-op-config:
-              min-graceful-stop-timeout: '1'
-        - id: big
-          vdu-profile:
-            id: vdu-b-1
-            min-number-of-instances: '1'
-            max-number-of-instances: '4'
-          instantiation-level:
-            - id: double
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '2'
-            - id: triple
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '3'
-          default-instantiation-level: double
-          lcm-operations-configuration:
-            scale-vnf-to-level-op-config:
-              arbitrary-target-levels-supported: 'true'
-            terminate-vnf-op-config:
-              min-graceful-termination: '1'
-            operate-vnf-op-config:
-              min-graceful-stop-timeout: '1'
diff --git a/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt b/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
index 7a1fed179..82e338c4a 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
+++ b/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
@@ -44,5 +44,27 @@ ${vnfdId}    myVnF
 ${flavourId}    string
 
 ${descriptorType}    SOL001
-${vnfKey}    {}
-${check_descriptors}	1
\ No newline at end of file
+${check_descriptors}	1
+
+${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute
+${tosca_type_VNF}    tosca.nodes.nfv.VNF
+${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
+${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
+${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage
+ 
+@{VDU_IDs}
+@{VNF_IDs}
+@{virtualLink_IDs}
+@{CP_IDs}
+@{Storage_IDs}
+@{internalCP_IDs}
+@{externalCP_IDs}
+@{InstantiationLevel_IDs}
+@{Compute_IDs
+
+${Descriptor_ID}
+${Provider}
+${Product_Name}
+${Software_Version}
+${Descriptor_Version}
+${Flavour_ID}
\ No newline at end of file
-- 
GitLab


From 1c4a49293d73e4fe6dd1b1af267a4b248b576693 Mon Sep 17 00:00:00 2001
From: zulfiqar <sana.zulfiqar@xflowresearch.com>
Date: Thu, 21 Jan 2021 11:11:13 +0100
Subject: [PATCH 245/322] Descriptor checks added for 7.3.2.1.1-3

---
 .../Grants.robot                              | 63 +++++++++++++++----
 1 file changed, 52 insertions(+), 11 deletions(-)

diff --git a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
index 6b6cdc04c..bb1ad698a 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
@@ -117,7 +117,7 @@ Send Request Grant Request in Synchronous mode
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to Grant Request
     ${template}=    Get File    jsons/grantRequest.json
-    ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${vnfdId}    flavourId=${flavourId}
+    ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${Descriptor_ID}    flavourId=${Flavour_ID}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/grants    ${body}
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
@@ -130,7 +130,7 @@ Send Request Grant Request in Asynchronous mode
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to Grant Request
     ${template}=    Get File    jsons/grantRequest.json
-    ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${vnfdId}    flavourId=${flavourId}
+    ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${Descriptor_ID}    flavourId=${Flavour_ID}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/grants    ${body}
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
@@ -143,7 +143,7 @@ Send Request for a new Grant Forbiden Operation
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to Grant Request
     ${template}=    Get File    jsons/grantRejectedRequest.json
-    ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${vnfdId}    flavourId=${flavourId}
+    ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${Descriptor_ID}    flavourId=${Flavour_ID}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/grants    ${body}
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
@@ -197,8 +197,7 @@ Patch Grants
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/grants
     ${body}=    Output    response
-    Set Suite Variable    ${response}    ${body}
-    
+    Set Suite Variable    ${response}    ${body} 
     
 Delete Grants
     Log    Trying to perform a DELETE. This method should not be implemented
@@ -209,12 +208,54 @@ Delete Grants
     Set Suite Variable    ${response}    ${body}
     
 Add VNF Descriptor Content to Grant Request
-    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 Grant Request    ELSE    Parse SOL006 Grant Request
+    PARSE the Descriptor File
     
-Parse SOL001 Grant Request
-    Get key for VNF Descriptor
-    ${flavourId}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
+PARSE the Descriptor File
+    Run Keyword If  '${descriptorType}'=='SOL001'    Fetch Information from SOL001 descriptor file    ELSE    Fetch Information from SOL006 descriptor file
     
-Parse SOL006 Grant Request
-    Log    flavour id is not present in SOL006 descriptors
+Fetch Information from SOL001 descriptor file
+    @{VNF_labels}=    Create List
+    FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
+        ${key_type}=    Get Variable Value    ${topology_template.node_templates.${key}.type}
+        ${VNF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_VNF}
+
+        Run Keyword If    ${VNF_check}    Append To List    ${VNF_labels}    ${key}
+        Run Keyword If    ${VNF_check}    Get VNF Attributes from SOL001    ${key}            
+    END
+    Set Global Variable    @{VNF_IDs}    @{VNF_labels}
+
+
+Get VNF Attributes from SOL001
+     [Arguments]    ${VNF_label}
+    ${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}
+    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.software_version}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.descriptor_version}
+    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.flavour_id}
+    
+    Set Global Variable    ${Descriptor_ID}    ${descriptor_id}
+    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    ${Flavour_ID}    ${flavour_id}
+    
+Fetch Information from SOL006 descriptor file
+    ${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']}
+    ${software_version}=    Get Variable Value    ${nfv.vnfd[0]['software-version']}
+    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}    
+    ${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']}
+    ${instantiation_levels}=    Get Length    ${nfv.vnfd[0].df['instantiation-level']}
+    
+    Set Global Variable    ${Descriptor_ID}    ${descriptor_id}
+    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}
+
     
-- 
GitLab


From b4d9f52cd0f2959896777e014df86728ba61216a Mon Sep 17 00:00:00 2001
From: zafar <zafar@etsi.org>
Date: Thu, 21 Jan 2021 15:21:16 +0500
Subject: [PATCH 246/322] minor typo error resolved

---
 SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index 97fae54e4..1f5c1e031 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -1162,7 +1162,7 @@ Match the VNF Instance Response Attributes with Descriptors
     Should Be Equal As Strings    ${response['body']['vnfdId']}    ${Descriptor_ID}
     Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${Provider}
     Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${Product_Name}
-    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${Software_Version}
+    Should Be Equal As Strings    ${response['body']['vnfSoftwareVersion']}    ${Software_Version}
     Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${Descriptor_Version}
     Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['flavourId']}    ${Flavour_ID}
     List Should Contain Value    ${VDU_IDs}    ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo']['vduId']}        
-- 
GitLab


From 8147bf29a13930e0eaba99054a369fb61ff53ee9 Mon Sep 17 00:00:00 2001
From: zulfiqar <sana.zulfiqar@xflowresearch.com>
Date: Thu, 21 Jan 2021 13:31:05 +0100
Subject: [PATCH 247/322] minor fixes

---
 .../VnfLcmMntOperationKeywords.robot          | 36 +++----------------
 .../Grants.robot                              |  3 +-
 .../IndividualGrant.robot                     |  8 ++---
 3 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index c9758467c..632c511ca 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -125,16 +125,9 @@ Send VNF Instance Resource Create Request
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get key for VNF Descriptor
-    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
-    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
-    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
-    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
-    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
-    ${configurable_properties}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.configurable_properties}
-    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}
+    Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File
     ${template}=    Get File    jsons/createVnfRequest.json
-    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfProvider=${provider}    vnfProductName=${product_name}    vnfSoftwareVersion=${software_version}    vnfdVersion= ${descriptor_version}    vnfConfigurableProperties=${configurable_properties}    flavourId=${flavour_id}
+    ${body}=        Format String   ${template}     vnfdId=${Descriptor_ID}    vnfProvider=${Provider}    vnfProductName=${Product_Name}    vnfSoftwareVersion=${Software_Version}    vnfdVersion= ${Descriptor_Version}    vnfConfigurableProperties=${configurable_properties}    flavourId=${Flavour_ID}
     ${response}=    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances    ${body}
 
 Send VNF Instance Resource Delete Request
@@ -1347,29 +1340,10 @@ Check Individual VNF LCM Operation Occurence Content
     
 Match the VNF LCM Operation Occurence Response Attributes with Descriptors
     #Checking Response attributes with VNF Descriptors
-    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${Descriptor_ID}
-    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${Descriptor_Version}
+    Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdId']}    ${Descriptor_ID}
+    Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdVersion']}    ${Descriptor_Version}
     List Should Contain Value    ${VDU_IDs}    ${response['body']['resourceChanges']['AffectedVnfc']['vduId']}
     List Should Contain value    ${Storage_IDs}    ${response['body']['resourceChanges']['affectedVirtualStorages']['virtualStorageDescId']}
-    List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['resourceChanges']['affectedVirtualLinks']['vnfVirtualLinkDescId']}
-    
+    List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['resourceChanges']['affectedVirtualLinks']['virtualStorageDescId']}
     
-         
-Add VNF Descriptor Content to VNF Instance
-    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 VNF Instance    ELSE    Parse SOL006 VNF Instance
-
-Parse SOL001 VNF Instance
-    Get key for VNF Descriptor
-    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
-    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}
-    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}
-    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}
-    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
-    
-Parse SOL006 VNF Instance
-    ${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}
-    ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
-    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version} 
     
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
index bb1ad698a..6c220769b 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
@@ -5,7 +5,8 @@ Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=fals
 Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
-Variables    descriptors/SOL001/vnf-b-1_VNF.yaml
+Variables    descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
+Variables    descriptors/SOL006/reference_tst010_vnf_b_2vdu_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.
 
diff --git a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
index b25baa69a..def9600d3 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
@@ -291,10 +291,10 @@ Get Instantiation Levels
     Set Global Variable    ${InstantiationLevel_IDs}    ${Instantiation_Levels}
     
 Match the grant Response Attributes with Descriptors
-    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${externalCP_IDs}    ${response['body']['Grant']['extVirtualLinks']['extCps']['cpdId']}
-    Run Keyword If  '${descriptorType}'=='SOL001'    List Should Contain Value    @{CP_IDs}    ${response['body']['Grant']['extVirtualLinks']['extCps']['cpdId']}
-    List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['Grant']['ExtManagedVirtualLinkData']['vnfVirtualLinkDescId']}
-    List Should Contain value    ${Compute_IDs}    ${response['body']['Grant']['vimAssets']['computeResourceFlavours']['vnfdVirtualComputeDescId']}
+    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${externalCP_IDs}    ${response['body']['extVirtualLinks']['extCps']['cpdId']}
+    Run Keyword If  '${descriptorType}'=='SOL001'    List Should Contain Value    @{CP_IDs}    ${response['body']['extVirtualLinks']['extCps']['cpdId']}
+    List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['ExtManagedVirtualLinkData']['vnfVirtualLinkDescId']}
+    List Should Contain value    ${Compute_IDs}    ${response['body']['vimAssets']['computeResourceFlavours']['vnfdVirtualComputeDescId']}
     
 
 
-- 
GitLab


From 0f221f29a260580185e389acae6442f08e56697c Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Thu, 21 Jan 2021 18:50:45 +0100
Subject: [PATCH 248/322] fixed CI/CD errors

---
 .../VnfLcmMntOperationKeywords.robot                         | 4 ++--
 SOL003/VNFLifecycleOperationGranting-API/Grants.robot        | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index 632c511ca..679fd6102 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -8,8 +8,8 @@ Library    BuiltIn
 Library    JSONLibrary
 Library    Collections
 Library    JSONSchemaLibrary    schemas/
-Variables    descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
-Variables    descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
+Variables    descriptors/SOL001/SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml
+Variables    descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml
 
 *** Keywords ***
 Get Vnf Instance 
diff --git a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
index 6c220769b..12effdd71 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
@@ -5,8 +5,9 @@ Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=fals
 Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
-Variables    descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
-Variables    descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
+Library    Collections
+Variables    descriptors/SOL001/SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml
+Variables    descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_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.
 
-- 
GitLab


From 9a5d058b174c8ab693fc47d78b912ddf207751e1 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Thu, 21 Jan 2021 18:51:02 +0100
Subject: [PATCH 249/322] fixed CI/CD errors

---
 .../VNFLifecycleOperationGranting-API/environment/variables.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt b/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
index 82e338c4a..64dfe501f 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
+++ b/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
@@ -60,7 +60,7 @@ ${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage
 @{internalCP_IDs}
 @{externalCP_IDs}
 @{InstantiationLevel_IDs}
-@{Compute_IDs
+@{Compute_IDs}
 
 ${Descriptor_ID}
 ${Provider}
-- 
GitLab


From f72a15e398189efa928547e5ad23cd429b13525f Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Thu, 21 Jan 2021 18:57:48 +0100
Subject: [PATCH 250/322] fixed CI/CD errors

---
 .../VNFLifecycleOperationGranting-API/IndividualGrant.robot  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
index def9600d3..b0d176297 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
@@ -3,9 +3,10 @@ Resource   environment/variables.txt
 Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
+Library    Collections
 Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
-Variables    descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
-Variables    descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
+Variables    descriptors/SOL001/SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml
+Variables    descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_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.
-- 
GitLab


From 3c830c85ded04a0935c4e6e1a0ba21d99d34a365 Mon Sep 17 00:00:00 2001
From: zafar <zafar@etsi.org>
Date: Mon, 25 Jan 2021 18:38:20 +0500
Subject: [PATCH 251/322] NS Descriptors added

---
 .../NSLCMOperationKeywords.robot              |  71 ++++-
 ...eference_tst010_nsd_simple_a_b_SOL001.yaml | 113 +++++++
 .../reference_tst010_vnf_b_2vdu_SOL001.yaml   |   0
 ...eference_tst010_nsd_simple_a_b_SOL006.yaml | 284 ++++++++++++++++++
 .../reference_tst010_vnf_b_2vdu_SOL006.yaml   | 137 ---------
 .../environment/variables.txt                 |  14 +
 .../VNFPackageManagementKeywords.robot        |   2 +-
 7 files changed, 476 insertions(+), 145 deletions(-)
 create mode 100644 SOL005/NSLifecycleManagement-API/descriptors/SOL001/NSD/reference_tst010_nsd_simple_a_b_SOL001.yaml
 rename SOL005/NSLifecycleManagement-API/descriptors/SOL001/{ => VNFD}/reference_tst010_vnf_b_2vdu_SOL001.yaml (100%)
 create mode 100644 SOL005/NSLifecycleManagement-API/descriptors/SOL006/NSD/reference_tst010_nsd_simple_a_b_SOL006.yaml
 delete mode 100644 SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml

diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index c18055e35..2d14cc8af 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -8,9 +8,9 @@ Library    OperatingSystem
 Library    MockServerLibrary
 Library    Collections
 Library    String
-Variables  descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
-Variables  descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
-
+Variables  descriptors/SOL006/NSD/reference_tst010_nsd_simple_a_b_SOL006.yaml
+Variables  descriptors/SOL001/VNFD/reference_tst010_vnf_b_2vdu_SOL001.yaml
+Variables  descriptors/SOL001/NSD/reference_tst010_nsd_simple_a_b_SOL001.yaml
 
 *** Keywords ***
 Initialize System
@@ -353,13 +353,13 @@ Match the Response Attributes with Descriptors
     Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfdId']}    ${Descriptor_ID}
     Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfProvider']}    ${Provider}
     Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfProductName']}    ${Product_Name}
-    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfSoftwareVesion']}    ${Software_Version}
+    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfSoftwareVersion']}    ${Software_Version}
     Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfdVersion']}    ${Descriptor_Version}
     Should Be Equal As Strings    ${response['body']['vnfInstance']['instantiatedVnfInfo']['flavourId']}    ${Flavour_ID}
     List Should Contain Value    ${VDU_IDs}    ${response['body']['vnfInstance']['instantiatedVnfInfo']['vnfcResourceInfo']['vduId']}        
     Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${externalCP_IDs}    ${response['body']['vnfInstance']['instantiatedVnfInfo']['extCpInfo']['cpdId']}
     Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${internalCP_IDs}    ${response['body']['vnfInstance']['instantiatedVnfInfo']['extCpInfo']['cpdId']}
-    Run Keyword If  '${descriptorType}'=='SOL001'    List Should Contain Value    @{CP_IDs}    ${response['body']['vnfInstance']['instantiatedVnfInfo']['extCpInfo']['cpdId']}
+    Run Keyword If  '${descriptorType}'=='SOL001'    List Should Contain Value    ${CP_IDs}    ${response['body']['vnfInstance']['instantiatedVnfInfo']['extCpInfo']['cpdId']}
     List Should Contain value    ${Storage_IDs}    ${response['body']['vnfInstance']['instantiatedVnfInfo']['virtualStorageResourceInfo']['virtualStorageDescId']}
     List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['vnfInstance']['instantiatedVnfInfo']['extManagedVirtualLinkInfo']['vnfVirtualLinkDescId']}
 
@@ -1090,8 +1090,9 @@ POST subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File
     ${template}=    Get File    jsons/LccnSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callbackUri=${callback_uri}   callbackEndpoint=${callback_endpoint}   callbackPort=${callback_port}   nsdId=${nsdId}
+    ${body}=        Format String   ${template}     callbackUri=${callback_uri}   callbackEndpoint=${callback_endpoint}   callbackPort=${callback_port}   nsdId=${NS_DescriptorID}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -1119,7 +1120,6 @@ POST subscriptions NO DUPLICATION
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
-	
 
 GET Subscriptions
     Log    Get the list of active subscriptions
@@ -1284,3 +1284,60 @@ PUT notification
 Check HTTP Response Header Contains Location
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
+
+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
+    @{NsVirtualLink_labels}=    Create List
+    @{NsCP_labels}=    Create List
+    FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
+        ${key_type}=    Get Variable Value    ${topology_template.node_templates.${key}.type}
+        ${NS_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}   ${tosca_type_NS}
+        ${NSLink_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_NsVirtualLink}
+        ${NsCP_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_NsCP}
+        Run Keyword If    ${NS_check}    Get NS Attributes from SOL001    ${key}
+        Run Keyword If    ${NSLink_check}    Append To List    ${Ns_VirtualLink_labels}    ${key}
+        Run Keyword If    ${NsCP_check}    Append To List    ${NsCp_labels}    ${key}        
+    END
+    Set Global Variable    @{NS_VirtualLink_IDs}    @{NsVirtualLink_labels}
+    Set Global Variable    @{NsCP_IDs}    @{NsCP_labels}
+
+Get NS Attributes from SOL001
+    [Arguments]    ${NS_label}
+    ${ns_descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${NS_label}.properties.descriptorId}
+    ${designer}=    Get Variable Value    ${topology_template.node_templates.${NS_label}.properties.designer}
+    ${version}=    Get Variable Value    ${topology_template.node_templates.${NS_label}.properties.version}
+    ${name}=    Get Variable Value    ${topology_template.node_templates.${NS_label}.properties.name}
+    ${invariantId}=    Get Variable Value    ${topology_template.node_templates.${NS_label}.properties.invariantId}
+    
+    Set Global Variable    ${NS_DescriptorID}    ${ns_descriptor_id}
+    Set Global Variable    ${Designer}    ${designer}
+    Set Global Variable    ${NS_Version}    ${version}
+    Set Global Variable    ${NS_Name}    ${name}
+    Set Global Variable    ${NS_InvariantID}    ${invariantId}
+
+Fetch Information from SOL006 NS descriptor file
+    ${nsd_id}=    Get Variable Value    ${nfv.nsd[0].id}
+    ${VNFcount}=    Get Length    ${nfv.vnfd}
+    FOR    ${key}    IN    @{nfv.keys()}
+        ${VNF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    vnfd
+        Run Keyword If    ${VNF_check}    Get External CPs for each VNF    ${VNFcount}
+        Run Keyword If    ${VNF_check}    Fetch Information from SOL006 descriptor file
+    END
+    Set Global Variable    ${NS_DescriptorID}    ${nsd_id}
+    
+Get External CPs for each VNF
+    [Arguments]    ${vnf}
+    FOR    ${i}    IN RANGE    ${vnf}
+        Get Ext CP IDs    ${i}
+    END
+
+Get Ext CP IDs
+    [Arguments]    ${vnf}
+    @{extCP_labels}=    Create List
+    ${count}=    Get Length    ${nfv.vnfd[${vnf}]['ext-cpd']}    
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${extCP_labels}    ${nfv.vnfd[${vnf}]['ext-cpd'][${i}]['id']} 
+    END
+    Set Global Variable    ${NsCP_IDs}    ${extCP_labels}
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/descriptors/SOL001/NSD/reference_tst010_nsd_simple_a_b_SOL001.yaml b/SOL005/NSLifecycleManagement-API/descriptors/SOL001/NSD/reference_tst010_nsd_simple_a_b_SOL001.yaml
new file mode 100644
index 000000000..a2a363b27
--- /dev/null
+++ b/SOL005/NSLifecycleManagement-API/descriptors/SOL001/NSD/reference_tst010_nsd_simple_a_b_SOL001.yaml
@@ -0,0 +1,113 @@
+tosca_definitions_version: "tosca_simple_yaml_1_2"
+tosca_default_namespace: "toscanfv"
+description: "Referenxce NSD descriptor "
+metadata:
+  descriptor_id: "NSD_WITH_2_VNF"
+  vendor: "ETSI"
+  version: "1.0"
+topology_template:
+  substitution_mappings:
+    node_type: "tosca.nodes.nfv.NS"
+    requirements:
+      right: [VNF_A, ext_a_right]
+      left: [VNF_B, ext_b_left]
+      mgmt_a: [VNF_A, management_vnf_a]
+      mgmt_b: [VNF_B, management_vnf_b]
+  node_templates:
+    VNF_A:
+      type: "tosca.nodes.nfv.VNF"
+      properties:
+        descriptor_id: "VNF-A"
+        descriptor_version: "1.0"
+        provider: "ETSI TST WG"
+        product_name: "VNF-A"
+        software_version: "1.0"
+        product_info_name: "VNF-A"
+        product_info_description: "TST010 reference VNF-A"
+        flavour_id: "VNF-A_flavor"
+        flavour_description: "VNF-A flavor"
+        vnfm_info: 
+          - 'etsivnfm:v2.3.1'
+      requirements:
+        virtualLink:
+          ext_a_right: "vl_right"
+          management_vnf_a: "vl_mgmt"
+          int_a_data: "vl_data"
+    VNF_B:
+      type: "tosca.nodes.nfv.VNF"
+      properties:
+        descriptorId: "VNF-B"
+        descriptorVersion: "1.0"
+        provider: "ETSI TST WG"
+        productName: "VNF-B"
+        softwareVersion: "1.0"
+        productInfoName: "VNF-B"
+        productInfoDescription: "TST010 reference VNF-A"
+        defaultLocalizationLanguage: null
+        flavourId: "VNF-B_flavor"
+        flavourDescription: "VNF-B flavor"
+        vnfm_info: 
+          - 'etsivnfm:v2.3.1'
+      requirements:
+        virtualLink:
+          ext_b_left: "vl_left"
+          management_vnf_b: "vl_mgmt"
+          int_b_data: "vl_data"
+    NS_with_2_VNF:
+      type: "tosca.nodes.nfv.NS"
+      properties:
+        descriptorId: "NS with 2 VNFs"
+        designer: "ETSI TST WG"
+        version: "1.0"
+        name: "ns_with_2_vnfs"
+        invariantId: "ns_with_2_vnfs"
+      requirements:
+        virtualLink:
+        - "vl_left"
+        - "vl_right"
+        - "vl_mgmt"
+        - "vl_data"
+    vl_left:
+      type: "tosca.nodes.nfv.NsVirtualLink"
+      properties:
+        description: "VNF-B external connetivity"
+        vlProfile: 
+          max_bitrate_requirements:
+            root: 1000
+          min_bitrate_requirements:  
+            root: 1000
+        connectivityType:
+          layer_protocols: [ipv4]
+    vl_right: 
+      type: "tosca.nodes.nfv.NsVirtualLink"
+      properties:
+        description: "VNF-A external connectivity"
+        vlProfile: 
+          max_bitrate_requirements:
+            root: 1000
+          min_bitrate_requirements:  
+            root: 1000
+        connectivityType:
+          layer_protocols: [ipv4]
+    vl_mgmt: 
+      type: "tosca.nodes.nfv.NsVirtualLink"
+      properties:
+        description: "Management network"
+        vlProfile: 
+          max_bitrate_requirements:
+            root: 1000
+          min_bitrate_requirements:  
+            root: 1000
+        connectivityType:
+          layer_protocols: [ipv4]
+    vl_data: 
+      type: "tosca.nodes.nfv.NsVirtualLink"
+      properties:
+        description: "Internal network that interconnect VNF-A and VNF-B"
+        vlProfile: 
+          max_bitrate_requirements:
+            root: 1000
+          min_bitrate_requirements:  
+            root: 1000
+        connectivityType:
+          layer_protocols: [ipv4]
diff --git a/SOL005/NSLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml b/SOL005/NSLifecycleManagement-API/descriptors/SOL001/VNFD/reference_tst010_vnf_b_2vdu_SOL001.yaml
similarity index 100%
rename from SOL005/NSLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
rename to SOL005/NSLifecycleManagement-API/descriptors/SOL001/VNFD/reference_tst010_vnf_b_2vdu_SOL001.yaml
diff --git a/SOL005/NSLifecycleManagement-API/descriptors/SOL006/NSD/reference_tst010_nsd_simple_a_b_SOL006.yaml b/SOL005/NSLifecycleManagement-API/descriptors/SOL006/NSD/reference_tst010_nsd_simple_a_b_SOL006.yaml
new file mode 100644
index 000000000..b29b2dfc7
--- /dev/null
+++ b/SOL005/NSLifecycleManagement-API/descriptors/SOL006/NSD/reference_tst010_nsd_simple_a_b_SOL006.yaml
@@ -0,0 +1,284 @@
+nfv:
+  vnfd:
+    - id: VNF-A
+      provider: ETSI TST WG
+      product-name: TST010 reference VNF-A
+      software-version: '1.0'
+      version: '1.0'
+      vnfm-info: ETSI VNFM
+      vdu:
+      - id: vdu-a-1
+        name: VNF A VDU 1
+        int-cpd:
+          - id: right
+            layer-protocol: ethernet
+          - id: management
+            layer-protocol: ethernet
+          - id: left
+            layer-protocol: ethernet
+        virtual-compute-desc: vdu-a-1-vcd
+        virtual-storage-desc: vdu-a-1-vsd
+        sw-image-desc: asa-image
+      virtual-compute-desc:
+        id: vdu-a-1-vcd
+        virtual-memory:
+          size: '4.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-a-1-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-a-1-image
+        name: vdu-a-1 image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/vnf-a.qcow2'
+      int-virtual-link-desc:
+      - id: right-vl
+        flavour:
+          id: right-vl-flavour
+          qos:
+            latency: '1'
+            packet-delay-variation: '1'
+            packet-loss-ratio: '0.02'
+        connectivity-type:
+          layer-protocol: ethernet
+      ext-cpd:
+        - id: ext-a-right
+          int-virtual-link-desc: right-vl
+          layer-protocol: ethernet
+        - id: management
+          int-cpd:
+            vdu-id: vdu-a-1
+            cpd: management
+          layer-protocol: ethernet
+        - id: ext-a-left
+          int-cpd:
+            vdu-id: vdu-a-1
+            cpd: left
+          layer-protocol: ethernet
+      df:
+        id: normal
+        vdu-profile:
+          id: vdu-a-1
+          min-number-of-instances: '1'
+          max-number-of-instances: '2'
+        virtual-link-profile:
+          id: right-vl
+          flavour: right-vl-flavour
+          max-bit-rate-requirements:
+            root: '10'
+          min-bit-rate-requirements:
+            root: '1'
+          virtual-link-protocol-data:
+            associated-layer-protocol: ipv4
+            l3-protocol-data:
+              name: right-network
+              ip-version: ipv4
+              cidr: 10.10.10.0/32
+              gateway-ip: 10.10.10.1
+              dhcp-enabled: 'true'
+        instantiation-level:
+          - id: double
+            vdu-level:
+              vdu-id: vdu-a-1
+              number-of-instances: '2'
+          - id: single
+            vdu-level:
+              vdu-id: vdu-a-1
+              number-of-instances: '1'
+        default-instantiation-level: single
+        lcm-operations-configuration:
+          scale-vnf-to-level-op-config:
+            arbitrary-target-levels-supported: 'true'
+          terminate-vnf-op-config:
+            min-graceful-termination: '1'
+          operate-vnf-op-config:
+            min-graceful-stop-timeout: '1'
+    - id: VNF-B
+      provider: ETSI TST WG
+      product-name: TST010 reference VNF-B
+      software-version: '2.0'
+      version: '2.0'
+      vnfm-info: ETSI VNFM
+      vdu:
+      - id: vdu-b-1
+        name: VNF-B VDU 1
+        int-cpd:
+          - id: left
+            layer-protocol: ethernet
+          - id: management
+            layer-protocol: ethernet
+          - id: right
+            layer-protocol: ethernet
+        virtual-compute-desc: vdu-b-1-vcd
+        virtual-storage-desc: vdu-b-1-vsd
+        sw-image-desc: vdu-b-1-image
+      virtual-compute-desc:
+        id: vdu-b-1-vcd
+        virtual-memory:
+          size: '4.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-1-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-1-image
+        name: VNF-B image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B.qcow2'
+      ext-cpd:
+        - id: ext-b-left
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: left
+          layer-protocol: ethernet
+        - id: management
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: management
+          layer-protocol: ethernet
+        - id: ext-b-right
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: right
+          layer-protocol: ethernet
+      df:
+        id: normal
+        vdu-profile:
+          id: vdu-b-1
+          min-number-of-instances: '1'
+          max-number-of-instances: '2'
+        instantiation-level:
+          - id: double
+            vdu-level:
+              vdu-id: vdu-b-1
+              number-of-instances: '2'
+          - id: single
+            vdu-level:
+              vdu-id: vdu-b-1
+              number-of-instances: '1'
+        default-instantiation-level: single
+        lcm-operations-configuration:
+          scale-vnf-to-level-op-config:
+            arbitrary-target-levels-supported: 'true'
+          terminate-vnf-op-config:
+            min-graceful-termination: '1'
+          operate-vnf-op-config:
+            min-graceful-stop-timeout: '1'
+  nsd:
+    - id: tst010-nsd
+      vnfd-id:
+        - VNF-A
+        - VNF-B
+      sapd:
+        - id: right-sap
+          vnf:
+            vnfd-id: VNF-A
+            ext-cpd-id: ext-a-right
+        - id: management-sap
+          virtual-link-desc: mgmt
+        - id: left-sap
+          vnf:
+            vnfd-id: VNF-B
+            ext-cpd-id: ext-b-left
+      virtual-link-desc:
+        - id: mgmt
+          connectivity-type:
+            layer-protocol: ipv4
+          df:
+            id: normal
+            qos:
+              latency: '0'
+              packet-delay-variation: '0'
+        - id: A-to-B
+          connectivity-type:
+            layer-protocol: ethernet
+          df:
+            id: normal
+            qos:
+              latency: '0'
+              packet-delay-variation: '0'
+      df:
+        - id: normal
+          vnf-profile:
+            - id: vnf-a-profile
+              vnfd-id: VNF-A
+              flavour-id: normal
+              instantiation-level: single
+              min-number-of-instances: '1'
+              max-number-of-instances: '1'
+              virtual-link-connectivity:
+                - virtual-link-profile-id: mgmt
+                  constituent-cpd-id:
+                    constituent-base-element-id: vdu-a-1
+                    constituent-cpd-id: management
+                - virtual-link-profile-id: A-to-B
+                  constituent-cpd-id:
+                    constituent-base-element-id: vdu-a-1
+                    constituent-cpd-id: left
+            - id: vnf-b-profile
+              vnfd-id: VNF-B
+              flavour-id: normal
+              instantiation-level: single
+              min-number-of-instances: '1'
+              max-number-of-instances: '1'
+              virtual-link-connectivity:
+                - virtual-link-profile-id: mgmt
+                  constituent-cpd-id:
+                    constituent-base-element-id: vdu-b-1
+                    constituent-cpd-id: management
+                - virtual-link-profile-id: A-to-B
+                  constituent-cpd-id:
+                    constituent-base-element-id: vdu-b-1
+                    constituent-cpd-id: right
+          virtual-link-profile:
+            - id: mgmt
+              virtual-link-desc-id: mgmt
+              flavour-id: normal
+              max-bitrate-requirements:
+                root: '1000'
+              min-bitrate-requirements:
+                root: '0'
+            - id: A-to-B
+              virtual-link-desc-id: A-to-B
+              flavour-id: normal
+              max-bitrate-requirements:
+                root: '10000000'
+              min-bitrate-requirements:
+                root: '0'
+          ns-instantiation-level:
+            - id: normal
+              description: Single VNF-A and VNF-B
+              vnf-to-level-mapping:
+                - vnf-profile-id: vnf-a-profile
+                  number-of-instances: '1'
+                - vnf-profile-id: vnf-b-profile
+                  number-of-instances: '1'
+            - id: double-A
+              description: Single VNF-B and Double VNF-A
+              vnf-to-level-mapping:
+                - vnf-profile-id: vnf-a-profile
+                  number-of-instances: '2'
+                - vnf-profile-id: vnf-b-profile
+                  number-of-instances: '1'
+                  default-instantiation-level: normal
diff --git a/SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml b/SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
deleted file mode 100644
index 0ea9820f0..000000000
--- a/SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
+++ /dev/null
@@ -1,137 +0,0 @@
-nfv:
-  vnfd:
-    - id: VNF-B-2vdu
-      provider: ETSI TST WG
-      product_name: TST010 reference VNF-B with 2 VDUs
-      software_version: '2.2'
-      version: '2.2'
-      vnfm_info: ETSI VNFM
-      vdu:
-        - id: vdu-b-1
-          name: VNF-B VDU 1
-          int_cpd:
-           - id: left
-             layer_protocol: ethernet
-           - id: management
-             layer_protocol: ethernet
-           - id: internal
-             layer_protocol: ethernet
-             int_virtual_link_desc: internal-vl
-          virtual_compute_desc: vdu-b-1-vcd
-          virtual_storage_desc: vdu-b-1-vsd
-          sw_image_desc: vdu-b-1-image
-        - id: vdu-b-2
-          name: VNF-B VDU 2
-          int_cpd:
-           - id: right
-             layer_protocol: ethernet
-           - id: management
-             layer_protocol: ethernet
-           - id: internal
-             layer_protocol: ethernet
-             int_virtual_link_desc: internal-vl
-          virtual_compute_desc: vdu-b-2-vcd
-          virtual_storage_desc: vdu-b-2-vsd
-          sw_image_desc: vdu-b-2-image
-      virtual_compute_desc:
-        id: vdu-b-1-vcd
-        virtual_memory:
-          size: '4.0'
-        virtual_cpu:
-          num_virtual_cpu: '2'
-      virtual_storage_desc:
-        id: vdu-b-1-vsd
-        type_of_storage: root-storage
-        size_of_storage: '0'
-      sw_image_desc:
-        id: vdu-b-1-image
-        name: VNF-B image
-        version: '1.1'
-        checksum:
-          algorithm: sha-224
-          hash: somehashfortst010
-        container_format: bare
-        disk_format: qcow2
-        min_disk: '1'
-        min_ram: '2.0'
-        size: '1'
-        image: 'http://someurl.com/VNF-B.qcow2'
-      virtual_compute_desc:
-        id: vdu-b-2-vcd
-        virtual_memory:
-          size: '6.0'
-        virtual_cpu:
-          num_virtual_cpu: '2'
-      virtual_storage_desc:
-        id: vdu-b-2-vsd
-        type_of_storage: root-storage
-        size_of_storage: '0'
-      sw_image_desc:
-        id: vdu-b-2-image
-        name: VNF-B-2 image
-        version: '1.1'
-        checksum:
-          algorithm: sha-224
-          hash: somehashfortst010
-        container_format: bare
-        disk_format: qcow2
-        min_disk: '1'
-        min_ram: '2.0'
-        size: '1'
-        image: 'http://someurl.com/VNF-B-2.qcow2'
-      int_virtual_link_desc:
-        - id: internal-vl
-          flavour:
-            id: internal-vl-flavour
-            qos:
-              latency: '1'
-              packet_delay_variation: '1'
-              packet_loss_ratio: '0.05'
-          connectivity_type:
-            layer_protocol: ethernet     
-      ext_cpd:
-        - id: ext-b-left
-          int_cpd:
-            vdu_id: vdu-b-1
-            cpd: left
-          layer_protocol: ethernet
-        - id: management
-          int_cpd:
-            vdu_id: vdu-b-1
-            cpd: management
-          layer_protocol: ethernet
-        - id: ext-b-right
-          int_cpd:
-            vdu_id: vdu-b-2
-            cpd: right
-          layer_protocol: ethernet
-      df:
-        id: normal
-        vdu_profile:
-          - id: vdu-b-1
-            min_number_of_instances: '1'
-            max_number_of_instances: '2'
-          - id: vdu-b-2
-            min_number_of_instances: '1'
-            max_number_of_instances: '4'          
-        instantiation_level:
-          - id: double
-            vdu_level:
-              - vdu_id: vdu-b-1
-                number_of_instances: '2'
-              - vdu_id: vdu-b-2
-                number_of_instances: '2'
-          - id: single
-            vdu_level:
-              - vdu_id: vdu-b-1
-                number_of_instances: '1'
-              - vdu_id: vdu-b-2
-                number_of_instances: '1'
-        default_instantiation_level: single
-        lcm_operations_configuration:
-          scale_vnf_to_level_op_config:
-            arbitrary_target_levels_supported: 'true'
-          terminate_vnf_op_config:
-            min_graceful_termination: '1'
-          operate_vnf_op_config:
-            min_graceful_stop_timeout: '1'
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/environment/variables.txt b/SOL005/NSLifecycleManagement-API/environment/variables.txt
index f7346a6e5..0dae31ed9 100644
--- a/SOL005/NSLifecycleManagement-API/environment/variables.txt
+++ b/SOL005/NSLifecycleManagement-API/environment/variables.txt
@@ -86,6 +86,10 @@ ${tosca_type_VNF}    tosca.nodes.nfv.VNF
 ${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
 ${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
 ${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage
+
+${tosca_type_NS}    tosca.nodes.nfv.NS
+${tosca_type_NsVirtualLink}    tosca.nodes.nfv.NsVirtualLink
+${tosca_type_NsCP}    tosca.nodes.nfv.Cp
   
 @{VDU_IDs}
 @{VNF_IDs}
@@ -96,6 +100,16 @@ ${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage
 @{externalCP_IDs}
 @{InstantiationLevel_IDs}
 
+@{NsVirtualLink}
+@{NsCP_IDs}
+
+${NS_DescriptorID}
+${Designer}
+${NS_Name}
+${NS_Version}
+${NS_InvariantId}
+
+
 ${Descriptor_ID}
 ${Provider}
 ${Product_Name}
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 6842187b1..93d007475 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -311,7 +311,7 @@ Match the Response Attributes of vnfPkgInfo with Descriptors
     Should Be Equal As Strings    ${response['body']['vnfdId']}    ${Descriptor_Id}
     Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${Provider}
     Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${Product_Name}
-    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${Software_Version}
+    Should Be Equal As Strings    ${response['body']['vnfSoftwareVersion']}    ${Software_Version}
     Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${Descriptor_Version}
 
 Check Postcondition VNF Package Resource Exists
-- 
GitLab


From 0963f5aedf8d90549ad6ede8d5a80b94d5a5a3fd Mon Sep 17 00:00:00 2001
From: zafar <zafar@etsi.org>
Date: Mon, 25 Jan 2021 21:21:02 +0500
Subject: [PATCH 252/322] NS descriptors check implemented in NSInstances
 resource

---
 .../NSInstances.robot                         |  1 +
 .../NSLCMOperationKeywords.robot              | 86 ++++++++++++-------
 .../environment/variables.txt                 |  3 +-
 3 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/SOL005/NSLifecycleManagement-API/NSInstances.robot b/SOL005/NSLifecycleManagement-API/NSInstances.robot
index 8c662bcab..40dcf4efd 100644
--- a/SOL005/NSLifecycleManagement-API/NSInstances.robot
+++ b/SOL005/NSLifecycleManagement-API/NSInstances.robot
@@ -20,6 +20,7 @@ POST Create a new NsInstance
     Check HTTP Response Status Code Is    201
     Check HTTP Response Header Contains    Location
     Check HTTP Response Body Json Schema Is    NsInstance
+    Check HTTP Response Body NsInstance content against NS Descriptor
 
 GET information about multiple NS instances  
     [Documentation]    Test ID: 5.3.2.1.2
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index 2d14cc8af..ee1d30742 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -218,8 +218,9 @@ POST New nsInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File
     ${template}=    Get File    jsons/CreateNsRequest.json 
-    ${body}=        Format String   ${template}     nsdId=${nsdId}   nsInstanceName=${nsInstanceName}   vimAccountId=${vimAccountId}   nsInstanceDescription=${nsInstanceDescription}
+    ${body}=        Format String   ${template}     nsdId=${NS_DescriptorID}   nsInstanceName=${nsInstanceName}   vimAccountId=${vimAccountId}   nsInstanceDescription=${nsInstanceDescription}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}     
@@ -280,19 +281,19 @@ Get VNF Attributes from SOL001
 Fetch Information from SOL006 descriptor file
     ${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}
-    ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
+    ${product_name}=    Get Variable Value    ${nfv.vnfd[0]['product-name']}
+    ${software_version}=    Get Variable Value    ${nfv.vnfd[0]['software-version']}
     ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}    
     ${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}
-    ${instantiation_levels}=    Get Length    ${nfv.vnfd[0].df.instantiation_level}    
+    ${extCP_count}=    Get Length    ${nfv.vnfd[0]['ext-cpd']}
+    ${virtualLink_count}=    Get length    ${nfv.vnfd[0]['int-virtual-link-desc']}
+    ${instantiation_levels}=    Get Length    ${nfv.vnfd[0].df['instantiation-level']}    
     FOR    ${key}    IN    @{nfv.vnfd[0].keys()}
         ${VDU_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    vdu
         Run Keyword If    ${VDU_check}    Get VDU IDs    ${VDUcount}
-        ${extCP_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    ext_cpd
+        ${extCP_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    ext-cpd
         Run Keyword If    ${extCP_check}    Get External CP IDs    ${extCP_count}
-        ${virtualLink_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    int_virtual_link_desc
+        ${virtualLink_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    int-virtual-link-desc
         Run Keyword If    ${virtualLink_check}    Get Virtual Link IDs   ${virtualLink_count}    
         ${DF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    df
         Run Keyword If    ${DF_check}    Get Instantiation Levels    ${instantiation_levels}    
@@ -308,8 +309,8 @@ Get VDU IDs
     @{VDU_labels}=    Create List
     ${Storage_labels}=    Create List
     FOR    ${i}    IN RANGE    ${count}
-        Append To List    ${VDU_labels}    ${nfv.vnfd[0].vdu[${i}].id}
-        Append To List    ${Storage_labels}    ${nfv.vnfd[0].vdu[${i}].virtual_storage_desc} 
+        Append To List    ${VDU_labels}    ${nfv.vnfd[0].vdu[${i}]['id']}
+        Append To List    ${Storage_labels}    ${nfv.vnfd[0].vdu[${i}]['virtual-storage-desc']} 
         Get Internal CPs for each VDU    ${i}   
     END
     Set Global Variable    ${VDU_IDs}    ${VDU_labels}
@@ -317,10 +318,10 @@ Get VDU IDs
             
 Get Internal CPs for each VDU
     [Arguments]    ${vdu}
-    ${count}=    Get Length    ${nfv.vnfd[0].vdu[${vdu}].int_cpd}    
+    ${count}=    Get Length    ${nfv.vnfd[0].vdu[${vdu}]['int-cpd']}    
     ${internal_CPs}=    Create List
     FOR    ${i}    IN RANGE    ${count}
-        Append To List    ${internal_CPs}    ${nfv.vnfd[0].vdu[${vdu}].int_cpd[${i}].id} 
+        Append To List    ${internal_CPs}    ${nfv.vnfd[0].vdu[${vdu}]['int-cpd'][${i}]['id']} 
     END
     Set Global Variable    ${internalCP_IDs}    ${internal_CPs}
     
@@ -328,15 +329,15 @@ Get External CP IDs
     [Arguments]    ${count}    
     @{external_CPs}=    Create List
     FOR    ${i}    IN RANGE    ${count}
-        Append To List    ${external_CPs}    ${nfv.vnfd[0].ext_cpd[${i}].id} 
+        Append To List    ${external_CPs}    ${nfv.vnfd[0]['ext-cpd'][${i}]['id']} 
     END
     Set Global Variable    ${externalCP_IDs}    ${external_CPs}
 
 Get Virtual Link IDs
     [Arguments]    ${count}    
-    ${VirtualLink_labels}=    Create List
+    @{VirtualLink_labels}=    Create List
     FOR    ${i}    IN RANGE    ${count}
-        Append To List    ${VirtualLink_labels}    ${nfv.vnfd[0].int_virtual_link_desc[${i}].id} 
+        Append To List    ${VirtualLink_labels}    ${nfv.vnfd[0]['int-virtual-link-desc'][${i}]['id']} 
     END
     Set Global Variable    ${VirtualLink_IDs}    ${VirtualLink_labels}
 
@@ -344,7 +345,7 @@ Get Instantiation Levels
     [Arguments]    ${count}
     @{Instantiation_Levels}=    Create List
     FOR    ${i}    IN RANGE    ${count}
-        Append To List    ${Instantiation_Levels}    ${nfv.vnfd[0].df.instantiation_level[${i}].id} 
+        Append To List    ${Instantiation_Levels}    ${nfv.vnfd[0].df['instantiation-level'][${i}]['id']} 
     END
     Set Global Variable    ${InstantiationLevel_IDs}    ${Instantiation_Levels}
 
@@ -1103,8 +1104,9 @@ POST subscriptions DUPLICATION
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File
     ${template}=    Get File    jsons/LccnSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callbackUri=${callback_uri}   callbackEndpoint=${callback_endpoint}   callbackPort=${callback_port}     nsdId=${nsdId}
+    ${body}=        Format String   ${template}     callbackUri=${callback_uri}   callbackEndpoint=${callback_endpoint}   callbackPort=${callback_port}     nsdId=${NS_DescriptorID}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -1115,8 +1117,9 @@ POST subscriptions NO DUPLICATION
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File
     ${template}=    Get File    jsons/LccnSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callbackUri=${callback_uri}   callbackEndpoint=${callback_endpoint}   callbackPort=${callback_port}     nsdId=${nsdId}
+    ${body}=        Format String   ${template}     callbackUri=${callback_uri}   callbackEndpoint=${callback_endpoint}   callbackPort=${callback_port}     nsdId=${NS_DescriptorID}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -1320,24 +1323,43 @@ Get NS Attributes from SOL001
 Fetch Information from SOL006 NS descriptor file
     ${nsd_id}=    Get Variable Value    ${nfv.nsd[0].id}
     ${VNFcount}=    Get Length    ${nfv.vnfd}
+    ${SAPcount}=    Get Length    ${nfv.nsd[0].sapd}
+    ${NSvirtualLinkCount}=    Get Length    ${nfv.nsd[0]['virtual-link-desc']}
     FOR    ${key}    IN    @{nfv.keys()}
-        ${VNF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    vnfd
-        Run Keyword If    ${VNF_check}    Get External CPs for each VNF    ${VNFcount}
-        Run Keyword If    ${VNF_check}    Fetch Information from SOL006 descriptor file
+        ${VNFD_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    vnfd
+        ${NSD_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    nsd
+        Run Keyword If    ${VNFD_check}    Fetch Information from SOL006 descriptor file
+        Run Keyword If    ${NSD_check}    Get SAP IDs    ${SAPcount}
+        Run Keyword If    ${NSD_check}    Get NS Virtual Link IDs    ${NSvirtualLinkCount}
+
     END
     Set Global Variable    ${NS_DescriptorID}    ${nsd_id}
     
-Get External CPs for each VNF
-    [Arguments]    ${vnf}
-    FOR    ${i}    IN RANGE    ${vnf}
-        Get Ext CP IDs    ${i}
+Get SAP IDs
+    [Arguments]    ${count}
+    @{SAPlabels}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${SAPlabels}    ${nfv.nsd[0].sapd[${i}]['id']}
     END
-
-Get Ext CP IDs
-    [Arguments]    ${vnf}
-    @{extCP_labels}=    Create List
-    ${count}=    Get Length    ${nfv.vnfd[${vnf}]['ext-cpd']}    
+    Set Global Variable    ${SAP_IDs}    ${SAPlabels}
+    
+Get NS Virtual Link IDs
+    [Arguments]    ${count}
+    @{NsVirtualLink_labels}=    Create List
     FOR    ${i}    IN RANGE    ${count}
-        Append To List    ${extCP_labels}    ${nfv.vnfd[${vnf}]['ext-cpd'][${i}]['id']} 
+        Append To List    ${NsVirtualLink_labels}    ${nfv.nsd[0]['virtual-link-desc'][${i}]['id']}
     END
-    Set Global Variable    ${NsCP_IDs}    ${extCP_labels}
\ No newline at end of file
+    Set Global Variable    ${NS_VirtualLink_IDs}    ${NsVirtualLink_labels}
+    
+Check HTTP Response Body NsInstance content against NS Descriptor
+    #${check_descriptors} flag, 1 to check descriptors
+    Run Keyword If    ${check_descriptors} == 1    Check Individual NsInstance Content for NSD
+
+Check Individual NsInstance Content for NSD 
+    PARSE the NS Descriptor File
+    Match the Response Attributes with NS Descriptors
+
+Match the Response Attributes with NS Descriptors
+    Should Be Equal As Strings    ${response['body']['nsdId']}    ${NSDescriptor_ID}
+    List Should Contain Value    ${NS_VirtualLink_IDs}    ${response['body']['virtualLinkInfo']['nsVirtualLinkDescId']}            
+    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${SAP_IDs}    ${response['body']['sapInfo']['sapdId']}
diff --git a/SOL005/NSLifecycleManagement-API/environment/variables.txt b/SOL005/NSLifecycleManagement-API/environment/variables.txt
index 0dae31ed9..b1eb55915 100644
--- a/SOL005/NSLifecycleManagement-API/environment/variables.txt
+++ b/SOL005/NSLifecycleManagement-API/environment/variables.txt
@@ -100,8 +100,9 @@ ${tosca_type_NsCP}    tosca.nodes.nfv.Cp
 @{externalCP_IDs}
 @{InstantiationLevel_IDs}
 
-@{NsVirtualLink}
+@{NS_VirtualLink_IDs}
 @{NsCP_IDs}
+@{SAP_IDs}
 
 ${NS_DescriptorID}
 ${Designer}
-- 
GitLab


From cf182b247292f815461f15eabe9021253b783746 Mon Sep 17 00:00:00 2001
From: zafar <zafar@etsi.org>
Date: Tue, 26 Jan 2021 15:28:44 +0500
Subject: [PATCH 253/322] NS descriptors added & minor correction in response
 body parsing

---
 .../IndividualNSInstance.robot                |  1 +
 .../NSLCMOperationKeywords.robot              | 36 +++++++++++--------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot b/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
index 7ac92c149..7fdf881d8 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
@@ -32,6 +32,7 @@ GET Information about an individual NS Instance
     GET IndividualNSInstance
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    NsInstance
+    Check HTTP Response Body NsInstance content against NS Descriptor
     Check HTTP Response Body NsInstance content against VNF Descriptor
     
 PUT Individual NSInstance - Method not implemented 
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index ee1d30742..07adcda22 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -351,18 +351,18 @@ Get Instantiation Levels
 
 Match the Response Attributes with Descriptors
     #Checking Response attributes with VNF Descriptors
-    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfdId']}    ${Descriptor_ID}
-    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfProvider']}    ${Provider}
-    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfProductName']}    ${Product_Name}
-    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfSoftwareVersion']}    ${Software_Version}
-    Should Be Equal As Strings    ${response['body']['vnfInstance']['vnfdVersion']}    ${Descriptor_Version}
-    Should Be Equal As Strings    ${response['body']['vnfInstance']['instantiatedVnfInfo']['flavourId']}    ${Flavour_ID}
-    List Should Contain Value    ${VDU_IDs}    ${response['body']['vnfInstance']['instantiatedVnfInfo']['vnfcResourceInfo']['vduId']}        
-    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${externalCP_IDs}    ${response['body']['vnfInstance']['instantiatedVnfInfo']['extCpInfo']['cpdId']}
-    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${internalCP_IDs}    ${response['body']['vnfInstance']['instantiatedVnfInfo']['extCpInfo']['cpdId']}
-    Run Keyword If  '${descriptorType}'=='SOL001'    List Should Contain Value    ${CP_IDs}    ${response['body']['vnfInstance']['instantiatedVnfInfo']['extCpInfo']['cpdId']}
-    List Should Contain value    ${Storage_IDs}    ${response['body']['vnfInstance']['instantiatedVnfInfo']['virtualStorageResourceInfo']['virtualStorageDescId']}
-    List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['vnfInstance']['instantiatedVnfInfo']['extManagedVirtualLinkInfo']['vnfVirtualLinkDescId']}
+    Should Be Equal As Strings    ${response['body']['vnfInstance'][0]['vnfdId']}    ${Descriptor_ID}
+    Should Be Equal As Strings    ${response['body']['vnfInstance'][0]['vnfProvider']}    ${Provider}
+    Should Be Equal As Strings    ${response['body']['vnfInstance'][0]['vnfProductName']}    ${Product_Name}
+    Should Be Equal As Strings    ${response['body']['vnfInstance'][0]['vnfSoftwareVersion']}    ${Software_Version}
+    Should Be Equal As Strings    ${response['body']['vnfInstance'][0]['vnfdVersion']}    ${Descriptor_Version}
+    Should Be Equal As Strings    ${response['body']['vnfInstance'][0]['instantiatedVnfInfo']['flavourId']}    ${Flavour_ID}
+    List Should Contain Value    ${VDU_IDs}    ${response['body']['vnfInstance'][0]['instantiatedVnfInfo']['vnfcResourceInfo']['vduId']}        
+    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${externalCP_IDs}    ${response['body']['vnfInstance'][0]['instantiatedVnfInfo']['extCpInfo'][0]['cpdId']}
+    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${internalCP_IDs}    ${response['body']['vnfInstance'][0]['instantiatedVnfInfo']['extCpInfo'][0]['cpdId']}
+    Run Keyword If  '${descriptorType}'=='SOL001'    List Should Contain Value    ${CP_IDs}    ${response['body']['vnfInstance'][0]['instantiatedVnfInfo']['extCpInfo'][0]['cpdId']}
+    List Should Contain value    ${Storage_IDs}    ${response['body']['vnfInstance'][0]['instantiatedVnfInfo']['virtualStorageResourceInfo'][0]['virtualStorageDescId']}
+    List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['vnfInstance'][0]['instantiatedVnfInfo']['extManagedVirtualLinkInfo'][0]['vnfVirtualLinkDescId']}
 
 POST New nsInstance with DISABLED nsd
     Log    Create NS instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances
@@ -1361,5 +1361,13 @@ Check Individual NsInstance Content for NSD
 
 Match the Response Attributes with NS Descriptors
     Should Be Equal As Strings    ${response['body']['nsdId']}    ${NSDescriptor_ID}
-    List Should Contain Value    ${NS_VirtualLink_IDs}    ${response['body']['virtualLinkInfo']['nsVirtualLinkDescId']}            
-    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${SAP_IDs}    ${response['body']['sapInfo']['sapdId']}
+    List Should Contain Value    ${NS_VirtualLink_IDs}    ${response['body']['virtualLinkInfo'][0]['nsVirtualLinkDescId']}            
+    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${SAP_IDs}    ${response['body']['sapInfo'][0]['sapdId']}
+
+Check NsLcmOpOcc content against NS Descriptor
+    PARSE the NS Descriptor File
+    Match the NsLcmOpOcc Response Attributes with NS Descriptors
+
+Match the NsLcmOpOcc Response Attributes with NS Descriptors
+    Should Be Equal As Strings    ${response['body']['affectedNss'][0]['nsdId']}    ${NSDescriptor_ID}
+    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${SAP_IDs}    ${response['body']['affectedSaps'][0]['sapdId']}
-- 
GitLab


From 349c85ab8907d9e176454035b99d1e356218ee20 Mon Sep 17 00:00:00 2001
From: zafar <zafar@etsi.org>
Date: Tue, 26 Jan 2021 16:37:40 +0500
Subject: [PATCH 254/322] NS descriptors added for NS-LCM-API test cases

---
 .../IndividualNSLCMOccurences.robot                    |  1 +
 .../NSLCMOperationKeywords.robot                       |  8 +++++---
 .../NotificationConsumer.robot                         |  3 ++-
 .../jsons/InstantiateNsRequest.json                    |  8 +++++---
 .../jsons/NsLcmOperationOccurrenceNotification.json    |  3 +++
 .../jsons/UpdateNsRequest.json                         | 10 ++++++++--
 6 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot b/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
index b0e32dba8..f08fced43 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
@@ -31,6 +31,7 @@ Get status information about Individual NS LCM occurrences
 	GET Individual NS LCM OP Occurrence
 	Check HTTP Response Status Code Is    200
 	Check HTTP Response Body Json Schema Is    NsLcmOpOcc
+	Check NsLcmOpOcc content against NS Descriptor
 	
 PUT status information about Individual NS LCM occurrences - Method not implemented
      [Documentation]    Test ID: 5.3.2.9.3
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index 07adcda22..80b35b549 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -559,8 +559,9 @@ GET Instantiate NSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File
     ${template}=    Get File    jsons/InstantiateNs.json
-    ${body}=        Format String   ${template}     nsFlavourId=${nsFlavourId}   vimAccountId=${vimAccountId}   nsdId=${nsdId}
+    ${body}=        Format String   ${template}     nsFlavourId=${nsFlavourId}   vimAccountId=${vimAccountId}   nsdId=${nsdId}    sapdId=${SAP_IDs[0]}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/instantiate    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -650,9 +651,10 @@ POST Update NSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File 
+    Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File
+    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File  
     ${template} =    Get File    jsons/UpdateNsRequest.json
-    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfFlavourId=${Flavour_ID}    newFlavourId=${Flavour_ID}    vnfVirtualLinkDescId=${VirtualLink_IDs[0]}    instantiationLevelId=${InstantiationLevel_IDs[1]}    vnfInstantiationLevelId=${InstantiationLevel_IDs[0]}    
+    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfFlavourId=${Flavour_ID}    newFlavourId=${Flavour_ID}    vnfVirtualLinkDescId=${VirtualLink_IDs[0]}    instantiationLevelId=${InstantiationLevel_IDs[1]}    vnfInstantiationLevelId=${InstantiationLevel_IDs[0]}    newNsdId=${NS_DescriptorID}    sapdId=${SAP_IDs[0]}    
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/update    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
diff --git a/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot b/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot
index a76b3a899..5944b173e 100644
--- a/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot
+++ b/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot
@@ -67,8 +67,9 @@ Post Ns Lcm Operation Occurrence Notification
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File
+    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File
     ${template} =    Get File    jsons/NsLcmOperationOccurrenceNotification.json
-    ${body}=        Format String   ${template}    nsInstanceId=${nsInstanceId}    nsLcmOpOccId=${nsLcmOpOccId}    subscriptionId=${subscriptionId}    vnfdId=${Descriptor_ID}  
+    ${body}=        Format String   ${template}    nsInstanceId=${nsInstanceId}    nsLcmOpOccId=${nsLcmOpOccId}    subscriptionId=${subscriptionId}    vnfdId=${Descriptor_ID}    nsdId=${NS_DescriptorID}  
     Post    ${callbackResp}    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
diff --git a/SOL005/NSLifecycleManagement-API/jsons/InstantiateNsRequest.json b/SOL005/NSLifecycleManagement-API/jsons/InstantiateNsRequest.json
index e19b6afbb..5d0c060fa 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/InstantiateNsRequest.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/InstantiateNsRequest.json
@@ -1,6 +1,8 @@
-{
+{{
 	"nsFlavourId": "floavour_id",
-	"sapData":[],
+	"sapData":[
+		"{sapdId}"
+	],
 	"addpnfData":[],
 	"vnfInstanceData":[],
 	"nestedNsInstanceData":[],
@@ -8,4 +10,4 @@
 	"additionalParamsForNs":{},
 	"additionalParamForNestedNs":[],
 	"additionalParamsForVnf":[]
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/jsons/NsLcmOperationOccurrenceNotification.json b/SOL005/NSLifecycleManagement-API/jsons/NsLcmOperationOccurrenceNotification.json
index 9a4e3cfb0..706957a30 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/NsLcmOperationOccurrenceNotification.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/NsLcmOperationOccurrenceNotification.json
@@ -12,5 +12,8 @@
 	"affectedVnf": {{
 		"vnfdId": "{vnfdId}"
 	}},
+	"affectedNs": {{
+		"nsdId": "{nsdId}"
+	}},
 	"_links":""
 }}
diff --git a/SOL005/NSLifecycleManagement-API/jsons/UpdateNsRequest.json b/SOL005/NSLifecycleManagement-API/jsons/UpdateNsRequest.json
index 756fa5756..da42b41c1 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/UpdateNsRequest.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/UpdateNsRequest.json
@@ -6,10 +6,16 @@
 		"vnfInstantiationLevelId": "{vnfInstantiationLevelId}"
 		"extManagedVirtualLinks": {{
 			"vnfVirtualLinkDescId": "{vnfVirtualLinkDescId}"
-		}},
+	}},
 	"changeVnfFlavourData": {{
 		"vnfInstanceId": {},
 		"newFlavourId": "{newFlavourId}",
 		"instantiationLevelId": "{instantiationLevelId}"
-		}}
+	}},
+	"assocNewNsdVersionData": {{
+		"newNsdId": "{newNsdId}"
+	}}
+	"addSap": {{
+		"sapdId": "{sapdId}"
+	}}
 }}
\ No newline at end of file
-- 
GitLab


From b0e44fd2e32f25e4d2db9defa88729584383bfd3 Mon Sep 17 00:00:00 2001
From: Sana Zulfiqar <sana.zulfiqar@xflowresearch.com>
Date: Tue, 26 Jan 2021 14:04:30 +0100
Subject: [PATCH 255/322] Bug fix in response parsing

---
 .../VnfLcmOperationKeywords.robot             | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index 1f5c1e031..d7ad8c246 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -1165,13 +1165,13 @@ Match the VNF Instance Response Attributes with Descriptors
     Should Be Equal As Strings    ${response['body']['vnfSoftwareVersion']}    ${Software_Version}
     Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${Descriptor_Version}
     Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['flavourId']}    ${Flavour_ID}
-    List Should Contain Value    ${VDU_IDs}    ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo']['vduId']}        
-    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${externalCP_IDs}    ${response['body']['instantiatedVnfInfo']['extCpInfo']['cpdId']}
-    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${internalCP_IDs}    ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo']['vnfcCpInfo']['cpdId']}
-    Run Keyword If  '${descriptorType}'=='SOL001'    List Should Contain Value    @{CP_IDs}    ${response['body']['instantiatedVnfInfo']['extCpInfo']['cpdId']}
-    Run Keyword If  '${descriptorType}'=='SOL001'    List Should Contain Value    @{CP_IDs}    ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo']['vnfcCpInfo']['cpdId']}
-    List Should Contain value    ${Storage_IDs}    ${response['body']['instantiatedVnfInfo']['virtualStorageResourceInfo']['virtualStorageDescId']}
-    List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['instantiatedVnfInfo']['extManagedVirtualLinkInfo']['vnfVirtualLinkDescId']}
+    List Should Contain Value    ${VDU_IDs}    ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo'][0]['vduId']}        
+    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${externalCP_IDs}    ${response['body']['instantiatedVnfInfo']['extCpInfo'][0]['cpdId']}
+    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${internalCP_IDs}    ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo'][0]['vnfcCpInfo'][0]['cpdId']}
+    Run Keyword If  '${descriptorType}'=='SOL001'    List Should Contain Value    @{CP_IDs}    ${response['body']['instantiatedVnfInfo']['extCpInfo'][0]['cpdId']}
+    Run Keyword If  '${descriptorType}'=='SOL001'    List Should Contain Value    @{CP_IDs}    ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo'][0]['vnfcCpInfo'][0]['cpdId']}
+    List Should Contain value    ${Storage_IDs}    ${response['body']['instantiatedVnfInfo']['virtualStorageResourceInfo'][0]['virtualStorageDescId']}
+    List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['instantiatedVnfInfo']['extManagedVirtualLinkInfo'][0]['vnfVirtualLinkDescId']}
     
 Check HTTP Response Body vnf LCM OpOCCs content against VNF Descriptor
     #{check_multiple_instances} flag, set to 1 to check multiple instances against descriptors
@@ -1194,6 +1194,6 @@ Check Individual VNF LCM Operation Occurence Content
 Match the VNF LCM Operation Occurence Response Attributes with Descriptors  
     Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdId']}    ${Descriptor_ID}
     Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdVersion']}    ${Descriptor_Version}
-    List Should Contain Value    ${VDU_IDs}    ${response['body']['resourceChanges']['affectedVnfcs']['vduId']}    
-    List Should Contain value    ${Storage_IDs}    ${response['body']['resourceChanges']['affectedVirtualStorages']['virtualStorageDescId']}
-    List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['resourceChanges']['affectedVirtualLinks']['vnfVirtualLinkDescId']}
+    List Should Contain Value    ${VDU_IDs}    ${response['body']['resourceChanges']['affectedVnfcs'][0]['vduId']}    
+    List Should Contain value    ${Storage_IDs}    ${response['body']['resourceChanges']['affectedVirtualStorages'][0]['virtualStorageDescId']}
+    List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['resourceChanges']['affectedVirtualLinks'][0]['vnfVirtualLinkDescId']}
-- 
GitLab


From 2491c817919b68e2019f8bb5d91f8923d0fe32ed Mon Sep 17 00:00:00 2001
From: zafar <zafar@etsi.org>
Date: Tue, 26 Jan 2021 18:39:12 +0500
Subject: [PATCH 256/322] NS descriptor checks added in NSDManagement-API

---
 .../IndividualNSDescriptor.robot              |   1 +
 .../IndividualSubscription.robot              |   3 +-
 .../NSDManagementKeywords.robot               |  58 +++-
 SOL005/NSDManagement-API/NSDescriptors.robot  |   1 +
 .../NotificationConsumer.robot                |  13 +-
 ...eference_tst010_nsd_simple_a_b_SOL001.yaml | 113 +++++++
 ...eference_tst010_nsd_simple_a_b_SOL006.yaml | 284 ++++++++++++++++++
 .../environment/variables.txt                 |  11 +-
 .../notifications/NsdChangeNotification.json  |   2 +-
 .../NsdDeletionNotification.json              |   2 +-
 .../NsdOnBoardingFailureNotification.json     |   1 +
 .../NsdOnBoardingNotification.json            |   2 +-
 .../jsons/subscriptions.json                  |   9 +-
 13 files changed, 488 insertions(+), 12 deletions(-)
 create mode 100644 SOL005/NSDManagement-API/descriptors/SOL001/reference_tst010_nsd_simple_a_b_SOL001.yaml
 create mode 100644 SOL005/NSDManagement-API/descriptors/SOL006/reference_tst010_nsd_simple_a_b_SOL006.yaml

diff --git a/SOL005/NSDManagement-API/IndividualNSDescriptor.robot b/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
index cde65701a..4583ca024 100644
--- a/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
+++ b/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
@@ -22,6 +22,7 @@ GET Individual Network Service Descriptor Information
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   NsdInfo
     Check HTTP Response Header Contains ETag
+    Check HTTP Response Body NsInstance content against NS Descriptor
     Check HTTP Response Body NsdInfo Identifier matches the requested Network Service Descriptor Information
 
 GET Individual Network Service Descriptor Information with invalid resource identifier
diff --git a/SOL005/NSDManagement-API/IndividualSubscription.robot b/SOL005/NSDManagement-API/IndividualSubscription.robot
index ec23f9937..932e761c2 100644
--- a/SOL005/NSDManagement-API/IndividualSubscription.robot
+++ b/SOL005/NSDManagement-API/IndividualSubscription.robot
@@ -18,7 +18,8 @@ GET Individual NSD Management Subscription
     ...    Post-Conditions: none
     Get Individual NSD Management Subscription
     Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is   PkgmSubscription
+    Check HTTP Response Body Json Schema Is   NsdmSubscription
+    Check HTTP Response Body NsdmSubscription content against NS Descriptor
     Check HTTP Response Body Subscription Identifier matches the requested Subscription
 
 GET Individual NSD Management Subscription with invalid resource identifier
diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index c5a26d96a..ab160863c 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -10,6 +10,8 @@ Library    JSONSchemaLibrary    schemas/
 Library    RequestsLibrary
 Library    Process
 Library    String
+Variables  descriptors/SOL006/reference_tst010_nsd_simple_a_b_SOL006.yaml
+Variables  descriptors/SOL001/reference_tst010_nsd_simple_a_b_SOL001.yaml
 
 *** Keywords ***
 GET all Network Service Descriptors Information
@@ -784,8 +786,9 @@ Send Post Request for NSD Management Subscription
     Log    Trying to create a new subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File
     ${template}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String   ${template}     notifCallbackUri=${notifCallbackUri}
+    ${body}=        Format String   ${template}     notifCallbackUri=${notifCallbackUri}    nsdId=${NS_DescriptorID}    nsdName=${NS_Name}    nsdVersion=${NS_Version}    nsdDesigner=${Designer}    nsdInvariantId=${NS_InvariantId}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
@@ -798,8 +801,9 @@ Send Post Request for Duplicated NSD Management Subscription
     Log    Trying to create a subscription with an already created content
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File
     ${template}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String   ${template}     notifCallbackUri=${notifCallbackUri}
+    ${body}=        Format String   ${template}     notifCallbackUri=${notifCallbackUri}    nsdId=${NS_DescriptorID}    nsdName=${NS_Name}    nsdVersion=${NS_Version}    nsdDesigner=${Designer}    nsdInvariantId=${NS_InvariantId}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
@@ -1313,3 +1317,53 @@ Send DELETE Request for PNFD Archive Manifest
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
+
+Check HTTP Response Body NsInstance content against NS Descriptor
+    #${check_descriptors} flag, 1 to check descriptors
+    Run Keyword If    ${check_descriptors} == 1    Check Individual NsdInfo Content for NSD
+
+Check Individual NsdInfo Content for NSD 
+    PARSE the NS Descriptor File
+    Match the Response Attributes with NS Descriptors
+    
+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
+    ${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}
+    ${name}=    Get Variable Value    ${topology_template.node_templates.properties.name}
+    ${invariantId}=    Get Variable Value    ${topology_template.node_templates.properties.invariantId}
+    
+    Set Global Variable    ${NS_DescriptorID}    ${ns_descriptor_id}
+    Set Global Variable    ${Designer}    ${designer}
+    Set Global Variable    ${NS_Version}    ${version}
+    Set Global Variable    ${NS_Name}    ${name}
+    Set Global Variable    ${NS_InvariantID}    ${invariantId}
+
+Fetch Information from SOL006 NS descriptor file
+    ${nsd_id}=    Get Variable Value    ${nfv.nsd[0].id}
+    Set Global Variable    ${NS_DescriptorID}    ${nsd_id}
+
+Match the Response Attributes with NS Descriptors
+    Should Be Equal As Strings    ${response['body']['nsdId']}    ${NSDescriptor_ID}
+    Run Keyword If  '${descriptorType}'=='SOL001'    Should Be Equal As Strings    ${response['body']['nsdName']}    ${NS_Name}
+    Run Keyword If  '${descriptorType}'=='SOL001'    Should Be Equal As Strings    ${response['body']['nsdVersion']}    ${NS_Version}
+    Run Keyword If  '${descriptorType}'=='SOL001'    Should Be Equal As Strings    ${response['body']['nsdDesigner']}    ${Designer}
+    Run Keyword If  '${descriptorType}'=='SOL001'    Should Be Equal As Strings    ${response['body']['nsdInvariantId']}    ${NS_InvariantID}
+
+Check HTTP Response Body NsdmSubscription content against NS Descriptor
+    #${check_descriptors} flag, 1 to check descriptors
+    Run Keyword If    ${check_descriptors} == 1    Check Individual NsdmSubscription Content for NSD
+
+Check Individual NsdmSubscription Content for NSD 
+    PARSE the NS Descriptor File
+    Match the NsdmSubscription Response Attributes with NS Descriptors
+    
+Match the NsdmSubscription Response Attributes with NS Descriptors
+    Should Be Equal As Strings    ${response['body']['filter']['nsdId']}    ${NSDescriptor_ID}
+    Run Keyword If  '${descriptorType}'=='SOL001'    Should Be Equal As Strings    ${response['body']['filter']['nsdName']}    ${NS_Name}
+    Run Keyword If  '${descriptorType}'=='SOL001'    Should Be Equal As Strings    ${response['body']['filter']['nsdVersion']}    ${NS_Version}
+    Run Keyword If  '${descriptorType}'=='SOL001'    Should Be Equal As Strings    ${response['body']['filter']['nsdDesigner']}    ${Designer}
+    Run Keyword If  '${descriptorType}'=='SOL001'    Should Be Equal As Strings    ${response['body']['filter']['nsdInvariantId']}    ${NS_InvariantID}
diff --git a/SOL005/NSDManagement-API/NSDescriptors.robot b/SOL005/NSDManagement-API/NSDescriptors.robot
index 1e4c1086b..c03af8250 100644
--- a/SOL005/NSDManagement-API/NSDescriptors.robot
+++ b/SOL005/NSDManagement-API/NSDescriptors.robot
@@ -154,6 +154,7 @@ Create new Network Service Descriptor Resource
     Check HTTP Response Body Json Schema Is   NsdInfo
     Check HTTP Response Header Contains    Location
     Check Postcondition NsdInfo Exists
+    Check HTTP Response Body NsInstance content against NS Descriptor
 
 PUT all Network Service Descriptors - Method not implemented
     [Documentation]    Test ID: 5.3.1.1.12
diff --git a/SOL005/NSDManagement-API/NotificationConsumer.robot b/SOL005/NSDManagement-API/NotificationConsumer.robot
index c2be1b866..59492691d 100644
--- a/SOL005/NSDManagement-API/NotificationConsumer.robot
+++ b/SOL005/NSDManagement-API/NotificationConsumer.robot
@@ -6,6 +6,7 @@ Library           JSONLibrary
 Library           String
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
 Suite Setup    Check resource existence and get CallbackUri
+Resource          NSDManagementKeywords.robot
 
 *** Test Cases ***
 NSD Onboarding Notification
@@ -112,8 +113,9 @@ Post NSD Onboarding Notification
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File
     ${template} =    Get File    jsons/notifications/NsdOnBoardingNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsdInfoId=${nsdInfoId} 
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsdInfoId=${nsdInfoId}    nsdId=${NS_DescriptorID}    
     Post    ${callbackResp}    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -123,8 +125,9 @@ Post NSD Onboarding Failure Notification
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File    
     ${template} =    Get File    jsons/notifications/NsdOnBoardingFailureNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsdInfoId=${nsdInfoId} 
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsdInfoId=${nsdInfoId}    nsdId=${NS_DescriptorID}     
     Post    ${callbackResp}    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -134,8 +137,9 @@ Post NSD Change Notification
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File        
     ${template} =    Get File    jsons/notifications/NsdChangeNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsdInfoId=${nsdInfoId} 
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsdInfoId=${nsdInfoId}    nsdId=${NS_DescriptorID} 
     Post    ${callbackResp}    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -145,8 +149,9 @@ Post NSD Deletion Notification
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File        
     ${template} =    Get File    jsons/notifications/NsdDeletionNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsdInfoId=${nsdInfoId} 
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsdInfoId=${nsdInfoId}    nsdId=${NS_DescriptorID} 
     Post    ${callbackResp}    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
diff --git a/SOL005/NSDManagement-API/descriptors/SOL001/reference_tst010_nsd_simple_a_b_SOL001.yaml b/SOL005/NSDManagement-API/descriptors/SOL001/reference_tst010_nsd_simple_a_b_SOL001.yaml
new file mode 100644
index 000000000..a2a363b27
--- /dev/null
+++ b/SOL005/NSDManagement-API/descriptors/SOL001/reference_tst010_nsd_simple_a_b_SOL001.yaml
@@ -0,0 +1,113 @@
+tosca_definitions_version: "tosca_simple_yaml_1_2"
+tosca_default_namespace: "toscanfv"
+description: "Referenxce NSD descriptor "
+metadata:
+  descriptor_id: "NSD_WITH_2_VNF"
+  vendor: "ETSI"
+  version: "1.0"
+topology_template:
+  substitution_mappings:
+    node_type: "tosca.nodes.nfv.NS"
+    requirements:
+      right: [VNF_A, ext_a_right]
+      left: [VNF_B, ext_b_left]
+      mgmt_a: [VNF_A, management_vnf_a]
+      mgmt_b: [VNF_B, management_vnf_b]
+  node_templates:
+    VNF_A:
+      type: "tosca.nodes.nfv.VNF"
+      properties:
+        descriptor_id: "VNF-A"
+        descriptor_version: "1.0"
+        provider: "ETSI TST WG"
+        product_name: "VNF-A"
+        software_version: "1.0"
+        product_info_name: "VNF-A"
+        product_info_description: "TST010 reference VNF-A"
+        flavour_id: "VNF-A_flavor"
+        flavour_description: "VNF-A flavor"
+        vnfm_info: 
+          - 'etsivnfm:v2.3.1'
+      requirements:
+        virtualLink:
+          ext_a_right: "vl_right"
+          management_vnf_a: "vl_mgmt"
+          int_a_data: "vl_data"
+    VNF_B:
+      type: "tosca.nodes.nfv.VNF"
+      properties:
+        descriptorId: "VNF-B"
+        descriptorVersion: "1.0"
+        provider: "ETSI TST WG"
+        productName: "VNF-B"
+        softwareVersion: "1.0"
+        productInfoName: "VNF-B"
+        productInfoDescription: "TST010 reference VNF-A"
+        defaultLocalizationLanguage: null
+        flavourId: "VNF-B_flavor"
+        flavourDescription: "VNF-B flavor"
+        vnfm_info: 
+          - 'etsivnfm:v2.3.1'
+      requirements:
+        virtualLink:
+          ext_b_left: "vl_left"
+          management_vnf_b: "vl_mgmt"
+          int_b_data: "vl_data"
+    NS_with_2_VNF:
+      type: "tosca.nodes.nfv.NS"
+      properties:
+        descriptorId: "NS with 2 VNFs"
+        designer: "ETSI TST WG"
+        version: "1.0"
+        name: "ns_with_2_vnfs"
+        invariantId: "ns_with_2_vnfs"
+      requirements:
+        virtualLink:
+        - "vl_left"
+        - "vl_right"
+        - "vl_mgmt"
+        - "vl_data"
+    vl_left:
+      type: "tosca.nodes.nfv.NsVirtualLink"
+      properties:
+        description: "VNF-B external connetivity"
+        vlProfile: 
+          max_bitrate_requirements:
+            root: 1000
+          min_bitrate_requirements:  
+            root: 1000
+        connectivityType:
+          layer_protocols: [ipv4]
+    vl_right: 
+      type: "tosca.nodes.nfv.NsVirtualLink"
+      properties:
+        description: "VNF-A external connectivity"
+        vlProfile: 
+          max_bitrate_requirements:
+            root: 1000
+          min_bitrate_requirements:  
+            root: 1000
+        connectivityType:
+          layer_protocols: [ipv4]
+    vl_mgmt: 
+      type: "tosca.nodes.nfv.NsVirtualLink"
+      properties:
+        description: "Management network"
+        vlProfile: 
+          max_bitrate_requirements:
+            root: 1000
+          min_bitrate_requirements:  
+            root: 1000
+        connectivityType:
+          layer_protocols: [ipv4]
+    vl_data: 
+      type: "tosca.nodes.nfv.NsVirtualLink"
+      properties:
+        description: "Internal network that interconnect VNF-A and VNF-B"
+        vlProfile: 
+          max_bitrate_requirements:
+            root: 1000
+          min_bitrate_requirements:  
+            root: 1000
+        connectivityType:
+          layer_protocols: [ipv4]
diff --git a/SOL005/NSDManagement-API/descriptors/SOL006/reference_tst010_nsd_simple_a_b_SOL006.yaml b/SOL005/NSDManagement-API/descriptors/SOL006/reference_tst010_nsd_simple_a_b_SOL006.yaml
new file mode 100644
index 000000000..b29b2dfc7
--- /dev/null
+++ b/SOL005/NSDManagement-API/descriptors/SOL006/reference_tst010_nsd_simple_a_b_SOL006.yaml
@@ -0,0 +1,284 @@
+nfv:
+  vnfd:
+    - id: VNF-A
+      provider: ETSI TST WG
+      product-name: TST010 reference VNF-A
+      software-version: '1.0'
+      version: '1.0'
+      vnfm-info: ETSI VNFM
+      vdu:
+      - id: vdu-a-1
+        name: VNF A VDU 1
+        int-cpd:
+          - id: right
+            layer-protocol: ethernet
+          - id: management
+            layer-protocol: ethernet
+          - id: left
+            layer-protocol: ethernet
+        virtual-compute-desc: vdu-a-1-vcd
+        virtual-storage-desc: vdu-a-1-vsd
+        sw-image-desc: asa-image
+      virtual-compute-desc:
+        id: vdu-a-1-vcd
+        virtual-memory:
+          size: '4.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-a-1-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-a-1-image
+        name: vdu-a-1 image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/vnf-a.qcow2'
+      int-virtual-link-desc:
+      - id: right-vl
+        flavour:
+          id: right-vl-flavour
+          qos:
+            latency: '1'
+            packet-delay-variation: '1'
+            packet-loss-ratio: '0.02'
+        connectivity-type:
+          layer-protocol: ethernet
+      ext-cpd:
+        - id: ext-a-right
+          int-virtual-link-desc: right-vl
+          layer-protocol: ethernet
+        - id: management
+          int-cpd:
+            vdu-id: vdu-a-1
+            cpd: management
+          layer-protocol: ethernet
+        - id: ext-a-left
+          int-cpd:
+            vdu-id: vdu-a-1
+            cpd: left
+          layer-protocol: ethernet
+      df:
+        id: normal
+        vdu-profile:
+          id: vdu-a-1
+          min-number-of-instances: '1'
+          max-number-of-instances: '2'
+        virtual-link-profile:
+          id: right-vl
+          flavour: right-vl-flavour
+          max-bit-rate-requirements:
+            root: '10'
+          min-bit-rate-requirements:
+            root: '1'
+          virtual-link-protocol-data:
+            associated-layer-protocol: ipv4
+            l3-protocol-data:
+              name: right-network
+              ip-version: ipv4
+              cidr: 10.10.10.0/32
+              gateway-ip: 10.10.10.1
+              dhcp-enabled: 'true'
+        instantiation-level:
+          - id: double
+            vdu-level:
+              vdu-id: vdu-a-1
+              number-of-instances: '2'
+          - id: single
+            vdu-level:
+              vdu-id: vdu-a-1
+              number-of-instances: '1'
+        default-instantiation-level: single
+        lcm-operations-configuration:
+          scale-vnf-to-level-op-config:
+            arbitrary-target-levels-supported: 'true'
+          terminate-vnf-op-config:
+            min-graceful-termination: '1'
+          operate-vnf-op-config:
+            min-graceful-stop-timeout: '1'
+    - id: VNF-B
+      provider: ETSI TST WG
+      product-name: TST010 reference VNF-B
+      software-version: '2.0'
+      version: '2.0'
+      vnfm-info: ETSI VNFM
+      vdu:
+      - id: vdu-b-1
+        name: VNF-B VDU 1
+        int-cpd:
+          - id: left
+            layer-protocol: ethernet
+          - id: management
+            layer-protocol: ethernet
+          - id: right
+            layer-protocol: ethernet
+        virtual-compute-desc: vdu-b-1-vcd
+        virtual-storage-desc: vdu-b-1-vsd
+        sw-image-desc: vdu-b-1-image
+      virtual-compute-desc:
+        id: vdu-b-1-vcd
+        virtual-memory:
+          size: '4.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-1-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-1-image
+        name: VNF-B image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B.qcow2'
+      ext-cpd:
+        - id: ext-b-left
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: left
+          layer-protocol: ethernet
+        - id: management
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: management
+          layer-protocol: ethernet
+        - id: ext-b-right
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: right
+          layer-protocol: ethernet
+      df:
+        id: normal
+        vdu-profile:
+          id: vdu-b-1
+          min-number-of-instances: '1'
+          max-number-of-instances: '2'
+        instantiation-level:
+          - id: double
+            vdu-level:
+              vdu-id: vdu-b-1
+              number-of-instances: '2'
+          - id: single
+            vdu-level:
+              vdu-id: vdu-b-1
+              number-of-instances: '1'
+        default-instantiation-level: single
+        lcm-operations-configuration:
+          scale-vnf-to-level-op-config:
+            arbitrary-target-levels-supported: 'true'
+          terminate-vnf-op-config:
+            min-graceful-termination: '1'
+          operate-vnf-op-config:
+            min-graceful-stop-timeout: '1'
+  nsd:
+    - id: tst010-nsd
+      vnfd-id:
+        - VNF-A
+        - VNF-B
+      sapd:
+        - id: right-sap
+          vnf:
+            vnfd-id: VNF-A
+            ext-cpd-id: ext-a-right
+        - id: management-sap
+          virtual-link-desc: mgmt
+        - id: left-sap
+          vnf:
+            vnfd-id: VNF-B
+            ext-cpd-id: ext-b-left
+      virtual-link-desc:
+        - id: mgmt
+          connectivity-type:
+            layer-protocol: ipv4
+          df:
+            id: normal
+            qos:
+              latency: '0'
+              packet-delay-variation: '0'
+        - id: A-to-B
+          connectivity-type:
+            layer-protocol: ethernet
+          df:
+            id: normal
+            qos:
+              latency: '0'
+              packet-delay-variation: '0'
+      df:
+        - id: normal
+          vnf-profile:
+            - id: vnf-a-profile
+              vnfd-id: VNF-A
+              flavour-id: normal
+              instantiation-level: single
+              min-number-of-instances: '1'
+              max-number-of-instances: '1'
+              virtual-link-connectivity:
+                - virtual-link-profile-id: mgmt
+                  constituent-cpd-id:
+                    constituent-base-element-id: vdu-a-1
+                    constituent-cpd-id: management
+                - virtual-link-profile-id: A-to-B
+                  constituent-cpd-id:
+                    constituent-base-element-id: vdu-a-1
+                    constituent-cpd-id: left
+            - id: vnf-b-profile
+              vnfd-id: VNF-B
+              flavour-id: normal
+              instantiation-level: single
+              min-number-of-instances: '1'
+              max-number-of-instances: '1'
+              virtual-link-connectivity:
+                - virtual-link-profile-id: mgmt
+                  constituent-cpd-id:
+                    constituent-base-element-id: vdu-b-1
+                    constituent-cpd-id: management
+                - virtual-link-profile-id: A-to-B
+                  constituent-cpd-id:
+                    constituent-base-element-id: vdu-b-1
+                    constituent-cpd-id: right
+          virtual-link-profile:
+            - id: mgmt
+              virtual-link-desc-id: mgmt
+              flavour-id: normal
+              max-bitrate-requirements:
+                root: '1000'
+              min-bitrate-requirements:
+                root: '0'
+            - id: A-to-B
+              virtual-link-desc-id: A-to-B
+              flavour-id: normal
+              max-bitrate-requirements:
+                root: '10000000'
+              min-bitrate-requirements:
+                root: '0'
+          ns-instantiation-level:
+            - id: normal
+              description: Single VNF-A and VNF-B
+              vnf-to-level-mapping:
+                - vnf-profile-id: vnf-a-profile
+                  number-of-instances: '1'
+                - vnf-profile-id: vnf-b-profile
+                  number-of-instances: '1'
+            - id: double-A
+              description: Single VNF-B and Double VNF-A
+              vnf-to-level-mapping:
+                - vnf-profile-id: vnf-a-profile
+                  number-of-instances: '2'
+                - vnf-profile-id: vnf-b-profile
+                  number-of-instances: '1'
+                  default-instantiation-level: normal
diff --git a/SOL005/NSDManagement-API/environment/variables.txt b/SOL005/NSDManagement-API/environment/variables.txt
index b837bc7c5..b1441c67c 100644
--- a/SOL005/NSDManagement-API/environment/variables.txt
+++ b/SOL005/NSDManagement-API/environment/variables.txt
@@ -91,4 +91,13 @@ ${notifCallbackUri}     http://172.22.1.7:9091/nsd/subscriptions
 ${filter_ok}      callbackUri=${notifCallbackUri}
 ${filter_ko}      nfvId=f9f130e4-05eb-4082-a676-4c97d13a883d    # Not existant filter attribute-based
 
-${callbackResp}    127.0.0.1
\ No newline at end of file
+${callbackResp}    127.0.0.1
+
+${check_descriptors}    1
+${descriptorType}    SOL001
+
+${NS_DescriptorID}
+${Designer}
+${NS_Name}
+${NS_Version}
+${NS_InvariantId}
diff --git a/SOL005/NSDManagement-API/jsons/notifications/NsdChangeNotification.json b/SOL005/NSDManagement-API/jsons/notifications/NsdChangeNotification.json
index 349ca5465..302e08521 100644
--- a/SOL005/NSDManagement-API/jsons/notifications/NsdChangeNotification.json
+++ b/SOL005/NSDManagement-API/jsons/notifications/NsdChangeNotification.json
@@ -4,7 +4,7 @@
 	"subscriptionId":"{subscriptionId}",
 	"timeStamp":"",
 	"nsdInfoId":"{nsdInfoId}",
-	"nsdId":"",
+	"nsdId":"{nsdId}",
 	"nsdOperationalState":"ENABLED",
 	"_links":""
 }}
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/jsons/notifications/NsdDeletionNotification.json b/SOL005/NSDManagement-API/jsons/notifications/NsdDeletionNotification.json
index 6909a5c25..a96e0dd3c 100644
--- a/SOL005/NSDManagement-API/jsons/notifications/NsdDeletionNotification.json
+++ b/SOL005/NSDManagement-API/jsons/notifications/NsdDeletionNotification.json
@@ -4,6 +4,6 @@
 	"subscriptionId":"{subscriptionId}",
 	"timeStamp":"",
 	"nsdInfoId":"{nsdInfoId}",
-	"nsdId":"",
+	"nsdId":"{nsdId}",
 	"_links":""
 }}
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/jsons/notifications/NsdOnBoardingFailureNotification.json b/SOL005/NSDManagement-API/jsons/notifications/NsdOnBoardingFailureNotification.json
index 80cb4e8b6..23a4e52ae 100644
--- a/SOL005/NSDManagement-API/jsons/notifications/NsdOnBoardingFailureNotification.json
+++ b/SOL005/NSDManagement-API/jsons/notifications/NsdOnBoardingFailureNotification.json
@@ -5,5 +5,6 @@
 	"timeStamp":"",
 	"nsdInfoId":"{nsdInfoId}",
 	"onboardingFailureDetails":"",
+	"nsdId": "{nsdId}",
 	"_links":""
 }}
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/jsons/notifications/NsdOnBoardingNotification.json b/SOL005/NSDManagement-API/jsons/notifications/NsdOnBoardingNotification.json
index 5b9b4a221..9c0481100 100644
--- a/SOL005/NSDManagement-API/jsons/notifications/NsdOnBoardingNotification.json
+++ b/SOL005/NSDManagement-API/jsons/notifications/NsdOnBoardingNotification.json
@@ -4,6 +4,6 @@
 	"subscriptionId":"{subscriptionId}",
 	"timeStamp":"",
 	"nsdInfoId":"{nsdInfoId}",
-	"nsdId":"",
+	"nsdId": "{nsdId}",
 	"_links":""
 }}
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/jsons/subscriptions.json b/SOL005/NSDManagement-API/jsons/subscriptions.json
index 7aa8965f3..a82df503c 100644
--- a/SOL005/NSDManagement-API/jsons/subscriptions.json
+++ b/SOL005/NSDManagement-API/jsons/subscriptions.json
@@ -1,3 +1,10 @@
 {{
-	"callbackUri": "{notifCallbackUri}"
+	"callbackUri": "{notifCallbackUri}",
+	"filter": {{
+		"nsdId": "{nsdId}",
+		"nsdName": "{nsdName}",
+		"nsdVersion": "{nsdVersion}",
+		"nsdDesigner": "{nsdDesigner}",
+		"nsdInvariantId": "{nsdInvariantId}"
+	}}
 }}
\ No newline at end of file
-- 
GitLab


From 4f6801ae340be1d026cad1db4ca388b994b076d0 Mon Sep 17 00:00:00 2001
From: zafar <zafar@etsi.org>
Date: Tue, 26 Jan 2021 18:48:27 +0500
Subject: [PATCH 257/322] redundant lines of code removed in
 VNFPackageManagement-API Keywords

---
 .../VNFPackageManagementKeywords.robot        | 96 +------------------
 1 file changed, 5 insertions(+), 91 deletions(-)

diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 93d007475..f6fa8adbb 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -196,38 +196,11 @@ 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
-    @{VDU_labels}=    Create List
-    @{VNF_labels}=    Create List
-    @{VirtualLink_labels}=    Create List
-    @{CP_labels}=    Create List
-    @{Storage_labels}=    Create List
-    FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
-        ${key_type}=    Get Variable Value    ${topology_template.node_templates.${key}.type}
-        ${VDU_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}   ${tosca_type_VDU_compute}
-        ${VNF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_VNF}
-        ${Link_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_virtual_link}
-        ${VDUcp_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_VDU_cp}
-        ${Storage_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_storage}
-        Run Keyword If    ${VDU_check}    Append To List    ${VDU_labels}    ${key}
-        Run Keyword If    ${VNF_check}    Append To List    ${VNF_labels}    ${key}
-        Run Keyword If    ${VNF_check}    Get VNF Attributes from SOL001    ${key}            
-        Run Keyword If    ${Link_check}    Append To List    ${VirtualLink_labels}    ${key}
-        Run Keyword If    ${VDUcp_check}    Append To List    ${CP_labels}    ${key}
-        Run Keyword If    ${Storage_check}    Append To List    ${Storage_labels}    ${key}
-    END
-    Set Global Variable    @{VDU_IDs}    @{VDU_labels}
-    Set Global Variable    @{VNF_IDs}    @{VNF_labels}
-    Set Global Variable    @{VirtualLink_IDs}    @{VirtualLink_labels}
-    Set Global Variable    @{CP_IDs}    @{CP_labels}
-    Set Global Variable    @{Storage_IDs}    @{Storage_labels}
-
-Get VNF Attributes from SOL001
-    [Arguments]    ${VNF_label}
-    ${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}
-    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.software_version}
-    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.descriptor_version}
+    ${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}
+    ${software_version}=    Get Variable Value    ${topology_template.node_templates.properties.software_version}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.properties.descriptor_version}
     
     Set Global Variable    ${Descriptor_ID}    ${descriptor_id}
     Set Global Variable    ${Provider}    ${provider}
@@ -241,71 +214,12 @@ Fetch Information from SOL006 descriptor file
     ${product_name}=    Get Variable Value    ${nfv.vnfd[0].product-name}
     ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}
     ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}    
-    ${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}
-    ${instantiation_levels}=    Get Length    ${nfv.vnfd[0].df.instantiation_level}    
-    FOR    ${key}    IN    @{nfv.vnfd[0].keys()}
-        ${VDU_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    vdu
-        Run Keyword If    ${VDU_check}    Get VDU IDs    ${VDUcount}
-        ${extCP_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    ext_cpd
-        Run Keyword If    ${extCP_check}    Get External CP IDs    ${extCP_count}
-        ${virtualLink_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    int_virtual_link_desc
-        Run Keyword If    ${virtualLink_check}    Get Virtual Link IDs   ${virtualLink_count}    
-        ${DF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    df
-        Run Keyword If    ${DF_check}    Get Instantiation Levels    ${instantiation_levels}    
-    END
     Set Global Variable    ${Descriptor_ID}    ${descriptor_id}
     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}
 
-Get VDU IDs
-    [Arguments]    ${count}    
-    @{VDU_labels}=    Create List
-    ${Storage_labels}=    Create List
-    FOR    ${i}    IN RANGE    ${count}
-        Append To List    ${VDU_labels}    ${nfv.vnfd[0].vdu[${i}].id}
-        Append To List    ${Storage_labels}    ${nfv.vnfd[0].vdu[${i}].virtual_storage_desc} 
-        Get Internal CPs for each VDU    ${i}   
-    END
-    Set Global Variable    ${VDU_IDs}    ${VDU_labels}
-    Set Global Variable    ${Storage_IDs}    ${Storage_labels}
-            
-Get Internal CPs for each VDU
-    [Arguments]    ${vdu}
-    ${count}=    Get Length    ${nfv.vnfd[0].vdu[${vdu}].int_cpd}    
-    ${internal_CPs}=    Create List
-    FOR    ${i}    IN RANGE    ${count}
-        Append To List    ${internal_CPs}    ${nfv.vnfd[0].vdu[${vdu}].int_cpd[${i}].id} 
-    END
-    Set Global Variable    ${internalCP_IDs}    ${internal_CPs}
-    
-Get External CP IDs
-    [Arguments]    ${count}    
-    @{external_CPs}=    Create List
-    FOR    ${i}    IN RANGE    ${count}
-        Append To List    ${external_CPs}    ${nfv.vnfd[0].ext_cpd[${i}].id} 
-    END
-    Set Global Variable    ${externalCP_IDs}    ${external_CPs}
-
-Get Virtual Link IDs
-    [Arguments]    ${count}    
-    ${VirtualLink_labels}=    Create List
-    FOR    ${i}    IN RANGE    ${count}
-        Append To List    ${VirtualLink_labels}    ${nfv.vnfd[0].int_virtual_link_desc[${i}].id} 
-    END
-    Set Global Variable    ${VirtualLink_IDs}    ${VirtualLink_labels}
-
-Get Instantiation Levels
-    [Arguments]    ${count}
-    @{Instantiation_Levels}=    Create List
-    FOR    ${i}    IN RANGE    ${count}
-        Append To List    ${Instantiation_Levels}    ${nfv.vnfd[0].df.instantiation_level[${i}].id} 
-    END
-    Set Global Variable    ${InstantiationLevel_IDs}    ${Instantiation_Levels}
-
 Match the Response Attributes of vnfPkgInfo with Descriptors
     #Checking Response attributes with VNF Descriptors
     Should Be Equal As Strings    ${response['body']['vnfdId']}    ${Descriptor_Id}
-- 
GitLab


From f767c238bced9e7834c39f62f2fb5d9fe42b46d7 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Tue, 26 Jan 2021 18:40:49 +0100
Subject: [PATCH 258/322] updated reference descriptors in NS LCM

---
 .../NSLCMOperationKeywords.robot              |   7 +-
 ...> reference_tst010_nsd_simple_SOL001.yaml} |  50 +--
 ... => reference_tst010_vnf_2vdu_SOL001.yaml} |   4 +-
 .../reference_tst010_nsd_simple_SOL006.yaml   |  58 ++++
 ...eference_tst010_nsd_simple_a_b_SOL006.yaml | 284 ------------------
 .../reference_tst010_vnf_2vdu_SOL006.yaml     | 138 +++++++++
 6 files changed, 211 insertions(+), 330 deletions(-)
 rename SOL005/NSLifecycleManagement-API/descriptors/SOL001/NSD/{reference_tst010_nsd_simple_a_b_SOL001.yaml => reference_tst010_nsd_simple_SOL001.yaml} (60%)
 rename SOL005/NSLifecycleManagement-API/descriptors/SOL001/VNFD/{reference_tst010_vnf_b_2vdu_SOL001.yaml => reference_tst010_vnf_2vdu_SOL001.yaml} (98%)
 create mode 100644 SOL005/NSLifecycleManagement-API/descriptors/SOL006/NSD/reference_tst010_nsd_simple_SOL006.yaml
 delete mode 100644 SOL005/NSLifecycleManagement-API/descriptors/SOL006/NSD/reference_tst010_nsd_simple_a_b_SOL006.yaml
 create mode 100644 SOL005/NSLifecycleManagement-API/descriptors/SOL006/VNFD/reference_tst010_vnf_2vdu_SOL006.yaml

diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index 80b35b549..8dde1509e 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -8,9 +8,10 @@ Library    OperatingSystem
 Library    MockServerLibrary
 Library    Collections
 Library    String
-Variables  descriptors/SOL006/NSD/reference_tst010_nsd_simple_a_b_SOL006.yaml
-Variables  descriptors/SOL001/VNFD/reference_tst010_vnf_b_2vdu_SOL001.yaml
-Variables  descriptors/SOL001/NSD/reference_tst010_nsd_simple_a_b_SOL001.yaml
+Variables  descriptors/SOL006/VNFD/reference_tst010_vnf_2vdu_SOL006.yaml
+Variables  descriptors/SOL006/NSD/reference_tst010_nsd_simple_SOL006.yaml
+Variables  descriptors/SOL001/VNFD/reference_tst010_vnf_2vdu_SOL001.yaml
+Variables  descriptors/SOL001/NSD/reference_tst010_nsd_simple_SOL001.yaml
 
 *** Keywords ***
 Initialize System
diff --git a/SOL005/NSLifecycleManagement-API/descriptors/SOL001/NSD/reference_tst010_nsd_simple_a_b_SOL001.yaml b/SOL005/NSLifecycleManagement-API/descriptors/SOL001/NSD/reference_tst010_nsd_simple_SOL001.yaml
similarity index 60%
rename from SOL005/NSLifecycleManagement-API/descriptors/SOL001/NSD/reference_tst010_nsd_simple_a_b_SOL001.yaml
rename to SOL005/NSLifecycleManagement-API/descriptors/SOL001/NSD/reference_tst010_nsd_simple_SOL001.yaml
index a2a363b27..484f96376 100644
--- a/SOL005/NSLifecycleManagement-API/descriptors/SOL001/NSD/reference_tst010_nsd_simple_a_b_SOL001.yaml
+++ b/SOL005/NSLifecycleManagement-API/descriptors/SOL001/NSD/reference_tst010_nsd_simple_SOL001.yaml
@@ -2,37 +2,17 @@ tosca_definitions_version: "tosca_simple_yaml_1_2"
 tosca_default_namespace: "toscanfv"
 description: "Referenxce NSD descriptor "
 metadata:
-  descriptor_id: "NSD_WITH_2_VNF"
+  descriptor_id: "NSD_WITH_1_VNF"
   vendor: "ETSI"
   version: "1.0"
 topology_template:
   substitution_mappings:
     node_type: "tosca.nodes.nfv.NS"
     requirements:
-      right: [VNF_A, ext_a_right]
+      right: [VNF_A, ext_b_right]
       left: [VNF_B, ext_b_left]
-      mgmt_a: [VNF_A, management_vnf_a]
       mgmt_b: [VNF_B, management_vnf_b]
   node_templates:
-    VNF_A:
-      type: "tosca.nodes.nfv.VNF"
-      properties:
-        descriptor_id: "VNF-A"
-        descriptor_version: "1.0"
-        provider: "ETSI TST WG"
-        product_name: "VNF-A"
-        software_version: "1.0"
-        product_info_name: "VNF-A"
-        product_info_description: "TST010 reference VNF-A"
-        flavour_id: "VNF-A_flavor"
-        flavour_description: "VNF-A flavor"
-        vnfm_info: 
-          - 'etsivnfm:v2.3.1'
-      requirements:
-        virtualLink:
-          ext_a_right: "vl_right"
-          management_vnf_a: "vl_mgmt"
-          int_a_data: "vl_data"
     VNF_B:
       type: "tosca.nodes.nfv.VNF"
       properties:
@@ -50,23 +30,22 @@ topology_template:
           - 'etsivnfm:v2.3.1'
       requirements:
         virtualLink:
+          ext_b_right: "vl_right"
           ext_b_left: "vl_left"
           management_vnf_b: "vl_mgmt"
-          int_b_data: "vl_data"
-    NS_with_2_VNF:
+    NS_with_1_VNF:
       type: "tosca.nodes.nfv.NS"
       properties:
-        descriptorId: "NS with 2 VNFs"
+        descriptorId: "NS with 1 VNF"
         designer: "ETSI TST WG"
         version: "1.0"
-        name: "ns_with_2_vnfs"
-        invariantId: "ns_with_2_vnfs"
+        name: "ns_with_1_vnfs"
+        invariantId: "ns_with_1_vnfs"
       requirements:
         virtualLink:
         - "vl_left"
         - "vl_right"
         - "vl_mgmt"
-        - "vl_data"
     vl_left:
       type: "tosca.nodes.nfv.NsVirtualLink"
       properties:
@@ -81,7 +60,7 @@ topology_template:
     vl_right: 
       type: "tosca.nodes.nfv.NsVirtualLink"
       properties:
-        description: "VNF-A external connectivity"
+        description: "VNF-B external connectivity"
         vlProfile: 
           max_bitrate_requirements:
             root: 1000
@@ -99,15 +78,4 @@ topology_template:
           min_bitrate_requirements:  
             root: 1000
         connectivityType:
-          layer_protocols: [ipv4]
-    vl_data: 
-      type: "tosca.nodes.nfv.NsVirtualLink"
-      properties:
-        description: "Internal network that interconnect VNF-A and VNF-B"
-        vlProfile: 
-          max_bitrate_requirements:
-            root: 1000
-          min_bitrate_requirements:  
-            root: 1000
-        connectivityType:
-          layer_protocols: [ipv4]
+          layer_protocols: [ipv4]
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/descriptors/SOL001/VNFD/reference_tst010_vnf_b_2vdu_SOL001.yaml b/SOL005/NSLifecycleManagement-API/descriptors/SOL001/VNFD/reference_tst010_vnf_2vdu_SOL001.yaml
similarity index 98%
rename from SOL005/NSLifecycleManagement-API/descriptors/SOL001/VNFD/reference_tst010_vnf_b_2vdu_SOL001.yaml
rename to SOL005/NSLifecycleManagement-API/descriptors/SOL001/VNFD/reference_tst010_vnf_2vdu_SOL001.yaml
index e9159106a..3a90f45bf 100644
--- a/SOL005/NSLifecycleManagement-API/descriptors/SOL001/VNFD/reference_tst010_vnf_b_2vdu_SOL001.yaml
+++ b/SOL005/NSLifecycleManagement-API/descriptors/SOL001/VNFD/reference_tst010_vnf_2vdu_SOL001.yaml
@@ -105,10 +105,10 @@ topology_template:
         sw_image:
           type: tosca.artifacts.nfv.SwImage
           file: vdu-b-2.qcow2
-    vnf_b_1_VNF:
+    VNF_B:
       type: "tosca.nodes.nfv.VNF"
       properties:
-        descriptor_id: "VNF-B-2VDUs"
+        descriptor_id: "VNF_B"
         descriptor_version: "2.0"
         provider: "ETSI TST WG"
         product_name: "VNF-B-2VDUs"
diff --git a/SOL005/NSLifecycleManagement-API/descriptors/SOL006/NSD/reference_tst010_nsd_simple_SOL006.yaml b/SOL005/NSLifecycleManagement-API/descriptors/SOL006/NSD/reference_tst010_nsd_simple_SOL006.yaml
new file mode 100644
index 000000000..c0a6f9242
--- /dev/null
+++ b/SOL005/NSLifecycleManagement-API/descriptors/SOL006/NSD/reference_tst010_nsd_simple_SOL006.yaml
@@ -0,0 +1,58 @@
+nfv:
+  nsd:
+    - id: tst010-nsd
+      vnfd-id:
+        - VNF-B
+      sapd:
+        - id: right-sap
+          vnf:
+            vnfd-id: VNF-B
+            ext-cpd-id: ext-b-right
+        - id: management-sap
+          virtual-link-desc: mgmt
+        - id: left-sap
+          vnf:
+            vnfd-id: VNF-B
+            ext-cpd-id: ext-b-left
+      virtual-link-desc:
+        - id: mgmt
+          connectivity-type:
+            layer-protocol: ipv4
+          df:
+            id: normal
+            qos:
+              latency: '0'
+              packet-delay-variation: '0'
+      df:
+        - id: normal
+          vnf-profile:
+            - id: vnf-b-profile
+              vnfd-id: VNF-B
+              flavour-id: normal
+              instantiation-level: single
+              min-number-of-instances: '1'
+              max-number-of-instances: '1'
+              virtual-link-connectivity:
+                - virtual-link-profile-id: mgmt
+                  constituent-cpd-id:
+                    constituent-base-element-id: vdu-b-1
+                    constituent-cpd-id: management
+          virtual-link-profile:
+            - id: mgmt
+              virtual-link-desc-id: mgmt
+              flavour-id: normal
+              max-bitrate-requirements:
+                root: '1000'
+              min-bitrate-requirements:
+                root: '0'
+          ns-instantiation-level:
+            - id: normal
+              description: Single VNF-B
+              vnf-to-level-mapping:
+                - vnf-profile-id: vnf-b-profile
+                  number-of-instances: '1'
+            - id: double-B
+              description: Double VNF-B
+              vnf-to-level-mapping:
+                - vnf-profile-id: vnf-b-profile
+                  number-of-instances: '2'
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/descriptors/SOL006/NSD/reference_tst010_nsd_simple_a_b_SOL006.yaml b/SOL005/NSLifecycleManagement-API/descriptors/SOL006/NSD/reference_tst010_nsd_simple_a_b_SOL006.yaml
deleted file mode 100644
index b29b2dfc7..000000000
--- a/SOL005/NSLifecycleManagement-API/descriptors/SOL006/NSD/reference_tst010_nsd_simple_a_b_SOL006.yaml
+++ /dev/null
@@ -1,284 +0,0 @@
-nfv:
-  vnfd:
-    - id: VNF-A
-      provider: ETSI TST WG
-      product-name: TST010 reference VNF-A
-      software-version: '1.0'
-      version: '1.0'
-      vnfm-info: ETSI VNFM
-      vdu:
-      - id: vdu-a-1
-        name: VNF A VDU 1
-        int-cpd:
-          - id: right
-            layer-protocol: ethernet
-          - id: management
-            layer-protocol: ethernet
-          - id: left
-            layer-protocol: ethernet
-        virtual-compute-desc: vdu-a-1-vcd
-        virtual-storage-desc: vdu-a-1-vsd
-        sw-image-desc: asa-image
-      virtual-compute-desc:
-        id: vdu-a-1-vcd
-        virtual-memory:
-          size: '4.0'
-        virtual-cpu:
-          num-virtual-cpu: '2'
-      virtual-storage-desc:
-        id: vdu-a-1-vsd
-        type-of-storage: root-storage
-        size-of-storage: '0'
-      sw-image-desc:
-        id: vdu-a-1-image
-        name: vdu-a-1 image
-        version: '1.1'
-        checksum:
-          algorithm: sha-224
-          hash: somehashfortst010
-        container-format: bare
-        disk-format: qcow2
-        min-disk: '1'
-        min-ram: '2.0'
-        size: '1'
-        image: 'http://someurl.com/vnf-a.qcow2'
-      int-virtual-link-desc:
-      - id: right-vl
-        flavour:
-          id: right-vl-flavour
-          qos:
-            latency: '1'
-            packet-delay-variation: '1'
-            packet-loss-ratio: '0.02'
-        connectivity-type:
-          layer-protocol: ethernet
-      ext-cpd:
-        - id: ext-a-right
-          int-virtual-link-desc: right-vl
-          layer-protocol: ethernet
-        - id: management
-          int-cpd:
-            vdu-id: vdu-a-1
-            cpd: management
-          layer-protocol: ethernet
-        - id: ext-a-left
-          int-cpd:
-            vdu-id: vdu-a-1
-            cpd: left
-          layer-protocol: ethernet
-      df:
-        id: normal
-        vdu-profile:
-          id: vdu-a-1
-          min-number-of-instances: '1'
-          max-number-of-instances: '2'
-        virtual-link-profile:
-          id: right-vl
-          flavour: right-vl-flavour
-          max-bit-rate-requirements:
-            root: '10'
-          min-bit-rate-requirements:
-            root: '1'
-          virtual-link-protocol-data:
-            associated-layer-protocol: ipv4
-            l3-protocol-data:
-              name: right-network
-              ip-version: ipv4
-              cidr: 10.10.10.0/32
-              gateway-ip: 10.10.10.1
-              dhcp-enabled: 'true'
-        instantiation-level:
-          - id: double
-            vdu-level:
-              vdu-id: vdu-a-1
-              number-of-instances: '2'
-          - id: single
-            vdu-level:
-              vdu-id: vdu-a-1
-              number-of-instances: '1'
-        default-instantiation-level: single
-        lcm-operations-configuration:
-          scale-vnf-to-level-op-config:
-            arbitrary-target-levels-supported: 'true'
-          terminate-vnf-op-config:
-            min-graceful-termination: '1'
-          operate-vnf-op-config:
-            min-graceful-stop-timeout: '1'
-    - id: VNF-B
-      provider: ETSI TST WG
-      product-name: TST010 reference VNF-B
-      software-version: '2.0'
-      version: '2.0'
-      vnfm-info: ETSI VNFM
-      vdu:
-      - id: vdu-b-1
-        name: VNF-B VDU 1
-        int-cpd:
-          - id: left
-            layer-protocol: ethernet
-          - id: management
-            layer-protocol: ethernet
-          - id: right
-            layer-protocol: ethernet
-        virtual-compute-desc: vdu-b-1-vcd
-        virtual-storage-desc: vdu-b-1-vsd
-        sw-image-desc: vdu-b-1-image
-      virtual-compute-desc:
-        id: vdu-b-1-vcd
-        virtual-memory:
-          size: '4.0'
-        virtual-cpu:
-          num-virtual-cpu: '2'
-      virtual-storage-desc:
-        id: vdu-b-1-vsd
-        type-of-storage: root-storage
-        size-of-storage: '0'
-      sw-image-desc:
-        id: vdu-b-1-image
-        name: VNF-B image
-        version: '1.1'
-        checksum:
-          algorithm: sha-224
-          hash: somehashfortst010
-        container-format: bare
-        disk-format: qcow2
-        min-disk: '1'
-        min-ram: '2.0'
-        size: '1'
-        image: 'http://someurl.com/VNF-B.qcow2'
-      ext-cpd:
-        - id: ext-b-left
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: left
-          layer-protocol: ethernet
-        - id: management
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: management
-          layer-protocol: ethernet
-        - id: ext-b-right
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: right
-          layer-protocol: ethernet
-      df:
-        id: normal
-        vdu-profile:
-          id: vdu-b-1
-          min-number-of-instances: '1'
-          max-number-of-instances: '2'
-        instantiation-level:
-          - id: double
-            vdu-level:
-              vdu-id: vdu-b-1
-              number-of-instances: '2'
-          - id: single
-            vdu-level:
-              vdu-id: vdu-b-1
-              number-of-instances: '1'
-        default-instantiation-level: single
-        lcm-operations-configuration:
-          scale-vnf-to-level-op-config:
-            arbitrary-target-levels-supported: 'true'
-          terminate-vnf-op-config:
-            min-graceful-termination: '1'
-          operate-vnf-op-config:
-            min-graceful-stop-timeout: '1'
-  nsd:
-    - id: tst010-nsd
-      vnfd-id:
-        - VNF-A
-        - VNF-B
-      sapd:
-        - id: right-sap
-          vnf:
-            vnfd-id: VNF-A
-            ext-cpd-id: ext-a-right
-        - id: management-sap
-          virtual-link-desc: mgmt
-        - id: left-sap
-          vnf:
-            vnfd-id: VNF-B
-            ext-cpd-id: ext-b-left
-      virtual-link-desc:
-        - id: mgmt
-          connectivity-type:
-            layer-protocol: ipv4
-          df:
-            id: normal
-            qos:
-              latency: '0'
-              packet-delay-variation: '0'
-        - id: A-to-B
-          connectivity-type:
-            layer-protocol: ethernet
-          df:
-            id: normal
-            qos:
-              latency: '0'
-              packet-delay-variation: '0'
-      df:
-        - id: normal
-          vnf-profile:
-            - id: vnf-a-profile
-              vnfd-id: VNF-A
-              flavour-id: normal
-              instantiation-level: single
-              min-number-of-instances: '1'
-              max-number-of-instances: '1'
-              virtual-link-connectivity:
-                - virtual-link-profile-id: mgmt
-                  constituent-cpd-id:
-                    constituent-base-element-id: vdu-a-1
-                    constituent-cpd-id: management
-                - virtual-link-profile-id: A-to-B
-                  constituent-cpd-id:
-                    constituent-base-element-id: vdu-a-1
-                    constituent-cpd-id: left
-            - id: vnf-b-profile
-              vnfd-id: VNF-B
-              flavour-id: normal
-              instantiation-level: single
-              min-number-of-instances: '1'
-              max-number-of-instances: '1'
-              virtual-link-connectivity:
-                - virtual-link-profile-id: mgmt
-                  constituent-cpd-id:
-                    constituent-base-element-id: vdu-b-1
-                    constituent-cpd-id: management
-                - virtual-link-profile-id: A-to-B
-                  constituent-cpd-id:
-                    constituent-base-element-id: vdu-b-1
-                    constituent-cpd-id: right
-          virtual-link-profile:
-            - id: mgmt
-              virtual-link-desc-id: mgmt
-              flavour-id: normal
-              max-bitrate-requirements:
-                root: '1000'
-              min-bitrate-requirements:
-                root: '0'
-            - id: A-to-B
-              virtual-link-desc-id: A-to-B
-              flavour-id: normal
-              max-bitrate-requirements:
-                root: '10000000'
-              min-bitrate-requirements:
-                root: '0'
-          ns-instantiation-level:
-            - id: normal
-              description: Single VNF-A and VNF-B
-              vnf-to-level-mapping:
-                - vnf-profile-id: vnf-a-profile
-                  number-of-instances: '1'
-                - vnf-profile-id: vnf-b-profile
-                  number-of-instances: '1'
-            - id: double-A
-              description: Single VNF-B and Double VNF-A
-              vnf-to-level-mapping:
-                - vnf-profile-id: vnf-a-profile
-                  number-of-instances: '2'
-                - vnf-profile-id: vnf-b-profile
-                  number-of-instances: '1'
-                  default-instantiation-level: normal
diff --git a/SOL005/NSLifecycleManagement-API/descriptors/SOL006/VNFD/reference_tst010_vnf_2vdu_SOL006.yaml b/SOL005/NSLifecycleManagement-API/descriptors/SOL006/VNFD/reference_tst010_vnf_2vdu_SOL006.yaml
new file mode 100644
index 000000000..e0b812b4f
--- /dev/null
+++ b/SOL005/NSLifecycleManagement-API/descriptors/SOL006/VNFD/reference_tst010_vnf_2vdu_SOL006.yaml
@@ -0,0 +1,138 @@
+nfv:
+  vnfd:
+    - id: VNF-B
+      provider: ETSI TST WG
+      product-name: TST010 reference VNF-B with 2 VDUs
+      software-version: '2.2'
+      version: '2.2'
+      vnfm-info: ETSI VNFM
+      vdu:
+        id: vdu-b-1
+        name: VNF-B VDU 1
+        int-cpd:
+          - id: left
+            layer-protocol: ethernet
+          - id: management
+            layer-protocol: ethernet
+          - id: internal
+            layer-protocol: ethernet
+            int-virtual-link-desc: internal-vl
+        virtual-compute-desc: vdu-b-1-vcd
+        virtual-storage-desc: vdu-b-1-vsd
+        sw-image-desc: vdu-b-1-image
+      vdu:
+        id: vdu-b-2
+        name: VNF-B VDU 2
+        int-cpd:
+          - id: right
+            layer-protocol: ethernet
+          - id: management
+            layer-protocol: ethernet
+          - id: internal
+            layer-protocol: ethernet
+            int-virtual-link-desc: internal-vl
+        virtual-compute-desc: vdu-b-2-vcd
+        virtual-storage-desc: vdu-b-2-vsd
+        sw-image-desc: vdu-b-2-image
+      virtual-compute-desc:
+        id: vdu-b-1-vcd
+        virtual-memory:
+          size: '4.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-1-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-1-image
+        name: VNF-B image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B.qcow2'
+      virtual-compute-desc:
+        id: vdu-b-2-vcd
+        virtual-memory:
+          size: '6.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-2-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-2-image
+        name: VNF-B-2 image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B-2.qcow2'
+      int-virtual-link-desc:
+        - id: internal-vl
+          flavour:
+            id: internal-vl-flavour
+            qos:
+              latency: '1'
+              packet-delay-variation: '1'
+              packet-loss-ratio: '0.05'
+          connectivity-type:
+            layer-protocol: ethernet     
+      ext-cpd:
+        - id: ext-b-left
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: left
+          layer-protocol: ethernet
+        - id: management
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: management
+          layer-protocol: ethernet
+        - id: ext-b-right
+          int-cpd:
+            vdu-id: vdu-b-2
+            cpd: right
+          layer-protocol: ethernet
+      df:
+        id: normal
+        vdu-profile:
+          - id: vdu-b-1
+            min-number-of-instances: '1'
+            max-number-of-instances: '2'
+          - id: vdu-b-2
+            min-number-of-instances: '1'
+            max-number-of-instances: '4'          
+        instantiation-level:
+          - id: double
+            vdu-level:
+              - vdu-id: vdu-b-1
+                number-of-instances: '2'
+              - vdu-id: vdu-b-2
+                number-of-instances: '2'
+          - id: single
+            vdu-level:
+              - vdu-id: vdu-b-1
+                number-of-instances: '1'
+              - vdu-id: vdu-b-2
+                number-of-instances: '1'
+        default-instantiation-level: single
+        lcm-operations-configuration:
+          scale-vnf-to-level-op-config:
+            arbitrary-target-levels-supported: 'true'
+          terminate-vnf-op-config:
+            min-graceful-termination: '1'
+          operate-vnf-op-config:
+            min-graceful-stop-timeout: '1'
\ No newline at end of file
-- 
GitLab


From eb8ec08132b662b72dc815f74e84e9ef55797694 Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Wed, 27 Jan 2021 10:52:06 +0100
Subject: [PATCH 259/322] Fix issue: #140

---
 SOL003/VNFPackageManagement-API/VNFPackageContent.robot | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/SOL003/VNFPackageManagement-API/VNFPackageContent.robot b/SOL003/VNFPackageManagement-API/VNFPackageContent.robot
index dc8a2c3b7..a7ed3c023 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageContent.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageContent.robot
@@ -94,7 +94,7 @@ POST Individual VNF Package Content - Method not implemented
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
-    Send POST Request for individual VNF Package
+    Send POST Request for individual VNF Package Content
     Check HTTP Response Status Code Is    405
 
 PUT Individual VNF Package Content - Method not implemented
@@ -106,7 +106,7 @@ PUT Individual VNF Package Content - Method not implemented
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
-    Send PUT Request for individual VNF Package
+    Send PUT Request for individual VNF Package Content
     Check HTTP Response Status Code Is    405
 
 PATCH Individual VNF Package Content - Method not implemented
@@ -118,7 +118,7 @@ PATCH Individual VNF Package Content - Method not implemented
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
-    Send PATCH Request for individual VNF Package
+    Send PATCH Request for individual VNF Package Content
     Check HTTP Response Status Code Is    405
 
 DELETE Individual VNF Package Content - Method not implemented
@@ -130,7 +130,7 @@ DELETE Individual VNF Package Content - Method not implemented
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
-    Send DELETE Request for individual VNF Package
+    Send DELETE Request for individual VNF Package Content
     Check HTTP Response Status Code Is    405
     
 GET Individual OnBoarded VNF Package Content
-- 
GitLab


From 8be583aa3b50d13be25de459faa143fcedbb3fa0 Mon Sep 17 00:00:00 2001
From: zafar <zafar@etsi.org>
Date: Wed, 27 Jan 2021 15:16:34 +0500
Subject: [PATCH 260/322] minor bug fix in response body parsing & removal of
 redundant lines of code

---
 .../VnfLcmMntOperationKeywords.robot          |  24 +--
 .../reference_tst010_vnf_b_2vdu_SOL001.yaml}  |   0
 .../reference_tst010_vnf_b_2vdu_SOL006.yaml}  |   0
 .../Grants.robot                              |  37 +---
 .../IndividualGrant.robot                     |  81 +--------
 .../reference_tst010_vnf_b_2vdu_SOL001.yaml}  |   0
 .../reference_tst010_vnf_b_2vdu_SOL006.yaml}  |   0
 .../environment/variables.txt                 |   6 -
 .../VNFPackageManagementKeywords.robot        |  35 +---
 .../reference_tst010_vnf_b_2vdu_SOL001.yaml   | 168 ++++++++++++++++++
 .../reference_tst010_vnf_b_2vdu_SOL006.yaml   | 137 ++++++++++++++
 .../environment/variables.txt                 |   5 -
 12 files changed, 344 insertions(+), 149 deletions(-)
 rename SOL003/{VNFLifecycleOperationGranting-API/descriptors/SOL001/SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml => VNFLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml} (100%)
 rename SOL003/{VNFLifecycleOperationGranting-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml => VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml} (100%)
 rename SOL003/{VNFPackageManagement-API/descriptors/SOL001/SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml => VNFLifecycleOperationGranting-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml} (100%)
 rename SOL003/{VNFPackageManagement-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml => VNFLifecycleOperationGranting-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml} (100%)
 create mode 100644 SOL003/VNFPackageManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
 create mode 100644 SOL003/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml

diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index 679fd6102..6a172f1f6 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -8,8 +8,8 @@ Library    BuiltIn
 Library    JSONLibrary
 Library    Collections
 Library    JSONSchemaLibrary    schemas/
-Variables    descriptors/SOL001/SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml
-Variables    descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml
+Variables    descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
+Variables    descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
 
 *** Keywords ***
 Get Vnf Instance 
@@ -127,7 +127,7 @@ Send VNF Instance Resource Create Request
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File
     ${template}=    Get File    jsons/createVnfRequest.json
-    ${body}=        Format String   ${template}     vnfdId=${Descriptor_ID}    vnfProvider=${Provider}    vnfProductName=${Product_Name}    vnfSoftwareVersion=${Software_Version}    vnfdVersion= ${Descriptor_Version}    vnfConfigurableProperties=${configurable_properties}    flavourId=${Flavour_ID}
+    ${body}=        Format String   ${template}     vnfdId=${Descriptor_ID}    vnfProvider=${Provider}    vnfProductName=${Product_Name}    vnfSoftwareVersion=${Software_Version}    vnfdVersion= ${Descriptor_Version}    flavourId=${Flavour_ID}
     ${response}=    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances    ${body}
 
 Send VNF Instance Resource Delete Request
@@ -1324,12 +1324,12 @@ Match the VNF Instance Response Attributes with Descriptors
     Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${Descriptor_Version}
     Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['flavourId']}    ${Flavour_ID}
     List Should Contain Value    ${VDU_IDs}    ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo']['vduId']}        
-    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${externalCP_IDs}    ${response['body']['instantiatedVnfInfo']['extCpInfo']['cpdId']}
-    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${internalCP_IDs}    ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo']['vnfcCpInfo']['cpdId']}
-    Run Keyword If  '${descriptorType}'=='SOL001'    List Should Contain Value    @{CP_IDs}    ${response['body']['instantiatedVnfInfo']['extCpInfo']['cpdId']}
-    Run Keyword If  '${descriptorType}'=='SOL001'    List Should Contain Value    @{CP_IDs}    ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo']['vnfcCpInfo']['cpdId']}
-    List Should Contain value    ${Storage_IDs}    ${response['body']['instantiatedVnfInfo']['virtualStorageResourceInfo']['virtualStorageDescId']}
-    List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['instantiatedVnfInfo']['extManagedVirtualLinkInfo']['vnfVirtualLinkDescId']}
+    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${externalCP_IDs}    ${response['body']['instantiatedVnfInfo']['extCpInfo'][0]['cpdId']}
+    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${internalCP_IDs}    ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo'][0]['vnfcCpInfo'][0]['cpdId']}
+    Run Keyword If  '${descriptorType}'=='SOL001'    List Should Contain Value    @{CP_IDs}    ${response['body']['instantiatedVnfInfo']['extCpInfo'][0]['cpdId']}
+    Run Keyword If  '${descriptorType}'=='SOL001'    List Should Contain Value    @{CP_IDs}    ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo'][0]['vnfcCpInfo'][0]['cpdId']}
+    List Should Contain value    ${Storage_IDs}    ${response['body']['instantiatedVnfInfo']['virtualStorageResourceInfo'][0]['virtualStorageDescId']}
+    List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['instantiatedVnfInfo']['extManagedVirtualLinkInfo'][0]['vnfVirtualLinkDescId']}
 
 Check HTTP Response Body of Individual VNF LCM Operation occurrences content against VNF Descriptor
     Run Keyword If    ${check_descriptors} == 1    Check Individual VNF LCM Operation Occurence Content
@@ -1342,8 +1342,8 @@ Match the VNF LCM Operation Occurence Response Attributes with Descriptors
     #Checking Response attributes with VNF Descriptors
     Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdId']}    ${Descriptor_ID}
     Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdVersion']}    ${Descriptor_Version}
-    List Should Contain Value    ${VDU_IDs}    ${response['body']['resourceChanges']['AffectedVnfc']['vduId']}
-    List Should Contain value    ${Storage_IDs}    ${response['body']['resourceChanges']['affectedVirtualStorages']['virtualStorageDescId']}
-    List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['resourceChanges']['affectedVirtualLinks']['virtualStorageDescId']}
+    List Should Contain Value    ${VDU_IDs}    ${response['body']['resourceChanges']['affectedVnfcs'][0]['vduId']}
+    List Should Contain value    ${Storage_IDs}    ${response['body']['resourceChanges']['affectedVirtualStorages'][0]['virtualStorageDescId']}
+    List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['resourceChanges']['affectedVirtualLinks'][0]['virtualStorageDescId']}
     
     
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml b/SOL003/VNFLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
similarity index 100%
rename from SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml
rename to SOL003/VNFLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
diff --git a/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml b/SOL003/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
similarity index 100%
rename from SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml
rename to SOL003/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
diff --git a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
index 12effdd71..0121db906 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
@@ -6,8 +6,8 @@ Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 Library    Collections
-Variables    descriptors/SOL001/SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml
-Variables    descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml
+Variables    descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
+Variables    descriptors/SOL006/reference_tst010_vnf_b_2vdu_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.
 
@@ -216,26 +216,12 @@ 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
-    @{VNF_labels}=    Create List
-    FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
-        ${key_type}=    Get Variable Value    ${topology_template.node_templates.${key}.type}
-        ${VNF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_VNF}
-
-        Run Keyword If    ${VNF_check}    Append To List    ${VNF_labels}    ${key}
-        Run Keyword If    ${VNF_check}    Get VNF Attributes from SOL001    ${key}            
-    END
-    Set Global Variable    @{VNF_IDs}    @{VNF_labels}
-
-
-Get VNF Attributes from SOL001
-     [Arguments]    ${VNF_label}
-    ${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}
-    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.software_version}
-    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.descriptor_version}
-    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.flavour_id}
-    
+    ${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}
+    ${software_version}=    Get Variable Value    ${topology_template.node_templates.properties.software_version}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.properties.descriptor_version}
+    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.properties.flavour_id}
     Set Global Variable    ${Descriptor_ID}    ${descriptor_id}
     Set Global Variable    ${Provider}    ${provider}
     Set Global Variable    ${Product_Name}    ${product_name}
@@ -248,12 +234,7 @@ Fetch Information from SOL006 descriptor file
     ${provider}=    Get Variable Value    ${nfv.vnfd[0].provider}
     ${product_name}=    Get Variable Value    ${nfv.vnfd[0]['product-name']}
     ${software_version}=    Get Variable Value    ${nfv.vnfd[0]['software-version']}
-    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}    
-    ${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']}
-    ${instantiation_levels}=    Get Length    ${nfv.vnfd[0].df['instantiation-level']}
-    
+    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}       
     Set Global Variable    ${Descriptor_ID}    ${descriptor_id}
     Set Global Variable    ${Provider}    ${provider}
     Set Global Variable    ${Product_Name}    ${product_name}
diff --git a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
index b0d176297..d0865365c 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
@@ -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/SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml
-Variables    descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml
+Variables    descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
+Variables    descriptors/SOL006/reference_tst010_vnf_b_2vdu_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.
@@ -177,56 +177,25 @@ PARSE the Descriptor File
     
 Fetch Information from SOL001 descriptor file
     @{VDU_labels}=    Create List
-    @{VNF_labels}=    Create List
     @{VirtualLink_labels}=    Create List
     @{CP_labels}=    Create List
-    @{Storage_labels}=    Create List
     FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
         ${key_type}=    Get Variable Value    ${topology_template.node_templates.${key}.type}
         ${VDU_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}   ${tosca_type_VDU_compute}
-        ${VNF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_VNF}
         ${Link_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_virtual_link}
         ${VDUcp_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_VDU_cp}
-        ${Storage_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_storage}
         Run Keyword If    ${VDU_check}    Append To List    ${VDU_labels}    ${key}
-        Run Keyword If    ${VNF_check}    Append To List    ${VNF_labels}    ${key}
-        Run Keyword If    ${VNF_check}    Get VNF Attributes from SOL001    ${key}            
         Run Keyword If    ${Link_check}    Append To List    ${VirtualLink_labels}    ${key}
         Run Keyword If    ${VDUcp_check}    Append To List    ${CP_labels}    ${key}
-        Run Keyword If    ${Storage_check}    Append To List    ${Storage_labels}    ${key}
     END
     Set Global Variable    @{VDU_IDs}    @{VDU_labels}
-    Set Global Variable    @{VNF_IDs}    @{VNF_labels}
     Set Global Variable    @{VirtualLink_IDs}    @{VirtualLink_labels}
     Set Global Variable    @{CP_IDs}    @{CP_labels}
-    Set Global Variable    @{Storage_IDs}    @{Storage_labels}
-
-Get VNF Attributes from SOL001
-     [Arguments]    ${VNF_label}
-    ${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}
-    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.software_version}
-    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.descriptor_version}
-    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.flavour_id}
-    
-    Set Global Variable    ${Descriptor_ID}    ${descriptor_id}
-    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    ${Flavour_ID}    ${flavour_id}
     
 Fetch Information from SOL006 descriptor file
-    ${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']}
-    ${software_version}=    Get Variable Value    ${nfv.vnfd[0]['software-version']}
-    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}    
     ${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']}
-    ${instantiation_levels}=    Get Length    ${nfv.vnfd[0].df['instantiation-level']}    
     FOR    ${key}    IN    @{nfv.vnfd[0].keys()}
         ${VDU_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    vdu
         Run Keyword If    ${VDU_check}    Get VDU IDs    ${VDUcount}
@@ -234,39 +203,19 @@ Fetch Information from SOL006 descriptor file
         Run Keyword If    ${extCP_check}    Get External CP IDs    ${extCP_count}
         ${virtualLink_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    int-virtual-link-desc
         Run Keyword If    ${virtualLink_check}    Get Virtual Link IDs   ${virtualLink_count}    
-        ${DF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    df
-        Run Keyword If    ${DF_check}    Get Instantiation Levels    ${instantiation_levels}    
     END
-    Set Global Variable    ${Descriptor_ID}    ${descriptor_id}
-    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}
-    
+        
 Get VDU IDs
     [Arguments]    ${count}    
     @{VDU_labels}=    Create List
-    ${Storage_labels}=    Create List
-    ${Compute_labels}=    Create List
+    @{Compute_labels}=    Create List
     FOR    ${i}    IN RANGE    ${count}
         Append To List    ${VDU_labels}    ${nfv.vnfd[0].vdu[${i}]['id']}
-        Append To List    ${Storage_labels}    ${nfv.vnfd[0].vdu[${i}]['virtual-storage-desc']}
         Append To List    ${Compute_labels}    ${nfv.vnfd[0].vdu[${i}]['virtual-compute-desc']} 
-        Get Internal CPs for each VDU    ${i}   
     END
     Set Global Variable    ${VDU_IDs}    ${VDU_labels}
-    Set Global Variable    ${Storage_IDs}    ${Storage_labels}
     Set Global Variable    ${Compute_IDs}    ${Compute_labels}
-            
-Get Internal CPs for each VDU
-    [Arguments]    ${vdu}
-    ${count}=    Get Length    ${nfv.vnfd[0].vdu[${vdu}]['int-cpd']}    
-    ${internal_CPs}=    Create List
-    FOR    ${i}    IN RANGE    ${count}
-        Append To List    ${internal_CPs}    ${nfv.vnfd[0].vdu[${vdu}]['int-cpd'][${i}]['id']} 
-    END
-    Set Global Variable    ${internalCP_IDs}    ${internal_CPs}
-    
+                
 Get External CP IDs
     [Arguments]    ${count}    
     @{external_CPs}=    Create List
@@ -283,20 +232,8 @@ Get Virtual Link IDs
     END
     Set Global Variable    ${VirtualLink_IDs}    ${VirtualLink_labels}
     
-Get Instantiation Levels
-    [Arguments]    ${count}
-    @{Instantiation_Levels}=    Create List
-    FOR    ${i}    IN RANGE    ${count}
-        Append To List    ${Instantiation_Levels}    ${nfv.vnfd[0].df['instantiation-level'][${i}]['id']} 
-    END
-    Set Global Variable    ${InstantiationLevel_IDs}    ${Instantiation_Levels}
-    
 Match the grant Response Attributes with Descriptors
-    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${externalCP_IDs}    ${response['body']['extVirtualLinks']['extCps']['cpdId']}
-    Run Keyword If  '${descriptorType}'=='SOL001'    List Should Contain Value    @{CP_IDs}    ${response['body']['extVirtualLinks']['extCps']['cpdId']}
-    List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['ExtManagedVirtualLinkData']['vnfVirtualLinkDescId']}
-    List Should Contain value    ${Compute_IDs}    ${response['body']['vimAssets']['computeResourceFlavours']['vnfdVirtualComputeDescId']}
-    
-
-
-    
+    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${externalCP_IDs}    ${response['body']['extVirtualLinks'][0]['extCps'][0]['cpdId']}
+    Run Keyword If  '${descriptorType}'=='SOL001'    List Should Contain Value    @{CP_IDs}    ${response['body']['extVirtualLinks'][0]['extCps'][0]['cpdId']}
+    List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['extManagedVirtualLinkData'][0]['vnfVirtualLinkDescId']}
+    List Should Contain value    ${Compute_IDs}    ${response['body']['vimAssets']['computeResourceFlavours'][0]['vnfdVirtualComputeDescId']}    
diff --git a/SOL003/VNFPackageManagement-API/descriptors/SOL001/SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml b/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
similarity index 100%
rename from SOL003/VNFPackageManagement-API/descriptors/SOL001/SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml
rename to SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
diff --git a/SOL003/VNFPackageManagement-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml b/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
similarity index 100%
rename from SOL003/VNFPackageManagement-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml
rename to SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
diff --git a/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt b/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
index 64dfe501f..c9405aec8 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
+++ b/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
@@ -47,19 +47,13 @@ ${descriptorType}    SOL001
 ${check_descriptors}	1
 
 ${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute
-${tosca_type_VNF}    tosca.nodes.nfv.VNF
 ${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
 ${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
-${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage
  
 @{VDU_IDs}
-@{VNF_IDs}
 @{virtualLink_IDs}
 @{CP_IDs}
-@{Storage_IDs}
-@{internalCP_IDs}
 @{externalCP_IDs}
-@{InstantiationLevel_IDs}
 @{Compute_IDs}
 
 ${Descriptor_ID}
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 2775dba47..56a36420b 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -1538,32 +1538,16 @@ 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
-    @{VNF_labels}=    Create List
-    FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
-        ${key_type}=    Get Variable Value    ${topology_template.node_templates.${key}.type}
-
-        ${VNF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_VNF}
-        Run Keyword If    ${VNF_check}    Append To List    ${VNF_labels}    ${key}
-        Run Keyword If    ${VNF_check}    Get VNF Attributes from SOL001    ${key}            
-    END
-    Set Global Variable    @{VNF_IDs}    @{VNF_labels}
-
-    
-Get VNF Attributes from SOL001
-     [Arguments]    ${VNF_label}
-    ${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}
-    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.software_version}
-    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.descriptor_version}
-    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.flavour_id}
-    
+    ${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}
+    ${software_version}=    Get Variable Value    ${topology_template.node_templates.properties.software_version}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.properties.descriptor_version}    
     Set Global Variable    ${Descriptor_ID}    ${descriptor_id}
     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    ${Flavour_ID}    ${flavour_id}
     
 Fetch Information from SOL006 descriptor file
     ${descriptor_id}=    Get Variable Value    ${nfv.vnfd[0].id}
@@ -1571,7 +1555,6 @@ Fetch Information from SOL006 descriptor file
     ${product_name}=    Get Variable Value    ${nfv.vnfd[0]['product-name']}
     ${software_version}=    Get Variable Value    ${nfv.vnfd[0]['software-version']}
     ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}    
-
     Set Global Variable    ${Descriptor_ID}    ${descriptor_id}
     Set Global Variable    ${Provider}    ${provider}
     Set Global Variable    ${Product_Name}    ${product_name}
@@ -1597,8 +1580,8 @@ Check Individual VNF Subscription Content
 Match the VNF subscription Response Attributes with Descriptors
     #Checking Response attributes with VNF Descriptors
     Should Be Equal As Strings    ${response['body']['filter']['vnfdId']}    ${Descriptor_ID}
-    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProvider']}    ${Provider}
-    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['vnfProductName']}    ${Product_Name}
-    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['versions']['vnfSoftwareVersion']}    ${Software_Version}
-    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders']['vnfProducts']['versions']['vnfdVersion']}    ${Descriptor_Version}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders'][0]['vnfProvider']}    ${Provider}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders'][0]['vnfProducts'][0]['vnfProductName']}    ${Product_Name}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders'][0]['vnfProducts']['versions'][0]['vnfSoftwareVersion']}    ${Software_Version}
+    Should Be Equal As Strings    ${response['body']['filter']['vnfProductsFromProviders'][0]['vnfProducts']['versions'][0]['vnfdVersion']}    ${Descriptor_Version}
     
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml b/SOL003/VNFPackageManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
new file mode 100644
index 000000000..e9159106a
--- /dev/null
+++ b/SOL003/VNFPackageManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
@@ -0,0 +1,168 @@
+tosca_definitions_version: tosca_simple_yaml_1_2
+description: "TST010 reference VNF-B"
+metadata:
+  descriptor_id: "VNF-B"
+  vendor: "ETSI TST WG"
+  version: "2.0"
+topology_template:
+  substitution_mappings:
+    node_type: "tosca.nodes.nfv.VNF"
+    requirements:
+      virtual_link_management:
+        [management, virtual_link_management]
+      virtual_link_left:
+        [left, virtual_link_left]
+      virtual_link_right:
+        [right, virtual_link_right]
+  node_templates:
+    right:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 1
+      requirements:
+        virtual_link_right:
+        virtual_binding: VDU-B-2
+    management:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 0
+      requirements:
+        virtual_link_management:
+        virtual_binding: VDU-B-1
+    left:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 2
+      requirements:
+        virtual_link_left:
+        virtual_binding: VDU-B-1
+    internal_vl:
+      type: "tosca.nodes.nfv.VnfVirtualLink"
+      properties:
+        connectivity_type:
+          layer_protocols: [ ipv4 ]
+        description: Internal Virtual link in the VNF
+        vl_profile:
+          max_bitrate_requirements:
+            root: 100000
+            leaf: 20000
+          min_bitrate_requirements:
+            root: 10000
+            leaf: 10000
+    internal_vdu_b_1_cp:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 2
+      requirements:
+        - virtual_binding: VDU-B-1
+        - virtual_link: internal_vl
+    internal_vdu_b_2_cp:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 0
+      requirements:
+        - virtual_binding: VDU-B-2
+        - virtual_link: internal_vl
+    vdu_b_1_vsd:
+      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
+      properties:
+        virtual_block_storage_data:
+          size_of_storage: 20
+          rdma_enabled: false
+        sw_image_data:
+          name: "vdu-b-1 image"
+          version: "1.1"
+          checksum: 
+            algorithm: "sha-224"
+            hash: "somehashfortst010"
+          container_format: "bare"
+          disk-format: qcow2
+          min-disk: '1'
+          min-ram: '2'
+          size: '1'
+      artifacts:
+        sw_image:
+          type: "tosca.artifacts.nfv.SwImage"
+          file: vdu-b-1.qcow2
+    vdu_b_2_vsd:
+      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
+      properties:
+        virtual_block_storage_data:
+          size_of_storage: 20
+          rdma_enabled: false
+        sw_image_data:
+          name: "vdu-b-2 image"
+          version: "1.1"
+          checksum: 
+            algorithm: "sha-224"
+            hash: "somehashfortst010"
+          container_format: "bare"
+          disk-format: qcow2
+          min-disk: '1'
+          min-ram: '2'
+          size: '1'
+      artifacts:
+        sw_image:
+          type: tosca.artifacts.nfv.SwImage
+          file: vdu-b-2.qcow2
+    vnf_b_1_VNF:
+      type: "tosca.nodes.nfv.VNF"
+      properties:
+        descriptor_id: "VNF-B-2VDUs"
+        descriptor_version: "2.0"
+        provider: "ETSI TST WG"
+        product_name: "VNF-B-2VDUs"
+        software_version: "2.0"
+        product_info_name: "VNF-B-2VDUs"
+        product_info_description: "TST010 reference VNF-B with 2 VDUs"
+        flavour_id: "VNF-B-2VDU_flavor"
+        flavour_description: "VNF-B with 2 VDUs flavor"
+        vnfm_info: 
+          etsivnfm: 
+          - v2.3.1 
+        interfaces:
+            Vnflcm:
+              scale:
+                implementation: scale-example.yaml
+              terminate:
+                implementation: terminate-example.yaml
+              operate:
+                implementation: operate-example.yaml
+    VDU_B_1:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-1-vcd"
+        descriptor: "Description of VDU-B-1"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 2
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 4096
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-1-vsd"
+    VDU_B_2:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-2-vcd"
+        descriptor: "Description of VDU-B-2"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 4
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 6144
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-2-vsd"                
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml b/SOL003/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
new file mode 100644
index 000000000..d902779a2
--- /dev/null
+++ b/SOL003/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
@@ -0,0 +1,137 @@
+nfv:
+  vnfd:
+    - id: VNF-B-2vdu
+      provider: ETSI TST WG
+      product-name: TST010 reference VNF-B with 2 VDUs
+      software-version: '2.2'
+      version: '2.2'
+      vnfm-info: ETSI VNFM
+      vdu:
+        - id: vdu-b-1
+          name: VNF-B VDU 1
+          int-cpd:
+           - id: left
+             layer-protocol: ethernet
+           - id: management
+             layer-protocol: ethernet
+           - id: internal
+             layer-protocol: ethernet
+             int-virtual-link-desc: internal-vl
+          virtual-compute-desc: vdu-b-1-vcd
+          virtual-storage-desc: vdu-b-1-vsd
+          sw-image-desc: vdu-b-1-image
+        - id: vdu-b-2
+          name: VNF-B VDU 2
+          int-cpd:
+           - id: right
+             layer-protocol: ethernet
+           - id: management
+             layer-protocol: ethernet
+           - id: internal
+             layer-protocol: ethernet
+             int-virtual-link-desc: internal-vl
+          virtual-compute-desc: vdu-b-2-vcd
+          virtual-storage-desc: vdu-b-2-vsd
+          sw-image-desc: vdu-b-2-image
+      virtual-compute-desc:
+        id: vdu-b-1-vcd
+        virtual-memory:
+          size: '4.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-1-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-1-image
+        name: VNF-B image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B.qcow2'
+      virtual-compute-desc:
+        id: vdu-b-2-vcd
+        virtual-memory:
+          size: '6.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-2-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-2-image
+        name: VNF-B-2 image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B-2.qcow2'
+      int-virtual-link-desc:
+        - id: internal-vl
+          flavour:
+            id: internal-vl-flavour
+            qos:
+              latency: '1'
+              packet-delay-variation: '1'
+              packet-loss-ratio: '0.05'
+          connectivity-type:
+            layer-protocol: ethernet     
+      ext-cpd:
+        - id: ext-b-left
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: left
+          layer-protocol: ethernet
+        - id: management
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: management
+          layer-protocol: ethernet
+        - id: ext-b-right
+          int-cpd:
+            vdu-id: vdu-b-2
+            cpd: right
+          layer-protocol: ethernet
+      df:
+        id: normal
+        vdu-profile:
+          - id: vdu-b-1
+            min-number-of-instances: '1'
+            max-number-of-instances: '2'
+          - id: vdu-b-2
+            min-number-of-instances: '1'
+            max-number-of-instances: '4'          
+        instantiation-level:
+          - id: double
+            vdu-level:
+              - vdu-id: vdu-b-1
+                number-of-instances: '2'
+              - vdu-id: vdu-b-2
+                number-of-instances: '2'
+          - id: single
+            vdu-level:
+              - vdu-id: vdu-b-1
+                number-of-instances: '1'
+              - vdu-id: vdu-b-2
+                number-of-instances: '1'
+        default-instantiation-level: single
+        lcm-operations-configuration:
+          scale-vnf-to-level-op-config:
+            arbitrary-target-levels-supported: 'true'
+          terminate-vnf-op-config:
+            min-graceful-termination: '1'
+          operate-vnf-op-config:
+            min-graceful-stop-timeout: '1'
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/environment/variables.txt b/SOL003/VNFPackageManagement-API/environment/variables.txt
index d45836b12..b5779a0e8 100644
--- a/SOL003/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL003/VNFPackageManagement-API/environment/variables.txt
@@ -21,7 +21,6 @@ ${apiName}        vnfpkgm
 ${NFVO_CHECKS_NOTIF_ENDPOINT}    1        ## If true, during subscription, the FUT performs a get to the notification endpoint
 
 ${NFVO_ALLOWS_DUPLICATE_SUBS}    1
-${descriptorType}	SOL001
 
 ${response}    httpresponse
 
@@ -92,10 +91,6 @@ ${callbackResp}    localhost
 ${descriptorType}    SOL001
 ${check_descriptors}	1
 
-${tosca_type_VNF}    tosca.nodes.nfv.VNF
- 
-@{VNF_IDs}
-
 ${Descriptor_ID}
 ${Provider}
 ${Product_Name}
-- 
GitLab


From f7efa1c8d0213c233ba72a4d9f3b8e7179f32cbb Mon Sep 17 00:00:00 2001
From: zafar <zafar@etsi.org>
Date: Wed, 27 Jan 2021 15:19:59 +0500
Subject: [PATCH 261/322] removed old reference descriptor files

---
 ...01_reference_tst010_vnf_b_2vdu_SOL001.yaml | 168 ------------------
 ...06_reference_tst010_vnf_b_2vdu_SOL006.yaml | 137 --------------
 2 files changed, 305 deletions(-)
 delete mode 100644 SOL003/VNFLifecycleManagement-API/descriptors/SOL001/SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml
 delete mode 100644 SOL003/VNFLifecycleManagement-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml

diff --git a/SOL003/VNFLifecycleManagement-API/descriptors/SOL001/SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml b/SOL003/VNFLifecycleManagement-API/descriptors/SOL001/SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml
deleted file mode 100644
index e9159106a..000000000
--- a/SOL003/VNFLifecycleManagement-API/descriptors/SOL001/SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml
+++ /dev/null
@@ -1,168 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_2
-description: "TST010 reference VNF-B"
-metadata:
-  descriptor_id: "VNF-B"
-  vendor: "ETSI TST WG"
-  version: "2.0"
-topology_template:
-  substitution_mappings:
-    node_type: "tosca.nodes.nfv.VNF"
-    requirements:
-      virtual_link_management:
-        [management, virtual_link_management]
-      virtual_link_left:
-        [left, virtual_link_left]
-      virtual_link_right:
-        [right, virtual_link_right]
-  node_templates:
-    right:
-      type: "tosca.nodes.nfv.VduCp"
-      properties:
-        order: 1
-      requirements:
-        virtual_link_right:
-        virtual_binding: VDU-B-2
-    management:
-      type: "tosca.nodes.nfv.VduCp"
-      properties:
-        order: 0
-      requirements:
-        virtual_link_management:
-        virtual_binding: VDU-B-1
-    left:
-      type: "tosca.nodes.nfv.VduCp"
-      properties:
-        order: 2
-      requirements:
-        virtual_link_left:
-        virtual_binding: VDU-B-1
-    internal_vl:
-      type: "tosca.nodes.nfv.VnfVirtualLink"
-      properties:
-        connectivity_type:
-          layer_protocols: [ ipv4 ]
-        description: Internal Virtual link in the VNF
-        vl_profile:
-          max_bitrate_requirements:
-            root: 100000
-            leaf: 20000
-          min_bitrate_requirements:
-            root: 10000
-            leaf: 10000
-    internal_vdu_b_1_cp:
-      type: "tosca.nodes.nfv.VduCp"
-      properties:
-        order: 2
-      requirements:
-        - virtual_binding: VDU-B-1
-        - virtual_link: internal_vl
-    internal_vdu_b_2_cp:
-      type: "tosca.nodes.nfv.VduCp"
-      properties:
-        order: 0
-      requirements:
-        - virtual_binding: VDU-B-2
-        - virtual_link: internal_vl
-    vdu_b_1_vsd:
-      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
-      properties:
-        virtual_block_storage_data:
-          size_of_storage: 20
-          rdma_enabled: false
-        sw_image_data:
-          name: "vdu-b-1 image"
-          version: "1.1"
-          checksum: 
-            algorithm: "sha-224"
-            hash: "somehashfortst010"
-          container_format: "bare"
-          disk-format: qcow2
-          min-disk: '1'
-          min-ram: '2'
-          size: '1'
-      artifacts:
-        sw_image:
-          type: "tosca.artifacts.nfv.SwImage"
-          file: vdu-b-1.qcow2
-    vdu_b_2_vsd:
-      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
-      properties:
-        virtual_block_storage_data:
-          size_of_storage: 20
-          rdma_enabled: false
-        sw_image_data:
-          name: "vdu-b-2 image"
-          version: "1.1"
-          checksum: 
-            algorithm: "sha-224"
-            hash: "somehashfortst010"
-          container_format: "bare"
-          disk-format: qcow2
-          min-disk: '1'
-          min-ram: '2'
-          size: '1'
-      artifacts:
-        sw_image:
-          type: tosca.artifacts.nfv.SwImage
-          file: vdu-b-2.qcow2
-    vnf_b_1_VNF:
-      type: "tosca.nodes.nfv.VNF"
-      properties:
-        descriptor_id: "VNF-B-2VDUs"
-        descriptor_version: "2.0"
-        provider: "ETSI TST WG"
-        product_name: "VNF-B-2VDUs"
-        software_version: "2.0"
-        product_info_name: "VNF-B-2VDUs"
-        product_info_description: "TST010 reference VNF-B with 2 VDUs"
-        flavour_id: "VNF-B-2VDU_flavor"
-        flavour_description: "VNF-B with 2 VDUs flavor"
-        vnfm_info: 
-          etsivnfm: 
-          - v2.3.1 
-        interfaces:
-            Vnflcm:
-              scale:
-                implementation: scale-example.yaml
-              terminate:
-                implementation: terminate-example.yaml
-              operate:
-                implementation: operate-example.yaml
-    VDU_B_1:
-      type: "tosca.nodes.nfv.Vdu.Compute"
-      properties:
-        name: "vdu-b-1-vcd"
-        descriptor: "Description of VDU-B-1"
-        vdu_profile:
-          min_number_of_instances: 1
-          max_number_of_instances: 2
-      capabilities:
-        virtual_compute:
-          properties:
-            virtual_memory:
-              virtual_mem_size: 4096
-              numa_enabled: false
-            virtual_cpu:
-              num_virtual_cpu: 2
-      requirements:
-        virtual_storage:
-        - "vdu-b-1-vsd"
-    VDU_B_2:
-      type: "tosca.nodes.nfv.Vdu.Compute"
-      properties:
-        name: "vdu-b-2-vcd"
-        descriptor: "Description of VDU-B-2"
-        vdu_profile:
-          min_number_of_instances: 1
-          max_number_of_instances: 4
-      capabilities:
-        virtual_compute:
-          properties:
-            virtual_memory:
-              virtual_mem_size: 6144
-              numa_enabled: false
-            virtual_cpu:
-              num_virtual_cpu: 2
-      requirements:
-        virtual_storage:
-        - "vdu-b-2-vsd"                
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml b/SOL003/VNFLifecycleManagement-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml
deleted file mode 100644
index d902779a2..000000000
--- a/SOL003/VNFLifecycleManagement-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml
+++ /dev/null
@@ -1,137 +0,0 @@
-nfv:
-  vnfd:
-    - id: VNF-B-2vdu
-      provider: ETSI TST WG
-      product-name: TST010 reference VNF-B with 2 VDUs
-      software-version: '2.2'
-      version: '2.2'
-      vnfm-info: ETSI VNFM
-      vdu:
-        - id: vdu-b-1
-          name: VNF-B VDU 1
-          int-cpd:
-           - id: left
-             layer-protocol: ethernet
-           - id: management
-             layer-protocol: ethernet
-           - id: internal
-             layer-protocol: ethernet
-             int-virtual-link-desc: internal-vl
-          virtual-compute-desc: vdu-b-1-vcd
-          virtual-storage-desc: vdu-b-1-vsd
-          sw-image-desc: vdu-b-1-image
-        - id: vdu-b-2
-          name: VNF-B VDU 2
-          int-cpd:
-           - id: right
-             layer-protocol: ethernet
-           - id: management
-             layer-protocol: ethernet
-           - id: internal
-             layer-protocol: ethernet
-             int-virtual-link-desc: internal-vl
-          virtual-compute-desc: vdu-b-2-vcd
-          virtual-storage-desc: vdu-b-2-vsd
-          sw-image-desc: vdu-b-2-image
-      virtual-compute-desc:
-        id: vdu-b-1-vcd
-        virtual-memory:
-          size: '4.0'
-        virtual-cpu:
-          num-virtual-cpu: '2'
-      virtual-storage-desc:
-        id: vdu-b-1-vsd
-        type-of-storage: root-storage
-        size-of-storage: '0'
-      sw-image-desc:
-        id: vdu-b-1-image
-        name: VNF-B image
-        version: '1.1'
-        checksum:
-          algorithm: sha-224
-          hash: somehashfortst010
-        container-format: bare
-        disk-format: qcow2
-        min-disk: '1'
-        min-ram: '2.0'
-        size: '1'
-        image: 'http://someurl.com/VNF-B.qcow2'
-      virtual-compute-desc:
-        id: vdu-b-2-vcd
-        virtual-memory:
-          size: '6.0'
-        virtual-cpu:
-          num-virtual-cpu: '2'
-      virtual-storage-desc:
-        id: vdu-b-2-vsd
-        type-of-storage: root-storage
-        size-of-storage: '0'
-      sw-image-desc:
-        id: vdu-b-2-image
-        name: VNF-B-2 image
-        version: '1.1'
-        checksum:
-          algorithm: sha-224
-          hash: somehashfortst010
-        container-format: bare
-        disk-format: qcow2
-        min-disk: '1'
-        min-ram: '2.0'
-        size: '1'
-        image: 'http://someurl.com/VNF-B-2.qcow2'
-      int-virtual-link-desc:
-        - id: internal-vl
-          flavour:
-            id: internal-vl-flavour
-            qos:
-              latency: '1'
-              packet-delay-variation: '1'
-              packet-loss-ratio: '0.05'
-          connectivity-type:
-            layer-protocol: ethernet     
-      ext-cpd:
-        - id: ext-b-left
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: left
-          layer-protocol: ethernet
-        - id: management
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: management
-          layer-protocol: ethernet
-        - id: ext-b-right
-          int-cpd:
-            vdu-id: vdu-b-2
-            cpd: right
-          layer-protocol: ethernet
-      df:
-        id: normal
-        vdu-profile:
-          - id: vdu-b-1
-            min-number-of-instances: '1'
-            max-number-of-instances: '2'
-          - id: vdu-b-2
-            min-number-of-instances: '1'
-            max-number-of-instances: '4'          
-        instantiation-level:
-          - id: double
-            vdu-level:
-              - vdu-id: vdu-b-1
-                number-of-instances: '2'
-              - vdu-id: vdu-b-2
-                number-of-instances: '2'
-          - id: single
-            vdu-level:
-              - vdu-id: vdu-b-1
-                number-of-instances: '1'
-              - vdu-id: vdu-b-2
-                number-of-instances: '1'
-        default-instantiation-level: single
-        lcm-operations-configuration:
-          scale-vnf-to-level-op-config:
-            arbitrary-target-levels-supported: 'true'
-          terminate-vnf-op-config:
-            min-graceful-termination: '1'
-          operate-vnf-op-config:
-            min-graceful-stop-timeout: '1'
\ No newline at end of file
-- 
GitLab


From 756b739965c7c5d20397fea4c8f905b632bd42bb Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Wed, 27 Jan 2021 15:39:33 +0100
Subject: [PATCH 262/322] Fix issue: #136

---
 .../VnfLcmOperationOccurrenceNotification.schema.json       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SOL003/VNFLifecycleManagement-API/schemas/VnfLcmOperationOccurrenceNotification.schema.json b/SOL003/VNFLifecycleManagement-API/schemas/VnfLcmOperationOccurrenceNotification.schema.json
index 85468696c..bf0bfcd30 100644
--- a/SOL003/VNFLifecycleManagement-API/schemas/VnfLcmOperationOccurrenceNotification.schema.json
+++ b/SOL003/VNFLifecycleManagement-API/schemas/VnfLcmOperationOccurrenceNotification.schema.json
@@ -347,11 +347,11 @@
               "type": "string"
             },
             "vnfProvider": {
-              "description": "If present, this attribute signals modifications of the \"vnfProvider\" attribute in \"VnfInstance\". If present, this attribute (which depends on the value of the \"vnfPkgId\" attribute) was modified implicitly following a request to modify the \"vnfPkgId\" attribute, by copying the value of this attribute from the VNFD in the VNF Package identified by the \"vnfPkgId” attribute.\n",
+              "description": "If present, this attribute signals modifications of the \"vnfProvider\" attribute in \"VnfInstance\". If present, this attribute (which depends on the value of the \"vnfPkgId\" attribute) was modified implicitly following a request to modify the \"vnfPkgId\" attribute, by copying the value of this attribute from the VNFD in the VNF Package identified by the \"vnfPkgId\" attribute.\n",
               "type": "string"
             },
             "vnfProductName": {
-              "description": "If present, this attribute signals modifications of the \"vnfProductName\" attribute in \"VnfInstance\". If present, this attribute (which depends on the value of the \"vnfPkgId\" attribute) was modified implicitly following a request to modify the \"vnfPkgId\" attribute, by copying the value of this attribute from the VNFD in the VNF Package identified by the \"vnfPkgId” attribute.\n",
+              "description": "If present, this attribute signals modifications of the \"vnfProductName\" attribute in \"VnfInstance\". If present, this attribute (which depends on the value of the \"vnfPkgId\" attribute) was modified implicitly following a request to modify the \"vnfPkgId\" attribute, by copying the value of this attribute from the VNFD in the VNF Package identified by the \"vnfPkgId\" attribute.\n",
               "type": "string"
             },
             "vnfSoftwareVersion": {
@@ -565,4 +565,4 @@
           }
         }
       }
-    }
\ No newline at end of file
+    }
-- 
GitLab


From 94758811a40200674094f8a7b0ef9b2ccf398647 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Thu, 28 Jan 2021 12:45:48 +0100
Subject: [PATCH 263/322] fixed issue #135 for v2.7.1

---
 .../CancelOperationTask.robot                 |  10 +-
 .../ChangeVNFFlavourTask.robot                |   4 +-
 .../FailOperationTask.robot                   |   4 +-
 .../HealVNFTask.robot                         |   4 +-
 .../IndividualVNFInstance.robot               |   2 +-
 .../InstantiateVNFTask.robot                  |   2 +-
 .../OperateVNFTask.robot                      |   4 +-
 .../RetryOperationTask.robot                  |   4 +-
 .../RollbackOperationTask.robot               |   4 +-
 .../ScaleVNFTask.robot                        |   4 +-
 .../ScaleVNFToLevelTask.robot                 |   4 +-
 .../TerminateVNFTask.robot                    |   2 +-
 .../VnfLcmMntOperationKeywords.robot          | 201 +++++++++++++++++-
 .../environment/variables.txt                 |  12 +-
 14 files changed, 231 insertions(+), 30 deletions(-)

diff --git a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
index af06dc10c..92461b333 100644
--- a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
@@ -11,7 +11,7 @@ POST Cancel operation task
     [Documentation]    Test ID: 7.3.1.16.1
     ...    Test title: POST Cancel operation task
     ...    Test objective: The POST method initiates cancelling an ongoing VNF lifecycle operation while it is being executed or rolled back, i.e. the "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state.
-    ...    Pre-conditions: the "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state.
+    ...    Pre-conditions: The "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state.
     ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
@@ -24,12 +24,12 @@ POST Cancel operation task Conflict
     [Documentation]    Test ID: 7.3.1.16.2
     ...    Test title: POST Cancel operation task Conflict
     ...    Test objective: The POST method is NOT cancelling an ongoing VNF lifecycle operation due to the fact that the VNF instance resource is not in STARTING, PROCESSING or ROLLING_BACK state
-    ...    Pre-conditions: operation is not in STARTING, PROCESSING or ROLLING_BACK state
+    ...    Pre-conditions: The "VNF LCM operation occurrence" is not in STARTING, PROCESSING or ROLLING_BACK state
     ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Cancel operation task
+    POST Cancel operation task with conflict
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
@@ -37,12 +37,12 @@ POST Cancel operation task Not Found
      [Documentation]    Test ID: 7.3.1.16.3
     ...    Test title: POST Cancel operation task Not Found
     ...    Test objective: The objective is to test that POST method cannot cancel a VNF lifecycle operation because the resource is not found
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Cancel operation task
+    POST Cancel operation task not existing
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails
     
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
index 4c74ec566..93a4003e0 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
@@ -29,7 +29,7 @@ POST Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none  
-    POST Change VNF deployment flavour   
+    POST Change VNF deployment flavour of NOT-INSTANTIATED VNF   
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
   
@@ -42,7 +42,7 @@ POST Change deployment flavour of a vnfInstance Not Found
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none  
-    POST Change VNF deployment flavour  
+    POST Change VNF deployment flavour of not existing VNF 
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails
        
diff --git a/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot b/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
index 89132cbef..3d3cb5877 100644
--- a/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
@@ -30,7 +30,7 @@ Post Fail operation task Conflict (Not-FAILED_TEMP)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none     
-    Post Fail operation
+    Post Fail operation with conflict
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
@@ -43,7 +43,7 @@ Post Fail operation task Not Found
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none  
-    Post Fail operation
+    Post Fail operation not existing
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
diff --git a/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot b/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
index f8858ab0f..ca6daf95b 100644
--- a/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
@@ -29,7 +29,7 @@ POST Heal a vnfInstance Conflict (Not-Instantiated)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Heal VNF
+    POST Heal VNF Not Instantiated
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
     
@@ -42,7 +42,7 @@ POST Heal a vnfInstance Not Found
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Heal VNF
+    POST Heal VNF Not Existing
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails 
     
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index cca928c20..d11844ead 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
@@ -108,7 +108,7 @@ DELETE Individual VNFInstance Conflict
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: Resources are not deleted
-    DELETE individual vnfInstance
+    DELETE individual vnfInstance in INSTANTIATED state
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
     Check resource existence
diff --git a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
index 1bba6b87b..5a2275f77 100644
--- a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
@@ -30,7 +30,7 @@ Instantiate a vnfInstance Conflict
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST instantiate individual vnfInstance
+    POST instantiate individual vnfInstance with conflict
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
     
diff --git a/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
index 462955700..2f11f363e 100644
--- a/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
@@ -31,7 +31,7 @@ POST Operate a vnfInstance Conflict (Not-Instantiated)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Operate VNF
+    POST Operate VNF with conflict
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
    
@@ -44,7 +44,7 @@ POST Operate a vnfInstance Not Found
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Operate VNF
+    POST Operate VNF not existing
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails
    
diff --git a/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot b/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
index 63a4f7965..31848724f 100644
--- a/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
@@ -32,7 +32,7 @@ Post Retry operation task Conflict (Not-FAILED_TEMP)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Post Retry operation
+    Post Retry operation with conflict
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
@@ -45,7 +45,7 @@ Post Retry operation task Not Found
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Post Retry operation
+    Post Retry operation not existing
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
diff --git a/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot b/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
index 881342094..11038da13 100644
--- a/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
@@ -31,7 +31,7 @@ POST Rollback operation task Conflict (Not-FAILED_TEMP)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Post Rollback operation
+    Post Rollback operation with conflict
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
@@ -44,7 +44,7 @@ POST Rollback operation task Not Found
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Post Rollback operation
+    Post Rollback operation not existing
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
index e0b40633e..1ce92b0b1 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
@@ -30,7 +30,7 @@ POST Scale a vnfInstance Conflict (Not-Instantiated)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Scale vnfInstance  
+    POST Scale vnfInstance with VNF NOT-INSTANTIATED 
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
     
@@ -43,7 +43,7 @@ POST Scale a vnfInstance Not Found
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Scale vnfInstance  
+    POST Scale vnfInstance with not existing VNF
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails 
    
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
index 7c483b568..0b9f1c50d 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
@@ -29,7 +29,7 @@ POST Scale a vnfInstance to level Conflict (Not-Instantiated)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Scale vnfInstance to level   
+    POST Scale vnfInstance to level with VNF NOT-INSTANTIATED 
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
 
@@ -42,7 +42,7 @@ Scale a vnfInstance Not Found
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Scale vnfInstance to level    
+    POST Scale vnfInstance to level with not existing VNF
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails 
    
diff --git a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
index 9df78c58b..98018e193 100644
--- a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
@@ -30,7 +30,7 @@ POST Terminate a vnfInstance Conflict (Not-Instantiated)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Terminate VNF  
+    POST Terminate VNF in NOT-INSTANTIATED state
     Check HTTP Response Status Code Is    202
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index 0ef1ebdeb..9affcd431 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -250,6 +250,24 @@ POST Cancel operation task
     Log    Validate Status code
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
+	
+POST Cancel operation task with conflict
+    Log    Cancel an ongoing VNF lifecycle operation
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Cancel a VNF lifecycle operation
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccIdNotStartingProcessingRollingback}/cancel    ${CancelMode}
+    Log    Validate Status code
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	
+POST Cancel operation task not existing
+    Log    Cancel an ongoing VNF lifecycle operation
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Cancel a VNF lifecycle operation
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${notExistingVnfLcmOpOccId}/cancel    ${CancelMode}
+    Log    Validate Status code
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
     
 GET Cancel operation task
     log    Trying to perform a GET. This method should not be implemented
@@ -326,7 +344,30 @@ POST Change VNF deployment flavour
     ${body}=        Format String   ${template}     newFlavourId=${newFlavourId}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_flavour    ${body} 
     ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}  	 
+	Set Global Variable    ${response}    ${outputResponse}
+
+POST Change VNF deployment flavour of NOT-INSTANTIATED VNF
+    Log    Trying to change the deployment flavour of a VNF instance.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template}=    Get File    jsons/changeVnfFlavourRequest.json
+    ${body}=        Format String   ${template}     newFlavourId=${newFlavourId}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notInstantiatedVnfInstanceId}/change_flavour    ${body} 
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+
+POST Change VNF deployment flavour of not existing VNF
+    Log    Trying to change the deployment flavour of a VNF instance.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template}=    Get File    jsons/changeVnfFlavourRequest.json
+    ${body}=        Format String   ${template}     newFlavourId=${newFlavourId}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notExistingVnfInstanceId}/change_flavour    ${body} 
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+
 GET Change VNF deployment flavour
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
@@ -501,6 +542,12 @@ DELETE individual vnfInstance
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
+DELETE individual vnfInstance in INSTANTIATED state
+    log    Trying to delete an individual VNF instance
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${instantiatedVnfInstanceId}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
 POST instantiate individual vnfInstance	
     Log    Trying to Instantiate a vnf Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
@@ -511,6 +558,16 @@ POST instantiate individual vnfInstance
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 	
+POST instantiate individual vnfInstance with conflict
+    Log    Trying to Instantiate a vnf Instance
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${body}=    Get File    jsons/instantiateVnfRequest.json
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${instantiatedVnfInstanceId}/instantiate    ${body}	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 	
+	
 GET instantiate individual vnfInstance
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
@@ -548,6 +605,26 @@ POST Scale vnfInstance
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
+POST Scale vnfInstance with VNF NOT-INSTANTIATED
+    Log    Trying to Instantiate a vnf Instance
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template}=    Get File    jsons/scaleVnfRequest.json
+    ${body}=        Format String   ${template}     scaletype=${scaletype}    scaleAspectId=${scaleAspectId}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notInstantiatedVnfInstanceId}/scale    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+POST Scale vnfInstance with not existing VNF
+    Log    Trying to Instantiate a vnf Instance
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template}=    Get File    jsons/scaleVnfRequest.json
+    ${body}=        Format String   ${template}     scaletype=${scaletype}    scaleAspectId=${scaleAspectId}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notExistingVnfInstanceId}/scale    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}   
 GET Scale vnfInstance				
     Log    Trying to get a scale a vnf Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
@@ -594,6 +671,26 @@ POST Scale vnfInstance to level
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
+POST Scale vnfInstance to level with VNF NOT-INSTANTIATED
+    Log    Trying to scale a vnf Instance to level
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template}=    Get File    jsons/scaleVnfToLevelRequest.json
+    ${body}=        Format String   ${template}     instantiationLevelId=${instantiationLevelId}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notInstantiatedVnfInstanceId}/scale_to_level    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+POST Scale vnfInstance to level with not existing VNF
+    Log    Trying to scale a vnf Instance to level
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template}=    Get File    jsons/scaleVnfToLevelRequest.json
+    ${body}=        Format String   ${template}     instantiationLevelId=${instantiationLevelId}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notExistingVnfInstanceId}/scale_to_level    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
 GET Scale vnfInstance to level
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
@@ -630,6 +727,17 @@ POST Terminate VNF
     ${template}=    Get File    jsons/terminateVnfRequest.json
     ${body}=        Format String   ${template}     terminationType=${terminationType}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/terminate    ${body}	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+
+POST Terminate VNF in NOT-INSTANTIATED state
+    Log    Trying to terminate a VNF instance.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template}=    Get File    jsons/terminateVnfRequest.json
+    ${body}=        Format String   ${template}     terminationType=${terminationType}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notInstantiatedVnfInstanceId}/terminate    ${body}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
@@ -671,6 +779,28 @@ POST Heal VNF
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/heal    ${body}		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
+	
+POST Heal VNF Not Instantiated
+    Log    Trying to heal a VNF instance.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template}=    Get File    jsons/healVnfRequest.json
+    ${body}=        Format String   ${template}     healingCause=${healingCause}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notInstantiatedVnfInstanceId}/heal    ${body}		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+	
+POST Heal VNF Not Existing
+    Log    Trying to heal a VNF instance.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template}=    Get File    jsons/healVnfRequest.json
+    ${body}=        Format String   ${template}     healingCause=${healingCause}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notExistingVnfInstanceId}/heal    ${body}		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
 
 GET Heal VNF
     log    Trying to perform a GET. This method should not be implemented
@@ -710,6 +840,28 @@ POST Operate VNF
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/operate    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
+	
+POST Operate VNF with conflict
+    Log    Trying to operate a VNF instance.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template}=    Get File    jsons/operateVnfRequest.json
+    ${body}=        Format String   ${template}     changeStateTo=${changeStateTo}    stopType=${stopType}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notInstantiatedVnfInstanceId}/operate    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+    
+POST Operate VNF not existing
+    Log    Trying to operate a VNF instance.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template}=    Get File    jsons/operateVnfRequest.json
+    ${body}=        Format String   ${template}     changeStateTo=${changeStateTo}    stopType=${stopType}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notExistingVnfInstanceId}/operate    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
 
 GET Operate VNF
     log    Trying to perform a GET. This method should not be implemented
@@ -866,7 +1018,21 @@ Post Retry operation
     Log    Execute Query and validate response
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
     ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}	    
+	Set Global Variable    ${response}    ${outputResponse}	 
+Post Retry operation with conflict
+    Log    Retry a VNF lifecycle operation if that operation has experienced a temporary failure
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Execute Query and validate response
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccIdNotFailedTemp}/retry	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+Post Retry operation not existing
+    Log    Retry a VNF lifecycle operation if that operation has experienced a temporary failure
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Execute Query and validate response
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${notExistingVnfLcmOpOccId}/retry	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}   
 Get Retry operation	
     Log    Trying to perform a GET. This method should not be implemented.
     Set Headers  {"Accept":"${ACCEPT}"}  
@@ -901,6 +1067,20 @@ Post Rollback operation
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+Post Rollback operation with conflict
+    Log    Rollback a VNF lifecycle operation if that operation has experienced a temporary failure
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Execute Query and validate response
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccIdNotFailedTemp}/rollback
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+Post Rollback operation not existing
+    Log    Rollback a VNF lifecycle operation if that operation has experienced a temporary failure
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Execute Query and validate response
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${notExistingVnfLcmOpOccId}/rollback
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	    
 Get Rollback operation	
@@ -939,6 +1119,23 @@ Post Fail operation
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	    
+	
+Post Fail operation with conflict
+    Log    mark as Failed a VNF lifecycle operation if that operation has experienced a temporary failure
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Execute Query and validate response
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccIdNotFailedTemp}/fail
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	    
+	
+Post Fail operation not existing
+    Log    mark as Failed a VNF lifecycle operation if that operation has experienced a temporary failure
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Execute Query and validate response
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${notExistingvnfLcmOpOccId}/fail
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	    
+	
 Get Fail operation	
     Log    Trying to perform a GET. This method should not be implemented.
     Set Headers  {"Accept":"${ACCEPT}"}  
diff --git a/SOL003/VNFLifecycleManagement-API/environment/variables.txt b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
index b08bdeff5..acba0ae0b 100644
--- a/SOL003/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
@@ -28,12 +28,18 @@ ${ARTIFACT_ID}    artifactId
 ${WRONG_ACCEPT}    application/json
 ${SYNC_MODE}    0
 
-
+${instantiatedVnfInstanceId}       6fc3539c-e602-4afa-8e13-962fb5a7d81f
+${notInstantiatedVnfInstanceId}       6fc3539c-e602-4afa-8e13-962fb5a7d81f
+${notExistingVnfInstanceId}     6fc3539c-e602-4afa-8e13-962fb5a7d81f   
 ${vnfInstanceId}       6fc3539c-e602-4afa-8e13-962fb5a7d81f
 ${subscriptionId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
-${vnfLcmOpOccId}    6fc3539c-e602-4afa-8e13-962fb5a7d81d
 ${conflicVnfInstanceId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
 
+${vnfLcmOpOccId}    6fc3539c-e602-4afa-8e13-962fb5a7d81d
+${notExistingVnfLcmOpOccId}    6fc3539c-e602-4afa-8e13-962fb5a7d81d
+${vnfLcmOpOccIdNotStartingProcessingRollingback}    6fc3539c-e602-4afa-8e13-962fb5a7d81d
+${vnfLcmOpOccIdNotFailedTemp}    6fc3539c-e602-4afa-8e13-962fb5a7d81d
+
 ${VnfLcmOperationOccurrenceNotification}    {}
 ${VnfIdentifierCreationNotification}    {}
 ${VnfIdentifierDeletionNotification}    {}
@@ -44,8 +50,6 @@ ${requestedFlavour}    test
 ${sub_filter}    filter
 ${sub_filter_invalid}    filter_invalid
 
-${notInstantiatedVnfInstanceId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
-
 ${fields}         criteria,objectInstanceIds
 
 ${vnfInstanceName}    Test-VnfInstance
-- 
GitLab


From 7cd1d95b7fd3ce42328fee74d0d530b9cac587d7 Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Thu, 28 Jan 2021 16:25:40 +0100
Subject: [PATCH 264/322] Fix issue: #142

---
 SOL003/VNFFaultManagement-API/Alarms.robot | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/SOL003/VNFFaultManagement-API/Alarms.robot b/SOL003/VNFFaultManagement-API/Alarms.robot
index 69001f407..c0dd85276 100644
--- a/SOL003/VNFFaultManagement-API/Alarms.robot
+++ b/SOL003/VNFFaultManagement-API/Alarms.robot
@@ -70,7 +70,7 @@ GET information about multiple alarms with "all_fields" attribute selector
     ...    Post-Conditions: none
     GET Alarms Task with all_fields attribute selector
     Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    alarms
+    Check HTTP Response Body Json Schema Is    Alarms
     
 GET information about multiple alarms with exclude_default attribute selector
     [Documentation]    Test ID: 7.3.5.1.6
@@ -83,7 +83,7 @@ GET information about multiple alarms with exclude_default attribute selector
     ...    Post-Conditions: none
     GET Alarms Task with exclude_default attribute selector
     Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    alarms
+    Check HTTP Response Body Json Schema Is    Alarms
     
 GET information about multiple alarms with fields attribute selector
     [Documentation]    Test ID: 7.3.5.1.7
@@ -96,7 +96,7 @@ GET information about multiple alarms with fields attribute selector
     ...    Post-Conditions: none
     GET Alarms Task with fields attribute selector
     Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    alarms
+    Check HTTP Response Body Json Schema Is    Alarms
      
 GET information about multiple alarms with "exclude_fields" attribute selector
     [Documentation]    Test ID: 7.3.5.1.8
@@ -109,7 +109,7 @@ GET information about multiple alarms with "exclude_fields" attribute selector
     ...    Post-Conditions: none
     GET Alarms Task with exclude_fields attribute selector
     Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    alarms 
+    Check HTTP Response Body Json Schema Is    Alarms 
     
 PUT Alarms - Method not implemented
     [Documentation]    Test ID: 7.3.5.1.9
-- 
GitLab


From dedf94bbdb57d33359f2ad7700cff672faef81e5 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Thu, 28 Jan 2021 18:31:46 +0100
Subject: [PATCH 265/322] renamed descriptors

---
 .../VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot  | 4 ++--
 .../vnfd_SOL001.yaml}                                         | 0
 .../vnfd_SOL006.yaml}                                         | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename SOL002/VNFLifecycleManagement-API/descriptors/SOL001/{reference_tst010_vnf_b_2vdu_SOL001.yaml => VNFD/vnfd_SOL001.yaml} (100%)
 rename SOL002/VNFLifecycleManagement-API/descriptors/SOL006/{reference_tst010_vnf_b_2vdu_SOL006.yaml => VNFD/vnfd_SOL006.yaml} (100%)

diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index d7ad8c246..4a3f22e52 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -10,8 +10,8 @@ Library    JSONLibrary
 Library    Collections
 Library    JSONSchemaLibrary    schemas/
 Library           String
-Variables    descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
-Variables    descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
+Variables    descriptors/SOL001/VNFD/vnfd_SOL001.yaml
+Variables    descriptors/SOL006/VNFD/vnfd_SOL006.yaml
 
 *** Keywords ***
 
diff --git a/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml b/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
rename to SOL002/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
diff --git a/SOL002/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml b/SOL002/VNFLifecycleManagement-API/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
rename to SOL002/VNFLifecycleManagement-API/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
-- 
GitLab


From 29ab6fa67e5ed77ecda339ef95785f1d70930143 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Thu, 28 Jan 2021 18:36:06 +0100
Subject: [PATCH 266/322] renamed descriptors

---
 .../VnfLcmMntOperationKeywords.robot                          | 4 ++--
 .../vnfd_SOL001.yaml}                                         | 0
 .../vnfd_SOL006.yaml}                                         | 0
 SOL003/VNFLifecycleOperationGranting-API/Grants.robot         | 4 ++--
 .../VNFLifecycleOperationGranting-API/IndividualGrant.robot   | 4 ++--
 .../vnfd_SOL001.yaml}                                         | 0
 .../vnfd_SOL006.yaml}                                         | 0
 .../VNFPackageManagementKeywords.robot                        | 4 ++--
 .../vnfd_SOL001.yaml}                                         | 0
 .../vnfd_SOL006.yaml}                                         | 0
 10 files changed, 8 insertions(+), 8 deletions(-)
 rename SOL003/VNFLifecycleManagement-API/descriptors/SOL001/{reference_tst010_vnf_b_2vdu_SOL001.yaml => VNFD/vnfd_SOL001.yaml} (100%)
 rename SOL003/VNFLifecycleManagement-API/descriptors/SOL006/{reference_tst010_vnf_b_2vdu_SOL006.yaml => VNFD/vnfd_SOL006.yaml} (100%)
 rename SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/{reference_tst010_vnf_b_2vdu_SOL001.yaml => VNFD/vnfd_SOL001.yaml} (100%)
 rename SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL006/{reference_tst010_vnf_b_2vdu_SOL006.yaml => VNFD/vnfd_SOL006.yaml} (100%)
 rename SOL003/VNFPackageManagement-API/descriptors/SOL001/{reference_tst010_vnf_b_2vdu_SOL001.yaml => VNFD/vnfd_SOL001.yaml} (100%)
 rename SOL003/VNFPackageManagement-API/descriptors/SOL006/{reference_tst010_vnf_b_2vdu_SOL006.yaml => VNFD/vnfd_SOL006.yaml} (100%)

diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index 6a172f1f6..bcd2ed4db 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -8,8 +8,8 @@ Library    BuiltIn
 Library    JSONLibrary
 Library    Collections
 Library    JSONSchemaLibrary    schemas/
-Variables    descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
-Variables    descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
+Variables    descriptors/SOL001/VNFD/vnfd_SOL001.yaml
+Variables    descriptors/SOL006/VNFD/vnfd_SOL006.yaml
 
 *** Keywords ***
 Get Vnf Instance 
diff --git a/SOL003/VNFLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml b/SOL003/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
similarity index 100%
rename from SOL003/VNFLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
rename to SOL003/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
diff --git a/SOL003/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml b/SOL003/VNFLifecycleManagement-API/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
similarity index 100%
rename from SOL003/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
rename to SOL003/VNFLifecycleManagement-API/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
diff --git a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
index 0121db906..2221c8558 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
@@ -6,8 +6,8 @@ Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 Library    Collections
-Variables    descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
-Variables    descriptors/SOL006/reference_tst010_vnf_b_2vdu_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.
 
diff --git a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
index d0865365c..751e9c695 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
@@ -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/reference_tst010_vnf_b_2vdu_SOL001.yaml
-Variables    descriptors/SOL006/reference_tst010_vnf_b_2vdu_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.
diff --git a/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml b/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
similarity index 100%
rename from SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
rename to SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
diff --git a/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml b/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
similarity index 100%
rename from SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
rename to SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 56a36420b..e46f876f8 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -9,8 +9,8 @@ Library    Collections
 Library    JSONSchemaLibrary    schemas/
 Library    Process
 Library    String
-Variables    descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
-Variables    descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
+Variables    descriptors/SOL001/VNFD/vnfd_SOL001.yaml
+Variables    descriptors/SOL006/VNFD/vnfd_SOL006.yaml
 
 *** Keywords ***
 Get all VNF Packages
diff --git a/SOL003/VNFPackageManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml b/SOL003/VNFPackageManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
similarity index 100%
rename from SOL003/VNFPackageManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
rename to SOL003/VNFPackageManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
diff --git a/SOL003/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml b/SOL003/VNFPackageManagement-API/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
similarity index 100%
rename from SOL003/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
rename to SOL003/VNFPackageManagement-API/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
-- 
GitLab


From c92a3ef73eb524534447fc96c496745de2722927 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Thu, 28 Jan 2021 18:40:17 +0100
Subject: [PATCH 267/322] renamed descriptors

---
 SOL005/NSDManagement-API/NSDManagementKeywords.robot      | 4 ++--
 .../nsd_SOL001.yaml}                                      | 0
 .../nsd_SOL006.yaml}                                      | 0
 .../NSLCMOperationKeywords.robot                          | 8 ++++----
 ...ence_tst010_nsd_simple_SOL001.yaml => nsd_SOL001.yaml} | 0
 ...rence_tst010_vnf_2vdu_SOL001.yaml => vnfd_SOL001.yaml} | 0
 ...ence_tst010_nsd_simple_SOL006.yaml => nsd_SOL006.yaml} | 0
 ...rence_tst010_vnf_2vdu_SOL006.yaml => vnfd_SOL006.yaml} | 0
 .../VNFPackageManagementKeywords.robot                    | 4 ++--
 .../vnfd_SOL001.yaml}                                     | 0
 .../vnfd_SOL006.yaml}                                     | 0
 11 files changed, 8 insertions(+), 8 deletions(-)
 rename SOL005/NSDManagement-API/descriptors/SOL001/{reference_tst010_nsd_simple_a_b_SOL001.yaml => NSD/nsd_SOL001.yaml} (100%)
 rename SOL005/NSDManagement-API/descriptors/SOL006/{reference_tst010_nsd_simple_a_b_SOL006.yaml => NSD/nsd_SOL006.yaml} (100%)
 rename SOL005/NSLifecycleManagement-API/descriptors/SOL001/NSD/{reference_tst010_nsd_simple_SOL001.yaml => nsd_SOL001.yaml} (100%)
 rename SOL005/NSLifecycleManagement-API/descriptors/SOL001/VNFD/{reference_tst010_vnf_2vdu_SOL001.yaml => vnfd_SOL001.yaml} (100%)
 rename SOL005/NSLifecycleManagement-API/descriptors/SOL006/NSD/{reference_tst010_nsd_simple_SOL006.yaml => nsd_SOL006.yaml} (100%)
 rename SOL005/NSLifecycleManagement-API/descriptors/SOL006/VNFD/{reference_tst010_vnf_2vdu_SOL006.yaml => vnfd_SOL006.yaml} (100%)
 rename SOL005/VNFPackageManagement-API/descriptors/SOL001/{reference_tst010_vnf_b_2vdu_SOL001.yaml => VNFD/vnfd_SOL001.yaml} (100%)
 rename SOL005/VNFPackageManagement-API/descriptors/SOL006/{reference_tst010_vnf_b_2vdu_SOL006.yaml => VNFD/vnfd_SOL006.yaml} (100%)

diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index ab160863c..67056a589 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -10,8 +10,8 @@ Library    JSONSchemaLibrary    schemas/
 Library    RequestsLibrary
 Library    Process
 Library    String
-Variables  descriptors/SOL006/reference_tst010_nsd_simple_a_b_SOL006.yaml
-Variables  descriptors/SOL001/reference_tst010_nsd_simple_a_b_SOL001.yaml
+Variables  descriptors/SOL006/NSD/nsd_SOL006.yaml
+Variables  descriptors/SOL001/NSD/nsd_SOL001.yaml
 
 *** Keywords ***
 GET all Network Service Descriptors Information
diff --git a/SOL005/NSDManagement-API/descriptors/SOL001/reference_tst010_nsd_simple_a_b_SOL001.yaml b/SOL005/NSDManagement-API/descriptors/SOL001/NSD/nsd_SOL001.yaml
similarity index 100%
rename from SOL005/NSDManagement-API/descriptors/SOL001/reference_tst010_nsd_simple_a_b_SOL001.yaml
rename to SOL005/NSDManagement-API/descriptors/SOL001/NSD/nsd_SOL001.yaml
diff --git a/SOL005/NSDManagement-API/descriptors/SOL006/reference_tst010_nsd_simple_a_b_SOL006.yaml b/SOL005/NSDManagement-API/descriptors/SOL006/NSD/nsd_SOL006.yaml
similarity index 100%
rename from SOL005/NSDManagement-API/descriptors/SOL006/reference_tst010_nsd_simple_a_b_SOL006.yaml
rename to SOL005/NSDManagement-API/descriptors/SOL006/NSD/nsd_SOL006.yaml
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index 8dde1509e..5eefe233d 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -8,10 +8,10 @@ Library    OperatingSystem
 Library    MockServerLibrary
 Library    Collections
 Library    String
-Variables  descriptors/SOL006/VNFD/reference_tst010_vnf_2vdu_SOL006.yaml
-Variables  descriptors/SOL006/NSD/reference_tst010_nsd_simple_SOL006.yaml
-Variables  descriptors/SOL001/VNFD/reference_tst010_vnf_2vdu_SOL001.yaml
-Variables  descriptors/SOL001/NSD/reference_tst010_nsd_simple_SOL001.yaml
+Variables  descriptors/SOL006/VNFD/vnfd_SOL006.yaml
+Variables  descriptors/SOL006/NSD/nsd_SOL006.yaml
+Variables  descriptors/SOL001/VNFD/vnfd_SOL001.yaml
+Variables  descriptors/SOL001/NSD/nsd_SOL001.yaml
 
 *** Keywords ***
 Initialize System
diff --git a/SOL005/NSLifecycleManagement-API/descriptors/SOL001/NSD/reference_tst010_nsd_simple_SOL001.yaml b/SOL005/NSLifecycleManagement-API/descriptors/SOL001/NSD/nsd_SOL001.yaml
similarity index 100%
rename from SOL005/NSLifecycleManagement-API/descriptors/SOL001/NSD/reference_tst010_nsd_simple_SOL001.yaml
rename to SOL005/NSLifecycleManagement-API/descriptors/SOL001/NSD/nsd_SOL001.yaml
diff --git a/SOL005/NSLifecycleManagement-API/descriptors/SOL001/VNFD/reference_tst010_vnf_2vdu_SOL001.yaml b/SOL005/NSLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
similarity index 100%
rename from SOL005/NSLifecycleManagement-API/descriptors/SOL001/VNFD/reference_tst010_vnf_2vdu_SOL001.yaml
rename to SOL005/NSLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
diff --git a/SOL005/NSLifecycleManagement-API/descriptors/SOL006/NSD/reference_tst010_nsd_simple_SOL006.yaml b/SOL005/NSLifecycleManagement-API/descriptors/SOL006/NSD/nsd_SOL006.yaml
similarity index 100%
rename from SOL005/NSLifecycleManagement-API/descriptors/SOL006/NSD/reference_tst010_nsd_simple_SOL006.yaml
rename to SOL005/NSLifecycleManagement-API/descriptors/SOL006/NSD/nsd_SOL006.yaml
diff --git a/SOL005/NSLifecycleManagement-API/descriptors/SOL006/VNFD/reference_tst010_vnf_2vdu_SOL006.yaml b/SOL005/NSLifecycleManagement-API/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
similarity index 100%
rename from SOL005/NSLifecycleManagement-API/descriptors/SOL006/VNFD/reference_tst010_vnf_2vdu_SOL006.yaml
rename to SOL005/NSLifecycleManagement-API/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index f6fa8adbb..15b7d058e 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -10,8 +10,8 @@ Library           MockServerLibrary
 Library           String
 Library           Collections
 Library           String
-Variables         descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
-Variables         descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
+Variables         descriptors/SOL001/VNFD/vnfd_SOL001.yaml
+Variables         descriptors/SOL006/VNFD/vnfd_SOL006.yaml
 
 *** Keywords ***
 Get all VNF Packages
diff --git a/SOL005/VNFPackageManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml b/SOL005/VNFPackageManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
similarity index 100%
rename from SOL005/VNFPackageManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
rename to SOL005/VNFPackageManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
diff --git a/SOL005/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml b/SOL005/VNFPackageManagement-API/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
similarity index 100%
rename from SOL005/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
rename to SOL005/VNFPackageManagement-API/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
-- 
GitLab


From 57473add3ed09886fe01a2546ea226f977cd2589 Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Mon, 1 Feb 2021 17:48:46 +0100
Subject: [PATCH 268/322] Fix issue #145

---
 .../VNFPackageManagement-API/VNFPackageManagementKeywords.robot | 2 +-
 SOL003/VNFPackageManagement-API/environment/variables.txt       | 1 +
 .../VNFPackageManagement-API/VNFPackageManagementKeywords.robot | 2 +-
 SOL005/VNFPackageManagement-API/environment/variables.txt       | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index d751124a8..7f2eb2a20 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -275,7 +275,7 @@ GET Individual VNF Package Content with Range Request
 Check HTTP Response Header Content-Range Is Present and Matches the requested range
     Log    Check Content-Range HTTP Header
     Should Contain    ${response['headers']}    Content-Range
-    Should Be Equal As Strings    ${response['headers']['Content-Range']}    ${range}
+    Should Be Equal As Strings    ${response['headers']['Content-Range']}    ${range}/${full_size}
     Log    Header Content-Range is present
     
 Check HTTP Response Header Content-Length Is Present and Matches the requested range length
diff --git a/SOL003/VNFPackageManagement-API/environment/variables.txt b/SOL003/VNFPackageManagement-API/environment/variables.txt
index 1bb5c34f5..b3624ea45 100644
--- a/SOL003/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL003/VNFPackageManagement-API/environment/variables.txt
@@ -73,6 +73,7 @@ ${artifactPath}    artifactPath
 ${CONTENT_TYPE_OCTET}    application/octet-stream
 ${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
 ${range}          bytes=0-1023
+${full_size}        2000            # Size of the requested artifact to be downloaded via partial downloads
 ${erroneousRange}    bytes=10000000-1000000000    # Requesting a out of range number of bytes
 ${vnfPackageOctetStreamId}    octetStreamPkgId
 ${vnfdOctetStreamId}    octetStreamVnfdId
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index aaecf440d..435a94f2e 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -413,7 +413,7 @@ GET Individual VNF Package Content with Range Request
 Check HTTP Response Header Content-Range Is Present and Matches the requested range
     Log    Check Content-Range HTTP Header
     Should Contain    ${response['headers']}    Content-Range
-    Should Be Equal As Strings    ${response['headers']['Content-Range']}    ${range}
+    Should Be Equal As Strings    ${response['headers']['Content-Range']}    ${range}/${full_size}
     Log    Header Content-Range is present
     
 Check HTTP Response Header Content-Length Is Present and Matches the requested range length
diff --git a/SOL005/VNFPackageManagement-API/environment/variables.txt b/SOL005/VNFPackageManagement-API/environment/variables.txt
index 2bd7dd7e9..c09737017 100644
--- a/SOL005/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFPackageManagement-API/environment/variables.txt
@@ -64,6 +64,7 @@ ${artifactPath}    artifactPath
 ${CONTENT_TYPE_OCTET}    application/octet-stream
 ${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
 ${range}          bytes=0-1023
+${full_size}        2000            # Size of the requested artifact to be downloaded via partial downloads 
 ${erroneousRange}    bytes=10000000-1000000000    # Requesting a out of range number of bytes
 ${vnfPackageOctetStreamId}    octetStreamPkgId
 ${vnfPkgId}       788106a2-d692-44f3-a86d-384f0ce35e42
-- 
GitLab


From f03618aa1353e5fe8192dd059a8f54cd4ded4d34 Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Wed, 27 Jan 2021 10:52:06 +0100
Subject: [PATCH 269/322] Fix issue: #140

---
 SOL003/VNFPackageManagement-API/VNFPackageContent.robot | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/SOL003/VNFPackageManagement-API/VNFPackageContent.robot b/SOL003/VNFPackageManagement-API/VNFPackageContent.robot
index dc8a2c3b7..a7ed3c023 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageContent.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageContent.robot
@@ -94,7 +94,7 @@ POST Individual VNF Package Content - Method not implemented
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
-    Send POST Request for individual VNF Package
+    Send POST Request for individual VNF Package Content
     Check HTTP Response Status Code Is    405
 
 PUT Individual VNF Package Content - Method not implemented
@@ -106,7 +106,7 @@ PUT Individual VNF Package Content - Method not implemented
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
-    Send PUT Request for individual VNF Package
+    Send PUT Request for individual VNF Package Content
     Check HTTP Response Status Code Is    405
 
 PATCH Individual VNF Package Content - Method not implemented
@@ -118,7 +118,7 @@ PATCH Individual VNF Package Content - Method not implemented
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
-    Send PATCH Request for individual VNF Package
+    Send PATCH Request for individual VNF Package Content
     Check HTTP Response Status Code Is    405
 
 DELETE Individual VNF Package Content - Method not implemented
@@ -130,7 +130,7 @@ DELETE Individual VNF Package Content - Method not implemented
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
-    Send DELETE Request for individual VNF Package
+    Send DELETE Request for individual VNF Package Content
     Check HTTP Response Status Code Is    405
     
 GET Individual OnBoarded VNF Package Content
-- 
GitLab


From 32151b8d953058fb5162f08b6e99e161c23a265c Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Wed, 27 Jan 2021 15:39:33 +0100
Subject: [PATCH 270/322] Fix issue: #136

---
 .../VnfLcmOperationOccurrenceNotification.schema.json       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SOL003/VNFLifecycleManagement-API/schemas/VnfLcmOperationOccurrenceNotification.schema.json b/SOL003/VNFLifecycleManagement-API/schemas/VnfLcmOperationOccurrenceNotification.schema.json
index 85468696c..bf0bfcd30 100644
--- a/SOL003/VNFLifecycleManagement-API/schemas/VnfLcmOperationOccurrenceNotification.schema.json
+++ b/SOL003/VNFLifecycleManagement-API/schemas/VnfLcmOperationOccurrenceNotification.schema.json
@@ -347,11 +347,11 @@
               "type": "string"
             },
             "vnfProvider": {
-              "description": "If present, this attribute signals modifications of the \"vnfProvider\" attribute in \"VnfInstance\". If present, this attribute (which depends on the value of the \"vnfPkgId\" attribute) was modified implicitly following a request to modify the \"vnfPkgId\" attribute, by copying the value of this attribute from the VNFD in the VNF Package identified by the \"vnfPkgId” attribute.\n",
+              "description": "If present, this attribute signals modifications of the \"vnfProvider\" attribute in \"VnfInstance\". If present, this attribute (which depends on the value of the \"vnfPkgId\" attribute) was modified implicitly following a request to modify the \"vnfPkgId\" attribute, by copying the value of this attribute from the VNFD in the VNF Package identified by the \"vnfPkgId\" attribute.\n",
               "type": "string"
             },
             "vnfProductName": {
-              "description": "If present, this attribute signals modifications of the \"vnfProductName\" attribute in \"VnfInstance\". If present, this attribute (which depends on the value of the \"vnfPkgId\" attribute) was modified implicitly following a request to modify the \"vnfPkgId\" attribute, by copying the value of this attribute from the VNFD in the VNF Package identified by the \"vnfPkgId” attribute.\n",
+              "description": "If present, this attribute signals modifications of the \"vnfProductName\" attribute in \"VnfInstance\". If present, this attribute (which depends on the value of the \"vnfPkgId\" attribute) was modified implicitly following a request to modify the \"vnfPkgId\" attribute, by copying the value of this attribute from the VNFD in the VNF Package identified by the \"vnfPkgId\" attribute.\n",
               "type": "string"
             },
             "vnfSoftwareVersion": {
@@ -565,4 +565,4 @@
           }
         }
       }
-    }
\ No newline at end of file
+    }
-- 
GitLab


From 3aec72e775770edbb234acd867282ad6294fff99 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Thu, 28 Jan 2021 12:45:48 +0100
Subject: [PATCH 271/322] fixed issue #135 for v2.7.1

---
 .../CancelOperationTask.robot                 |  10 +-
 .../ChangeVNFFlavourTask.robot                |   4 +-
 .../FailOperationTask.robot                   |   4 +-
 .../HealVNFTask.robot                         |   4 +-
 .../IndividualVNFInstance.robot               |   2 +-
 .../InstantiateVNFTask.robot                  |   2 +-
 .../OperateVNFTask.robot                      |   4 +-
 .../RetryOperationTask.robot                  |   4 +-
 .../RollbackOperationTask.robot               |   4 +-
 .../ScaleVNFTask.robot                        |   4 +-
 .../ScaleVNFToLevelTask.robot                 |   4 +-
 .../TerminateVNFTask.robot                    |   2 +-
 .../VnfLcmMntOperationKeywords.robot          | 202 +++++++++++++++++-
 .../environment/variables.txt                 |  12 +-
 14 files changed, 231 insertions(+), 31 deletions(-)

diff --git a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
index af06dc10c..92461b333 100644
--- a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
@@ -11,7 +11,7 @@ POST Cancel operation task
     [Documentation]    Test ID: 7.3.1.16.1
     ...    Test title: POST Cancel operation task
     ...    Test objective: The POST method initiates cancelling an ongoing VNF lifecycle operation while it is being executed or rolled back, i.e. the "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state.
-    ...    Pre-conditions: the "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state.
+    ...    Pre-conditions: The "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state.
     ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
@@ -24,12 +24,12 @@ POST Cancel operation task Conflict
     [Documentation]    Test ID: 7.3.1.16.2
     ...    Test title: POST Cancel operation task Conflict
     ...    Test objective: The POST method is NOT cancelling an ongoing VNF lifecycle operation due to the fact that the VNF instance resource is not in STARTING, PROCESSING or ROLLING_BACK state
-    ...    Pre-conditions: operation is not in STARTING, PROCESSING or ROLLING_BACK state
+    ...    Pre-conditions: The "VNF LCM operation occurrence" is not in STARTING, PROCESSING or ROLLING_BACK state
     ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Cancel operation task
+    POST Cancel operation task with conflict
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
@@ -37,12 +37,12 @@ POST Cancel operation task Not Found
      [Documentation]    Test ID: 7.3.1.16.3
     ...    Test title: POST Cancel operation task Not Found
     ...    Test objective: The objective is to test that POST method cannot cancel a VNF lifecycle operation because the resource is not found
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Cancel operation task
+    POST Cancel operation task not existing
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails
     
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
index 4c74ec566..93a4003e0 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
@@ -29,7 +29,7 @@ POST Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none  
-    POST Change VNF deployment flavour   
+    POST Change VNF deployment flavour of NOT-INSTANTIATED VNF   
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
   
@@ -42,7 +42,7 @@ POST Change deployment flavour of a vnfInstance Not Found
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none  
-    POST Change VNF deployment flavour  
+    POST Change VNF deployment flavour of not existing VNF 
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails
        
diff --git a/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot b/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
index 89132cbef..3d3cb5877 100644
--- a/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
@@ -30,7 +30,7 @@ Post Fail operation task Conflict (Not-FAILED_TEMP)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none     
-    Post Fail operation
+    Post Fail operation with conflict
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
@@ -43,7 +43,7 @@ Post Fail operation task Not Found
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none  
-    Post Fail operation
+    Post Fail operation not existing
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
diff --git a/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot b/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
index f8858ab0f..ca6daf95b 100644
--- a/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
@@ -29,7 +29,7 @@ POST Heal a vnfInstance Conflict (Not-Instantiated)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Heal VNF
+    POST Heal VNF Not Instantiated
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
     
@@ -42,7 +42,7 @@ POST Heal a vnfInstance Not Found
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Heal VNF
+    POST Heal VNF Not Existing
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails 
     
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index cca0474cb..8a36e6327 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
@@ -109,7 +109,7 @@ DELETE Individual VNFInstance Conflict
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: Resources are not deleted
-    DELETE individual vnfInstance
+    DELETE individual vnfInstance in INSTANTIATED state
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
     Check resource existence
diff --git a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
index 1bba6b87b..5a2275f77 100644
--- a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
@@ -30,7 +30,7 @@ Instantiate a vnfInstance Conflict
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST instantiate individual vnfInstance
+    POST instantiate individual vnfInstance with conflict
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
     
diff --git a/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
index 462955700..2f11f363e 100644
--- a/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
@@ -31,7 +31,7 @@ POST Operate a vnfInstance Conflict (Not-Instantiated)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Operate VNF
+    POST Operate VNF with conflict
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
    
@@ -44,7 +44,7 @@ POST Operate a vnfInstance Not Found
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Operate VNF
+    POST Operate VNF not existing
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails
    
diff --git a/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot b/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
index 63a4f7965..31848724f 100644
--- a/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
@@ -32,7 +32,7 @@ Post Retry operation task Conflict (Not-FAILED_TEMP)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Post Retry operation
+    Post Retry operation with conflict
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
@@ -45,7 +45,7 @@ Post Retry operation task Not Found
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Post Retry operation
+    Post Retry operation not existing
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
diff --git a/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot b/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
index 881342094..11038da13 100644
--- a/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
@@ -31,7 +31,7 @@ POST Rollback operation task Conflict (Not-FAILED_TEMP)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Post Rollback operation
+    Post Rollback operation with conflict
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
@@ -44,7 +44,7 @@ POST Rollback operation task Not Found
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Post Rollback operation
+    Post Rollback operation not existing
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
index e0b40633e..1ce92b0b1 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
@@ -30,7 +30,7 @@ POST Scale a vnfInstance Conflict (Not-Instantiated)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Scale vnfInstance  
+    POST Scale vnfInstance with VNF NOT-INSTANTIATED 
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
     
@@ -43,7 +43,7 @@ POST Scale a vnfInstance Not Found
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Scale vnfInstance  
+    POST Scale vnfInstance with not existing VNF
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails 
    
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
index 7c483b568..0b9f1c50d 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
@@ -29,7 +29,7 @@ POST Scale a vnfInstance to level Conflict (Not-Instantiated)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Scale vnfInstance to level   
+    POST Scale vnfInstance to level with VNF NOT-INSTANTIATED 
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
 
@@ -42,7 +42,7 @@ Scale a vnfInstance Not Found
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Scale vnfInstance to level    
+    POST Scale vnfInstance to level with not existing VNF
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails 
    
diff --git a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
index 9df78c58b..98018e193 100644
--- a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
@@ -30,7 +30,7 @@ POST Terminate a vnfInstance Conflict (Not-Instantiated)
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Terminate VNF  
+    POST Terminate VNF in NOT-INSTANTIATED state
     Check HTTP Response Status Code Is    202
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index 39ff4a627..3323c1132 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -254,6 +254,24 @@ POST Cancel operation task
     Log    Validate Status code
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
+	
+POST Cancel operation task with conflict
+    Log    Cancel an ongoing VNF lifecycle operation
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Cancel a VNF lifecycle operation
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccIdNotStartingProcessingRollingback}/cancel    ${CancelMode}
+    Log    Validate Status code
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	
+POST Cancel operation task not existing
+    Log    Cancel an ongoing VNF lifecycle operation
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Cancel a VNF lifecycle operation
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${notExistingVnfLcmOpOccId}/cancel    ${CancelMode}
+    Log    Validate Status code
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
     
 GET Cancel operation task
     log    Trying to perform a GET. This method should not be implemented
@@ -331,7 +349,29 @@ POST Change VNF deployment flavour
     ${body}=        Format String   ${template}     newFlavourId=${Flavour_ID}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_flavour    ${body} 
     ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}	 
+	Set Global Variable    ${response}    ${outputResponse}
+
+POST Change VNF deployment flavour of NOT-INSTANTIATED VNF
+    Log    Trying to change the deployment flavour of a VNF instance.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template}=    Get File    jsons/changeVnfFlavourRequest.json
+    ${body}=        Format String   ${template}     newFlavourId=${newFlavourId}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notInstantiatedVnfInstanceId}/change_flavour    ${body} 
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+
+POST Change VNF deployment flavour of not existing VNF
+    Log    Trying to change the deployment flavour of a VNF instance.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template}=    Get File    jsons/changeVnfFlavourRequest.json
+    ${body}=        Format String   ${template}     newFlavourId=${newFlavourId}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notExistingVnfInstanceId}/change_flavour    ${body} 
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
 
 GET Change VNF deployment flavour
     log    Trying to perform a GET. This method should not be implemented
@@ -511,6 +551,12 @@ DELETE individual vnfInstance
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
+DELETE individual vnfInstance in INSTANTIATED state
+    log    Trying to delete an individual VNF instance
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${instantiatedVnfInstanceId}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
 POST instantiate individual vnfInstance	
     Log    Trying to Instantiate a vnf Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
@@ -521,6 +567,16 @@ POST instantiate individual vnfInstance
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 	
+POST instantiate individual vnfInstance with conflict
+    Log    Trying to Instantiate a vnf Instance
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${body}=    Get File    jsons/instantiateVnfRequest.json
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${instantiatedVnfInstanceId}/instantiate    ${body}	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 	
+	
 GET instantiate individual vnfInstance
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
@@ -558,6 +614,26 @@ POST Scale vnfInstance
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
+POST Scale vnfInstance with VNF NOT-INSTANTIATED
+    Log    Trying to Instantiate a vnf Instance
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template}=    Get File    jsons/scaleVnfRequest.json
+    ${body}=        Format String   ${template}     scaletype=${scaletype}    scaleAspectId=${scaleAspectId}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notInstantiatedVnfInstanceId}/scale    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+POST Scale vnfInstance with not existing VNF
+    Log    Trying to Instantiate a vnf Instance
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template}=    Get File    jsons/scaleVnfRequest.json
+    ${body}=        Format String   ${template}     scaletype=${scaletype}    scaleAspectId=${scaleAspectId}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notExistingVnfInstanceId}/scale    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}   
 GET Scale vnfInstance				
     Log    Trying to get a scale a vnf Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
@@ -604,6 +680,26 @@ POST Scale vnfInstance to level
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
+POST Scale vnfInstance to level with VNF NOT-INSTANTIATED
+    Log    Trying to scale a vnf Instance to level
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template}=    Get File    jsons/scaleVnfToLevelRequest.json
+    ${body}=        Format String   ${template}     instantiationLevelId=${instantiationLevelId}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notInstantiatedVnfInstanceId}/scale_to_level    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+POST Scale vnfInstance to level with not existing VNF
+    Log    Trying to scale a vnf Instance to level
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template}=    Get File    jsons/scaleVnfToLevelRequest.json
+    ${body}=        Format String   ${template}     instantiationLevelId=${instantiationLevelId}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notExistingVnfInstanceId}/scale_to_level    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
 GET Scale vnfInstance to level
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
@@ -640,6 +736,17 @@ POST Terminate VNF
     ${template}=    Get File    jsons/terminateVnfRequest.json
     ${body}=        Format String   ${template}     terminationType=${terminationType}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/terminate    ${body}	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+
+POST Terminate VNF in NOT-INSTANTIATED state
+    Log    Trying to terminate a VNF instance.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template}=    Get File    jsons/terminateVnfRequest.json
+    ${body}=        Format String   ${template}     terminationType=${terminationType}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notInstantiatedVnfInstanceId}/terminate    ${body}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
@@ -681,6 +788,28 @@ POST Heal VNF
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/heal    ${body}		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
+	
+POST Heal VNF Not Instantiated
+    Log    Trying to heal a VNF instance.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template}=    Get File    jsons/healVnfRequest.json
+    ${body}=        Format String   ${template}     healingCause=${healingCause}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notInstantiatedVnfInstanceId}/heal    ${body}		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+	
+POST Heal VNF Not Existing
+    Log    Trying to heal a VNF instance.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template}=    Get File    jsons/healVnfRequest.json
+    ${body}=        Format String   ${template}     healingCause=${healingCause}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notExistingVnfInstanceId}/heal    ${body}		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
 
 GET Heal VNF
     log    Trying to perform a GET. This method should not be implemented
@@ -720,6 +849,28 @@ POST Operate VNF
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/operate    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
+	
+POST Operate VNF with conflict
+    Log    Trying to operate a VNF instance.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template}=    Get File    jsons/operateVnfRequest.json
+    ${body}=        Format String   ${template}     changeStateTo=${changeStateTo}    stopType=${stopType}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notInstantiatedVnfInstanceId}/operate    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+    
+POST Operate VNF not existing
+    Log    Trying to operate a VNF instance.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    ${template}=    Get File    jsons/operateVnfRequest.json
+    ${body}=        Format String   ${template}     changeStateTo=${changeStateTo}    stopType=${stopType}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notExistingVnfInstanceId}/operate    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
 
 GET Operate VNF
     log    Trying to perform a GET. This method should not be implemented
@@ -876,7 +1027,21 @@ Post Retry operation
     Log    Execute Query and validate response
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
     ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}	    
+	Set Global Variable    ${response}    ${outputResponse}	 
+Post Retry operation with conflict
+    Log    Retry a VNF lifecycle operation if that operation has experienced a temporary failure
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Execute Query and validate response
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccIdNotFailedTemp}/retry	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+Post Retry operation not existing
+    Log    Retry a VNF lifecycle operation if that operation has experienced a temporary failure
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Execute Query and validate response
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${notExistingVnfLcmOpOccId}/retry	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}   
 Get Retry operation	
     Log    Trying to perform a GET. This method should not be implemented.
     Set Headers  {"Accept":"${ACCEPT}"}  
@@ -911,6 +1076,20 @@ Post Rollback operation
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+Post Rollback operation with conflict
+    Log    Rollback a VNF lifecycle operation if that operation has experienced a temporary failure
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Execute Query and validate response
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccIdNotFailedTemp}/rollback
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+Post Rollback operation not existing
+    Log    Rollback a VNF lifecycle operation if that operation has experienced a temporary failure
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Execute Query and validate response
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${notExistingVnfLcmOpOccId}/rollback
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	    
 Get Rollback operation	
@@ -949,6 +1128,23 @@ Post Fail operation
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	    
+	
+Post Fail operation with conflict
+    Log    mark as Failed a VNF lifecycle operation if that operation has experienced a temporary failure
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Execute Query and validate response
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccIdNotFailedTemp}/fail
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	    
+	
+Post Fail operation not existing
+    Log    mark as Failed a VNF lifecycle operation if that operation has experienced a temporary failure
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Execute Query and validate response
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${notExistingvnfLcmOpOccId}/fail
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	    
+	
 Get Fail operation	
     Log    Trying to perform a GET. This method should not be implemented.
     Set Headers  {"Accept":"${ACCEPT}"}  
@@ -1346,4 +1542,4 @@ Match the VNF LCM Operation Occurence Response Attributes with Descriptors
     List Should Contain value    ${Storage_IDs}    ${response['body']['resourceChanges']['affectedVirtualStorages'][0]['virtualStorageDescId']}
     List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['resourceChanges']['affectedVirtualLinks'][0]['virtualStorageDescId']}
     
-    
\ No newline at end of file
+    
diff --git a/SOL003/VNFLifecycleManagement-API/environment/variables.txt b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
index 9d110b13a..51e5bc7c9 100644
--- a/SOL003/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
@@ -28,12 +28,18 @@ ${ARTIFACT_ID}    artifactId
 ${WRONG_ACCEPT}    application/json
 ${SYNC_MODE}    0
 
-
+${instantiatedVnfInstanceId}       6fc3539c-e602-4afa-8e13-962fb5a7d81f
+${notInstantiatedVnfInstanceId}       6fc3539c-e602-4afa-8e13-962fb5a7d81f
+${notExistingVnfInstanceId}     6fc3539c-e602-4afa-8e13-962fb5a7d81f   
 ${vnfInstanceId}       6fc3539c-e602-4afa-8e13-962fb5a7d81f
 ${subscriptionId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
-${vnfLcmOpOccId}    6fc3539c-e602-4afa-8e13-962fb5a7d81d
 ${conflicVnfInstanceId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
 
+${vnfLcmOpOccId}    6fc3539c-e602-4afa-8e13-962fb5a7d81d
+${notExistingVnfLcmOpOccId}    6fc3539c-e602-4afa-8e13-962fb5a7d81d
+${vnfLcmOpOccIdNotStartingProcessingRollingback}    6fc3539c-e602-4afa-8e13-962fb5a7d81d
+${vnfLcmOpOccIdNotFailedTemp}    6fc3539c-e602-4afa-8e13-962fb5a7d81d
+
 ${VnfLcmOperationOccurrenceNotification}    {}
 ${VnfIdentifierCreationNotification}    {}
 ${VnfIdentifierDeletionNotification}    {}
@@ -44,8 +50,6 @@ ${requestedFlavour}    test
 ${sub_filter}    filter
 ${sub_filter_invalid}    filter_invalid
 
-${notInstantiatedVnfInstanceId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
-
 ${fields}         criteria,objectInstanceIds
 
 ${vnfInstanceName}    Test-VnfInstance
-- 
GitLab


From 5554547c90153a0e56e3fef3e13c001562d84b21 Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Thu, 28 Jan 2021 16:25:40 +0100
Subject: [PATCH 272/322] Fix issue: #142

---
 SOL003/VNFFaultManagement-API/Alarms.robot | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/SOL003/VNFFaultManagement-API/Alarms.robot b/SOL003/VNFFaultManagement-API/Alarms.robot
index 69001f407..c0dd85276 100644
--- a/SOL003/VNFFaultManagement-API/Alarms.robot
+++ b/SOL003/VNFFaultManagement-API/Alarms.robot
@@ -70,7 +70,7 @@ GET information about multiple alarms with "all_fields" attribute selector
     ...    Post-Conditions: none
     GET Alarms Task with all_fields attribute selector
     Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    alarms
+    Check HTTP Response Body Json Schema Is    Alarms
     
 GET information about multiple alarms with exclude_default attribute selector
     [Documentation]    Test ID: 7.3.5.1.6
@@ -83,7 +83,7 @@ GET information about multiple alarms with exclude_default attribute selector
     ...    Post-Conditions: none
     GET Alarms Task with exclude_default attribute selector
     Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    alarms
+    Check HTTP Response Body Json Schema Is    Alarms
     
 GET information about multiple alarms with fields attribute selector
     [Documentation]    Test ID: 7.3.5.1.7
@@ -96,7 +96,7 @@ GET information about multiple alarms with fields attribute selector
     ...    Post-Conditions: none
     GET Alarms Task with fields attribute selector
     Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    alarms
+    Check HTTP Response Body Json Schema Is    Alarms
      
 GET information about multiple alarms with "exclude_fields" attribute selector
     [Documentation]    Test ID: 7.3.5.1.8
@@ -109,7 +109,7 @@ GET information about multiple alarms with "exclude_fields" attribute selector
     ...    Post-Conditions: none
     GET Alarms Task with exclude_fields attribute selector
     Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    alarms 
+    Check HTTP Response Body Json Schema Is    Alarms 
     
 PUT Alarms - Method not implemented
     [Documentation]    Test ID: 7.3.5.1.9
-- 
GitLab


From 83ca2d4a1dd15539e2eae87c03e226052a8f9d62 Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Mon, 1 Feb 2021 17:48:46 +0100
Subject: [PATCH 273/322] Fix issue #145

---
 .../VNFPackageManagement-API/VNFPackageManagementKeywords.robot | 2 +-
 SOL003/VNFPackageManagement-API/environment/variables.txt       | 1 +
 .../VNFPackageManagement-API/VNFPackageManagementKeywords.robot | 2 +-
 SOL005/VNFPackageManagement-API/environment/variables.txt       | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 04def23c7..a3fdc256e 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -276,7 +276,7 @@ GET Individual VNF Package Content with Range Request
 Check HTTP Response Header Content-Range Is Present and Matches the requested range
     Log    Check Content-Range HTTP Header
     Should Contain    ${response['headers']}    Content-Range
-    Should Be Equal As Strings    ${response['headers']['Content-Range']}    ${range}
+    Should Be Equal As Strings    ${response['headers']['Content-Range']}    ${range}/${full_size}
     Log    Header Content-Range is present
     
 Check HTTP Response Header Content-Length Is Present and Matches the requested range length
diff --git a/SOL003/VNFPackageManagement-API/environment/variables.txt b/SOL003/VNFPackageManagement-API/environment/variables.txt
index b5779a0e8..d35a4bae6 100644
--- a/SOL003/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL003/VNFPackageManagement-API/environment/variables.txt
@@ -73,6 +73,7 @@ ${artifactPath}    artifactPath
 ${CONTENT_TYPE_OCTET}    application/octet-stream
 ${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
 ${range}          bytes=0-1023
+${full_size}        2000            # Size of the requested artifact to be downloaded via partial downloads
 ${erroneousRange}    bytes=10000000-1000000000    # Requesting a out of range number of bytes
 ${vnfPackageOctetStreamId}    octetStreamPkgId
 ${vnfdOctetStreamId}    octetStreamVnfdId
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index f9277de2d..2b47c3873 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -461,7 +461,7 @@ GET Individual VNF Package Content with Range Request
 Check HTTP Response Header Content-Range Is Present and Matches the requested range
     Log    Check Content-Range HTTP Header
     Should Contain    ${response['headers']}    Content-Range
-    Should Be Equal As Strings    ${response['headers']['Content-Range']}    ${range}
+    Should Be Equal As Strings    ${response['headers']['Content-Range']}    ${range}/${full_size}
     Log    Header Content-Range is present
     
 Check HTTP Response Header Content-Length Is Present and Matches the requested range length
diff --git a/SOL005/VNFPackageManagement-API/environment/variables.txt b/SOL005/VNFPackageManagement-API/environment/variables.txt
index 926a45ae2..9f677fc5d 100644
--- a/SOL005/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFPackageManagement-API/environment/variables.txt
@@ -64,6 +64,7 @@ ${artifactPath}    artifactPath
 ${CONTENT_TYPE_OCTET}    application/octet-stream
 ${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
 ${range}          bytes=0-1023
+${full_size}        2000            # Size of the requested artifact to be downloaded via partial downloads 
 ${erroneousRange}    bytes=10000000-1000000000    # Requesting a out of range number of bytes
 ${vnfPackageOctetStreamId}    octetStreamPkgId
 ${vnfPkgId}       788106a2-d692-44f3-a86d-384f0ce35e42
-- 
GitLab


From 9709b1d7f11af4aadb6f68bd8a0665f93e574567 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Fri, 5 Feb 2021 11:36:13 +0100
Subject: [PATCH 274/322] fix issue #148 in v2.7.1

---
 .../jsons/CreateNsRequest.json                |  4 +--
 .../jsons/InstantiateNsRequest.json           |  6 ++--
 .../jsons/ScaleNsRequest.json                 | 31 +---------------
 .../jsons/UpdateNsRequest.json                | 35 ++++++++++---------
 4 files changed, 24 insertions(+), 52 deletions(-)

diff --git a/SOL005/NSLifecycleManagement-API/jsons/CreateNsRequest.json b/SOL005/NSLifecycleManagement-API/jsons/CreateNsRequest.json
index a8026a810..236708671 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/CreateNsRequest.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/CreateNsRequest.json
@@ -1,6 +1,6 @@
-{{
+{
 	"nsdId": "{nsdId}",
 	"nsName": "{nsInstanceName}",
 	"vimAccountId": "{vimAccountId}",
 	"nsDescription": "{nsInstanceDescription}"
-}}
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/jsons/InstantiateNsRequest.json b/SOL005/NSLifecycleManagement-API/jsons/InstantiateNsRequest.json
index 5d0c060fa..b89a44d19 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/InstantiateNsRequest.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/InstantiateNsRequest.json
@@ -1,5 +1,5 @@
-{{
-	"nsFlavourId": "floavour_id",
+{
+	"nsFlavourId": "flavour_id",
 	"sapData":[
 		"{sapdId}"
 	],
@@ -10,4 +10,4 @@
 	"additionalParamsForNs":{},
 	"additionalParamForNestedNs":[],
 	"additionalParamsForVnf":[]
-}}
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/jsons/ScaleNsRequest.json b/SOL005/NSLifecycleManagement-API/jsons/ScaleNsRequest.json
index f9a87c851..12204fe2b 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/ScaleNsRequest.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/ScaleNsRequest.json
@@ -1,32 +1,3 @@
 {
-	"description": "This type represents a request for the scale NS operation.\n",
-	"type": "object",
-	"required": [
-		"scaleType"
-	],
-	"properties": {
-		"scaleType": {
-			"description": "Indicates the type of scaling to be performed. Possible values: - SCALE_NS - SCALE_VNF\n",
-			"type": "string",
-			"enum": [
-				"SCALE_NS",
-				"SCALE_VNF"
-			]
-		},
-		"scaleNsData": {
-			"description": "The necessary information to scale the referenced NS instance. It shall be present when scaleType = SCALE_NS.\n",
-			"$ref": "#/definitions/ScaleNsData"
-		},
-		"scaleVnfData": {
-			"description": "The necessary information to scale the referenced NS instance. It shall be present when scaleType = SCALE_VNF.\n",
-			"type": "array",
-			"items": {
-				"$ref": "#/definitions/ScaleVnfData"
-			}
-		},
-		"scaleTime": {
-			"description": "Timestamp indicating the scale time of the NS, i.e. the NS will be scaled at this timestamp. Cardinality \"0\" indicates the NS scaling takes place immediately\".\n",
-			"$ref": "SOL005_def.yaml#/definitions/DateTime"
-		}
-	}
+	"scaleType": "SCALE_NS"
 }
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/jsons/UpdateNsRequest.json b/SOL005/NSLifecycleManagement-API/jsons/UpdateNsRequest.json
index da42b41c1..4d3449103 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/UpdateNsRequest.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/UpdateNsRequest.json
@@ -1,21 +1,22 @@
-{{
+{
 	"updateType": "{vnfUpdateType}",
-	"instantiateVnfData": {{
+	"instantiateVnfData": {
 		"vnfdId": "{vnfdId}",
 		"vnfFlavourId": "{vnfFlavourId}",
-		"vnfInstantiationLevelId": "{vnfInstantiationLevelId}"
-		"extManagedVirtualLinks": {{
+		"vnfInstantiationLevelId": "{vnfInstantiationLevelId}",
+		"extManagedVirtualLinks": {
 			"vnfVirtualLinkDescId": "{vnfVirtualLinkDescId}"
-	}},
-	"changeVnfFlavourData": {{
-		"vnfInstanceId": {},
-		"newFlavourId": "{newFlavourId}",
-		"instantiationLevelId": "{instantiationLevelId}"
-	}},
-	"assocNewNsdVersionData": {{
-		"newNsdId": "{newNsdId}"
-	}}
-	"addSap": {{
-		"sapdId": "{sapdId}"
-	}}
-}}
\ No newline at end of file
+		},
+		"changeVnfFlavourData": {
+			"vnfInstanceId": {},
+			"newFlavourId": "{newFlavourId}",
+			"instantiationLevelId": "{instantiationLevelId}"
+		},
+		"assocNewNsdVersionData": {
+			"newNsdId": "{newNsdId}"
+		},
+		"addSap": {
+			"sapdId": "{sapdId}"
+		}
+	}
+}
-- 
GitLab


From c850ccaba6145b0a0a989900a489bdaf5569f5e0 Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Mon, 8 Feb 2021 14:36:45 +0100
Subject: [PATCH 275/322] Fix issue #151

---
 .../VNFPackageManagement-API/VNFPackageContent.robot   |  2 +-
 .../VNFPackageManagementKeywords.robot                 | 10 ++++++++++
 .../VNFPackageManagement-API/VNFPackageContent.robot   |  2 +-
 .../VNFPackageManagementKeywords.robot                 | 10 ++++++++++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/SOL003/VNFPackageManagement-API/VNFPackageContent.robot b/SOL003/VNFPackageManagement-API/VNFPackageContent.robot
index a7ed3c023..ded06fca3 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageContent.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageContent.robot
@@ -43,7 +43,7 @@ GET Individual VNF Package Content with Range Request and NFVO not supporting Ra
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO does not support range requests to return single range of bytes from the VNF package file
     ...    Post-Conditions: none    
-    GET Individual VNF Package Content with Range Request
+    GET Individual VNF Package Content with explicit Range Request
     Check HTTP Response Status Code Is    200
     Check HTTP Response Header Content-Type Is    application/zip    
 
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index a3fdc256e..162315d2d 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -272,6 +272,16 @@ GET Individual VNF Package Content with Range Request
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
+    
+GET Individual VNF Package Content with explicit Range Request
+    Log    Trying to get a VNF Package Content using RANGE using an NFVO that can handle it
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Set Headers    {"Range": "${range}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
 
 Check HTTP Response Header Content-Range Is Present and Matches the requested range
     Log    Check Content-Range HTTP Header
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageContent.robot b/SOL005/VNFPackageManagement-API/VNFPackageContent.robot
index 1b0c58d4f..57401ae3c 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageContent.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageContent.robot
@@ -44,7 +44,7 @@ GET Individual VNF Package Content with Range Request and NFVO not supporting Ra
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO does not support range requests to return single range of bytes from the VNF package file
     ...    Post-Conditions: none    
-    GET Individual VNF Package Content with Range Request
+    GET Individual VNF Package Content with explicit Range Request
     Check HTTP Response Status Code Is    200
     Check HTTP Response Header Content-Type Is    application/zip    
 
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 2b47c3873..aab633fa7 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -458,6 +458,16 @@ GET Individual VNF Package Content with Range Request
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
+GET Individual VNF Package Content with explicit Range Request
+    Log    Trying to get a VNF Package Content using RANGE using an NFVO that can handle it
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Set Headers    {"Range": "${range}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+
 Check HTTP Response Header Content-Range Is Present and Matches the requested range
     Log    Check Content-Range HTTP Header
     Should Contain    ${response['headers']}    Content-Range
-- 
GitLab


From ee14a2a4194e6384e70798193e0c06a79ceb8139 Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Mon, 8 Feb 2021 17:20:01 +0100
Subject: [PATCH 276/322] Fix issue #94

---
 SOL005/NSDManagement-API/environment/variables.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SOL005/NSDManagement-API/environment/variables.txt b/SOL005/NSDManagement-API/environment/variables.txt
index b1441c67c..27bf687ad 100644
--- a/SOL005/NSDManagement-API/environment/variables.txt
+++ b/SOL005/NSDManagement-API/environment/variables.txt
@@ -44,7 +44,7 @@ ${newSubscriptionId}    newSubsciptionId
 ${origResponse}    httpresponse
 
 
-${POS_FIELDS}     name=nsdOnboardingState
+${POS_FIELDS}     nsdOnboardingState=ONBOARDED
 ${NEG_FIELDS}     wrongName=any_value
 ${nsdInfoId}    5a569e1d-4ffe-4e9a-8cf6-c24226651e56
 ${nsdInfoIdPlain}    5a569e1d-4ffe-4e9a-8cf6-c24226651e56
-- 
GitLab


From a2f7d9f9f3efeeda5694caccce78e55d1e13bc6e Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Tue, 9 Feb 2021 09:40:30 +0100
Subject: [PATCH 277/322] Fix issue #98

---
 ...IdentifierCreationNotification.schema.json | 87 +++++++++++++++++++
 ...IdentifierDeletionNotification.schema.json | 87 +++++++++++++++++++
 2 files changed, 174 insertions(+)

diff --git a/SOL002/VNFLifecycleManagement-API/schemas/VnfIdentifierCreationNotification.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/VnfIdentifierCreationNotification.schema.json
index e69de29bb..ad05e0209 100644
--- a/SOL002/VNFLifecycleManagement-API/schemas/VnfIdentifierCreationNotification.schema.json
+++ b/SOL002/VNFLifecycleManagement-API/schemas/VnfIdentifierCreationNotification.schema.json
@@ -0,0 +1,87 @@
+{
+  "description": "This type represents a VNF identifier creation notification, which informs the receiver of the creation of a new \"Individual VNF instance\" resource and the associated VNF instance identifier. This notification shall be triggered by the VNFM when it has created an \"Individual VNF instance\" resource and the associated VNF instance identifier.\n",
+  "type": "object",
+  "required": [
+    "id",
+    "notificationType",
+    "subscriptionId",
+    "timeStamp",
+    "vnfInstanceId",
+    "_links"
+  ],
+  "properties": {
+    "id": {
+      "description": "An identifier with the intention of being globally unique.\n",
+      "type": "string"
+    },
+    "notificationType": {
+      "description": "Discriminator for the different notification types. Shall be set to \"VnfIdentifierCreationNotification\" for this notification type.\n",
+      "type": "string",
+      "enum": [
+        "VnfIdentifierCreationNotification"
+      ]
+    },
+    "subscriptionId": {
+      "description": "An identifier with the intention of being globally unique.\n",
+      "type": "string"
+    },
+    "timeStamp": {
+      "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+      "type": "string",
+      "format": "date-time"
+    },
+    "vnfInstanceId": {
+      "description": "An identifier with the intention of being globally unique.\n",
+      "type": "string"
+    },
+    "_links": {
+      "description": "This type represents the links to resources that a notification can contain.\n",
+      "type": "object",
+      "required": [
+        "vnfInstance",
+        "subscription"
+      ],
+      "properties": {
+        "vnfInstance": {
+          "description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
+            }
+          }
+        },
+        "subscription": {
+          "description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
+            }
+          }
+        },
+        "vnfLcmOpOcc": {
+          "description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
+            }
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/schemas/VnfIdentifierDeletionNotification.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/VnfIdentifierDeletionNotification.schema.json
index e69de29bb..253ccce96 100644
--- a/SOL002/VNFLifecycleManagement-API/schemas/VnfIdentifierDeletionNotification.schema.json
+++ b/SOL002/VNFLifecycleManagement-API/schemas/VnfIdentifierDeletionNotification.schema.json
@@ -0,0 +1,87 @@
+{
+      "description": "This type represents a VNF identifier deletion notification, which informs the receiver of the deletion of a new \"Individual VNF instance\" resource and the associated VNF instance identifier. This notification shall be triggered by the VNFM when it has deleted an \"Individual VNF instance\" resource and the associated VNF instance identifier.\n",
+      "type": "object",
+      "required": [
+        "id",
+        "notificationType",
+        "subscriptionId",
+        "timeStamp",
+        "vnfInstanceId",
+        "_links"
+      ],
+      "properties": {
+        "id": {
+          "description": "An identifier with the intention of being globally unique.\n",
+          "type": "string"
+        },
+        "notificationType": {
+          "description": "Discriminator for the different notification types. Shall be set to \"VnfIdentifierDeletionNotification\" for this notification type.\n",
+          "type": "string",
+          "enum": [
+            "VnfIdentifierDeletionNotification"
+          ]
+        },
+        "subscriptionId": {
+          "description": "An identifier with the intention of being globally unique.\n",
+          "type": "string"
+        },
+        "timeStamp": {
+          "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+          "type": "string",
+          "format": "date-time"
+        },
+        "vnfInstanceId": {
+          "description": "An identifier with the intention of being globally unique.\n",
+          "type": "string"
+        },
+        "_links": {
+          "description": "This type represents the links to resources that a notification can contain.\n",
+          "type": "object",
+          "required": [
+            "vnfInstance",
+            "subscription"
+          ],
+          "properties": {
+            "vnfInstance": {
+              "description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
+              "type": "object",
+              "required": [
+                "href"
+              ],
+              "properties": {
+                "href": {
+                  "description": "String formatted according to IETF RFC 3986.\n",
+                  "type": "string"
+                }
+              }
+            },
+            "subscription": {
+              "description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
+              "type": "object",
+              "required": [
+                "href"
+              ],
+              "properties": {
+                "href": {
+                  "description": "String formatted according to IETF RFC 3986.\n",
+                  "type": "string"
+                }
+              }
+            },
+            "vnfLcmOpOcc": {
+              "description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
+              "type": "object",
+              "required": [
+                "href"
+              ],
+              "properties": {
+                "href": {
+                  "description": "String formatted according to IETF RFC 3986.\n",
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
\ No newline at end of file
-- 
GitLab


From cd760d552a4c63a99267c6e60cc5f619ac6a9951 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Wed, 10 Feb 2021 19:19:54 +0100
Subject: [PATCH 278/322] aligned vnfPackage.zip filename in VNF Package
 Management

---
 .../VNFPackageManagementKeywords.robot                        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index aab633fa7..7cf7edbb5 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -525,7 +525,7 @@ Send PUT Request for individual VNF Package Content
 Send PUT Request to upload VNF Package Content
     Log    Trying to perform a PUT. This method upload the content of a NSD
     Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_ZIP}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
-    ${body}=  Get Binary File     files/hackfest_gateway_vnfd-1.0.tar.gz
+    ${body}=  Get Binary File     files/vnfPackage.zip
     ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${newVnfPackageId}/package_content    data=${body}
     Should Be Empty     ${response.text}
     ${response}=    Create Dictionary   status=${response.status_code}
@@ -542,7 +542,7 @@ Check Postcondition VNF Package Content is uploaded and available in the NFVO
 Send PUT Request to upload VNF Package Content with conflict due to onboarding state
     Log    Trying to perform a PUT. This method upload the content of a NSD
     Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_ZIP}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
-    ${body}=  Get Binary File     files/hackfest_gateway_vnfd-1.0.tar.gz
+    ${body}=  Get Binary File     files/vnfPackage.zip
     ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${creatingVnfPackageId}/package_content    data=${body}
     Should Be Empty     ${response.text}
     ${response}=    Create Dictionary   status=${response.status_code}
-- 
GitLab


From 21fc5ae0bcba8a9f4e43128f30b09086fcb09c2a Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Wed, 10 Feb 2021 19:30:49 +0100
Subject: [PATCH 279/322] fixed pnfd file usage

---
 SOL005/NSDManagement-API/NSDManagementKeywords.robot | 2 +-
 SOL005/NSDManagement-API/environment/variables.txt   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index 9320d4be9..69ba10709 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -701,7 +701,7 @@ Get PNFD Content with conflict due to onboarding state
 Send PUT Request to upload PNFD Content as zip file
     Log    Trying to perform a PUT. This method upload the content of a PNFD
     Create Session      pnfd     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}      headers={"Accept": "${ACCEPT_PLAIN}", "Content-Type": "${ACCEPT_PLAIN}", "Authorization": "${AUTHORIZATION}"}      verify=False
-    ${body}=  Get Binary File  ${contentZipFile}
+    ${body}=  Get Binary File  ${contentFilePnfd}
     ${response}=    Put Request     pnfd     ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content     data=${body}
     Should Be Empty     ${response.text}
     ${response}=    Create Dictionary   status=${response.status_code}
diff --git a/SOL005/NSDManagement-API/environment/variables.txt b/SOL005/NSDManagement-API/environment/variables.txt
index 27bf687ad..e1e647560 100644
--- a/SOL005/NSDManagement-API/environment/variables.txt
+++ b/SOL005/NSDManagement-API/environment/variables.txt
@@ -65,7 +65,6 @@ ${range}          bytes=0-1023
 ${erroneousRange}    bytes=100000-1000000    # Requesting a out of range number of bytes
 ${onboardingStateNsdInfoId}    b992a851-08b1-45a8-9282-a5f7a7df04a6
 ${contentZipFile}    files/nsdContent.zip
-${contentPlainFile}    files/nsdContent.yaml
 ${creatingNsdInfoId}    71241932-994a-46e2-ad6c-1740674dda44
 ${BAD_AUTHORIZATION}    Bear sometoken
 ${original_etag}    1234
-- 
GitLab


From 9b8ec7fe770e67ecad5460b2c6154dc7d9548fde Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Thu, 11 Feb 2021 12:57:36 +0100
Subject: [PATCH 280/322] updated NSD, VNFD, PNFD files and zip management

---
 .../NSDManagement-API/NSDManagementKeywords.robot |  10 +++++-----
 .../NSDManagement-API/environment/variables.txt   |   6 ++++--
 SOL005/NSDManagement-API/files/nsd.yml            |   3 +++
 SOL005/NSDManagement-API/files/nsd.zip            | Bin 0 -> 182 bytes
 SOL005/NSDManagement-API/files/pnfd.yml           |   3 +++
 SOL005/NSDManagement-API/files/pnfd.zip           | Bin 0 -> 187 bytes
 SOL005/NSDManagement-API/files/pnfdContent.zip    | Bin 359 -> 0 bytes
 .../VNFPackageManagementKeywords.robot            |   4 ++--
 .../environment/variables.txt                     |   2 ++
 .../VNFPackageManagement-API/files/vnfPackage.zip | Bin 0 -> 187 bytes
 10 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 SOL005/NSDManagement-API/files/nsd.yml
 create mode 100644 SOL005/NSDManagement-API/files/nsd.zip
 create mode 100644 SOL005/NSDManagement-API/files/pnfd.yml
 create mode 100644 SOL005/NSDManagement-API/files/pnfd.zip
 delete mode 100644 SOL005/NSDManagement-API/files/pnfdContent.zip
 create mode 100644 SOL005/VNFPackageManagement-API/files/vnfPackage.zip

diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index 69ba10709..b07e7dec7 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -373,7 +373,7 @@ GET NSD Content with invalid Range Request
 
 Send PUT Request to upload NSD Content as zip file in asynchronous mode
     Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_JSON}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
-    ${body}=  Get Binary File  ${contentZipFile}
+    ${body}=  Get Binary File  ${contentZipNsd}
     ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content     data=${body}
     Should Be Empty     ${response.text}
     ${response}=    Create Dictionary   status=${response.status_code}
@@ -381,7 +381,7 @@ Send PUT Request to upload NSD Content as zip file in asynchronous mode
 
 Send PUT Request to upload NSD Content as zip file in synchronous mode
     Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_JSON}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
-    ${body}=  Get Binary File  ${contentZipFile}
+    ${body}=  Get Binary File  ${contentZipNsd}
     ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content     data=${body}
     Should Be Empty     ${response.text}
     ${response}=    Create Dictionary   status=${response.status_code}
@@ -405,7 +405,7 @@ Check Postcondition NSD Content is uploaded and available in the NFVO
 Send PUT Request to upload NSD Content with conflict due to onboarding state
     Log    Trying to perform a PUT. This method upload the content of a NSD
     Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_ZIP}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
-    ${body}=  Get Binary File  ${contentZipFile}
+    ${body}=  Get Binary File  ${contentZipNsd}
     ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content     data=${body}
     Log         ${response}
     ${response}=    Create Dictionary   status=${response.status_code}  headers=${response.headers}     body=${response.json()}
@@ -700,8 +700,8 @@ Get PNFD Content with conflict due to onboarding state
 
 Send PUT Request to upload PNFD Content as zip file
     Log    Trying to perform a PUT. This method upload the content of a PNFD
-    Create Session      pnfd     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}      headers={"Accept": "${ACCEPT_PLAIN}", "Content-Type": "${ACCEPT_PLAIN}", "Authorization": "${AUTHORIZATION}"}      verify=False
-    ${body}=  Get Binary File  ${contentFilePnfd}
+    Create Session      pnfd     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}      headers={"Accept": "${ACCEPT_PLAIN}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
+    ${body}=  Get Binary File  ${contentZipPnfd}
     ${response}=    Put Request     pnfd     ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content     data=${body}
     Should Be Empty     ${response.text}
     ${response}=    Create Dictionary   status=${response.status_code}
diff --git a/SOL005/NSDManagement-API/environment/variables.txt b/SOL005/NSDManagement-API/environment/variables.txt
index e1e647560..01738ff5d 100644
--- a/SOL005/NSDManagement-API/environment/variables.txt
+++ b/SOL005/NSDManagement-API/environment/variables.txt
@@ -64,7 +64,8 @@ ${NFVO_RANGE_OK}    1
 ${range}          bytes=0-1023
 ${erroneousRange}    bytes=100000-1000000    # Requesting a out of range number of bytes
 ${onboardingStateNsdInfoId}    b992a851-08b1-45a8-9282-a5f7a7df04a6
-${contentZipFile}    files/nsdContent.zip
+${contentZipNsd}    files/nsd.zip
+${contentFileNsd}    files/nsd.zip
 ${creatingNsdInfoId}    71241932-994a-46e2-ad6c-1740674dda44
 ${BAD_AUTHORIZATION}    Bear sometoken
 ${original_etag}    1234
@@ -82,7 +83,8 @@ ${erroneous_pnfdInfoId}  erroneous_pnfdInfoId
 ${enabledPnfdInfoId}  40853bda-8a8f-4f63-9130-cef439f65348
 ${erroneous_pnfdId}    erroneousPnfdId
 ${onboardingStatePnfdId}    8ed2bf1f-f6ae-4d18-b478-bfab02fd4cd2
-${contentFilePnfd}    files/pnfdContent.zip
+${contentZipPnfd}    files/pnfd.zip
+${contentFilePnfd}    files/pnfd.yml
 ${creatingPnfdId}    2e4ce0ef-3ea8-49f9-92dd-8771866015bb
 ${userDefinedDataSet}    some
 
diff --git a/SOL005/NSDManagement-API/files/nsd.yml b/SOL005/NSDManagement-API/files/nsd.yml
new file mode 100644
index 000000000..8cddb97b8
--- /dev/null
+++ b/SOL005/NSDManagement-API/files/nsd.yml
@@ -0,0 +1,3 @@
+nsd:
+-id: nsd_id
+-name: nsd_name
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/files/nsd.zip b/SOL005/NSDManagement-API/files/nsd.zip
new file mode 100644
index 0000000000000000000000000000000000000000..3da59324d05257bf196313ef7c3fddcb70eebdd8
GIT binary patch
literal 182
zcmWIWW@h1H0D-Bg-a+PNYigB%Y!GG#;=JM%y~^AiAZ5kNrJI>zr2u5cXQlu-d5O8H
z5H5%n;LXTn&w$Gy6`)Zdpa3S}#&SUg7#SoOzU_SAk<D<O5k{YSeGbeI@MdKL>0$)J
KNFePFHUa=jXD5CD

literal 0
HcmV?d00001

diff --git a/SOL005/NSDManagement-API/files/pnfd.yml b/SOL005/NSDManagement-API/files/pnfd.yml
new file mode 100644
index 000000000..faeeb5256
--- /dev/null
+++ b/SOL005/NSDManagement-API/files/pnfd.yml
@@ -0,0 +1,3 @@
+pnfd:
+-id: pnfd_id
+-name: pnfd_name
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/files/pnfd.zip b/SOL005/NSDManagement-API/files/pnfd.zip
new file mode 100644
index 0000000000000000000000000000000000000000..b7c575541e64bd2f2b3d9fa979c7e6ef4d877139
GIT binary patch
literal 187
zcmWIWW@h1H0D(2B-a-51O)6A@Y!K!E;)1-i6urva91v~A%cYx{Vx<6L$7iMhd3lMs
zsZc(M8Q{&xWY2)hFcqM2AfNyy5k_-CMHm?*7}j+%C1o>QXN1xHo(91net<VC8%P@?
L5JmxMZ?G8vy~-sl

literal 0
HcmV?d00001

diff --git a/SOL005/NSDManagement-API/files/pnfdContent.zip b/SOL005/NSDManagement-API/files/pnfdContent.zip
deleted file mode 100644
index 16151601c098de41c91ba4301540a3bfb355cbdb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 359
zcmV-t0hs<DiwFpY4fb9F|803rQ$#L#VQp+KbYXG;?b1O@!!Q^I;GXv@a@#30WwpcJ
zbb1ix6oy_zMs2ehY?6{>bM@Dobln&e6b}l*`#>A|eo2#lR5sJu<%taUL6gfW`UT8O
zlcXKJ<B_Fo6ve}Ibega<Wog9X;fN&>VbLF0S(h6^BBQnYYTkGC<B$6%lr1xV(IR(w
zrI%TckP!KSl0qx%gj;dt=vpn>G~|-YXKq47g(~?bBXL_HB+R0sq=qjtBAW-bXbUB`
zg%PzAT7}sEYx_u>c7`asLi?n0$q%3Hi#CoPr)#cCZ8CB@yCGvOYi+sd3dXiu_2U8S
zZ=-5|`mmL<^K~^pdmnDPgUhA#8*ulg&8uJM%!>EB(stWVD_m3i_-b-K-F>@|yEk-4
zy}Q4dT#pZ1<2$N&5&A%DEqq(sMm;|DA^-pY000000000000000004lW`T+B0f0zI$
F007z4rv?B3

diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 7cf7edbb5..9473c3fbf 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -525,7 +525,7 @@ Send PUT Request for individual VNF Package Content
 Send PUT Request to upload VNF Package Content
     Log    Trying to perform a PUT. This method upload the content of a NSD
     Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_ZIP}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
-    ${body}=  Get Binary File     files/vnfPackage.zip
+    ${body}=  Get Binary File     ${contentZipVnfPackage}
     ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${newVnfPackageId}/package_content    data=${body}
     Should Be Empty     ${response.text}
     ${response}=    Create Dictionary   status=${response.status_code}
@@ -542,7 +542,7 @@ Check Postcondition VNF Package Content is uploaded and available in the NFVO
 Send PUT Request to upload VNF Package Content with conflict due to onboarding state
     Log    Trying to perform a PUT. This method upload the content of a NSD
     Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_ZIP}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
-    ${body}=  Get Binary File     files/vnfPackage.zip
+    ${body}=  Get Binary File     ${contentZipVnfPackage}
     ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${creatingVnfPackageId}/package_content    data=${body}
     Should Be Empty     ${response.text}
     ${response}=    Create Dictionary   status=${response.status_code}
diff --git a/SOL005/VNFPackageManagement-API/environment/variables.txt b/SOL005/VNFPackageManagement-API/environment/variables.txt
index 9f677fc5d..948974169 100644
--- a/SOL005/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFPackageManagement-API/environment/variables.txt
@@ -49,6 +49,8 @@ ${disabledVnfPackageId}    87a2c9d3-00ea-4032-8c67-a5106d001868
 ${vnfPackageId}  788106a2-d692-44f3-a86d-384f0ce35e42
 ${instantiatedVnfPackageId}  0b79bab50daca910b000d4f1a2b675d604257e42
 
+${contentZipVnfPackage}    files/vnfPackage.zip
+
 ${ACCEPT_PLAIN}    text/plain
 ${ACCEPT_ZIP}     application/zip
 ${CONTENT_TYPE_PLAIN}    text/plain
diff --git a/SOL005/VNFPackageManagement-API/files/vnfPackage.zip b/SOL005/VNFPackageManagement-API/files/vnfPackage.zip
new file mode 100644
index 0000000000000000000000000000000000000000..9fcfb621d458e16f5e725f85d697d327ff8ab439
GIT binary patch
literal 187
zcmWIWW@h1H0D(<u-a$bn=2ujKY!K!E;<CK76urva91v~A%cYx{Vx<6L$7iMhd3lMs
zsZc(M8Q{&xWY2)hFcqM2AfNyy5k_-CMHm?*81`@2*_Oj_oe@Sero>f)_yOLmY#?on
MKo|w2y}@Px0B=Jl^Z)<=

literal 0
HcmV?d00001

-- 
GitLab


From f07f7ba72f1fc60c66b98674e1dca557600db410 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Thu, 11 Feb 2021 15:26:14 +0100
Subject: [PATCH 281/322] fixed pnfd file usage

---
 SOL005/NSDManagement-API/NSDManagementKeywords.robot | 5 +++--
 SOL005/NSDManagement-API/environment/variables.txt   | 3 ++-
 SOL005/NSDManagement-API/files/nsd.yml               | 3 ---
 SOL005/NSDManagement-API/files/pnfd.yml              | 3 ---
 4 files changed, 5 insertions(+), 9 deletions(-)
 delete mode 100644 SOL005/NSDManagement-API/files/nsd.yml
 delete mode 100644 SOL005/NSDManagement-API/files/pnfd.yml

diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index b07e7dec7..92f43790b 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -710,9 +710,10 @@ Send PUT Request to upload PNFD Content as zip file
 Send PUT Request to upload PNFD Content with conflict due to onboarding state
     Log    Trying to perform a PUT. This method upload the content of a PNFD
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Set Headers    {"Content-Type": "application/zip"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    ${body}=  Get Binary File  ${contentFilePnfd}
-    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${creatingNsdInfoId}/pnfd_content    ${body}
+    ${body}=  Get Binary File  ${contentZipPnfd}
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${creatingPnfdInfoId}/pnfd_content    data=${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
diff --git a/SOL005/NSDManagement-API/environment/variables.txt b/SOL005/NSDManagement-API/environment/variables.txt
index 01738ff5d..7fd3ab762 100644
--- a/SOL005/NSDManagement-API/environment/variables.txt
+++ b/SOL005/NSDManagement-API/environment/variables.txt
@@ -65,7 +65,7 @@ ${range}          bytes=0-1023
 ${erroneousRange}    bytes=100000-1000000    # Requesting a out of range number of bytes
 ${onboardingStateNsdInfoId}    b992a851-08b1-45a8-9282-a5f7a7df04a6
 ${contentZipNsd}    files/nsd.zip
-${contentFileNsd}    files/nsd.zip
+${contentFileNsd}    files/nsd.yml
 ${creatingNsdInfoId}    71241932-994a-46e2-ad6c-1740674dda44
 ${BAD_AUTHORIZATION}    Bear sometoken
 ${original_etag}    1234
@@ -79,6 +79,7 @@ ${SEPERATOR}      =
 
 
 ${pnfdInfoId}    40853bda-8a8f-4f63-9130-cef439f65348
+${creatingPnfdInfoId}    71241932-994a-46e2-ad6c-1740674dda44
 ${erroneous_pnfdInfoId}  erroneous_pnfdInfoId
 ${enabledPnfdInfoId}  40853bda-8a8f-4f63-9130-cef439f65348
 ${erroneous_pnfdId}    erroneousPnfdId
diff --git a/SOL005/NSDManagement-API/files/nsd.yml b/SOL005/NSDManagement-API/files/nsd.yml
deleted file mode 100644
index 8cddb97b8..000000000
--- a/SOL005/NSDManagement-API/files/nsd.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-nsd:
--id: nsd_id
--name: nsd_name
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/files/pnfd.yml b/SOL005/NSDManagement-API/files/pnfd.yml
deleted file mode 100644
index faeeb5256..000000000
--- a/SOL005/NSDManagement-API/files/pnfd.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-pnfd:
--id: pnfd_id
--name: pnfd_name
\ No newline at end of file
-- 
GitLab


From b53baf8703040cbf78a36566263e57162c240a84 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Thu, 11 Feb 2021 16:47:16 +0100
Subject: [PATCH 282/322] fixed rest library use

---
 SOL005/NSDManagement-API/NSDManagementKeywords.robot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index 92f43790b..cb5c306ff 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -713,7 +713,7 @@ Send PUT Request to upload PNFD Content with conflict due to onboarding state
     Set Headers    {"Content-Type": "application/zip"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${body}=  Get Binary File  ${contentZipPnfd}
-    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${creatingPnfdInfoId}/pnfd_content    data=${body}
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${creatingPnfdInfoId}/pnfd_content    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
-- 
GitLab


From 5616c8ce08ea72997393d6ca17d0c9ff26f0dbe1 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Fri, 12 Feb 2021 10:35:09 +0100
Subject: [PATCH 283/322] updated authorization header and token use in SOL005
 v2.7.1

---
 SOL005/NSDManagement-API/ApiVersion.robot     |  20 +-
 SOL005/NSDManagement-API/NSD.robot            | 318 +++++++-------
 .../NSDArchiveManifest.robot                  | 188 ++++-----
 .../NSDManagementKeywords.robot               | 250 +++++------
 .../NotificationConsumer.robot                | 378 ++++++++---------
 SOL005/NSDManagement-API/PNFD.robot           | 320 +++++++-------
 .../PNFDArchiveManifest.robot                 | 188 ++++-----
 .../environment/variables.txt                 |   7 +-
 SOL005/NSFaultManagement-API/ApiVersion.robot |  20 +-
 .../NSFMOperationKeywords.robot               | 102 ++---
 .../NotificationConsumer.robot                | 184 ++++----
 .../environment/variables.txt                 |   3 +-
 .../ApiVersion.robot                          |  20 +-
 .../NSLCMOperationKeywords.robot              | 234 +++++-----
 .../NotificationConsumer.robot                | 194 ++++-----
 .../environment/variables.txt                 |   3 +-
 .../ApiVersion.robot                          |  20 +-
 .../NSPerformanceManagementKeywords.robot     |  88 ++--
 .../NotificationConsumer.robot                | 134 +++---
 .../environment/variables.txt                 |   4 +-
 ...essConfigurationForExternalArtifacts.robot | 216 +++++-----
 .../VNFPackageManagement-API/ApiVersion.robot |  20 +-
 .../ManifestInIndividualVNFPackage.robot      | 212 +++++-----
 .../NotificationConsumer.robot                | 144 +++----
 .../VNFPackageArtifacts.robot                 | 398 +++++++++---------
 .../VNFPackageManagementKeywords.robot        | 214 +++++-----
 .../environment/variables.txt                 |   7 +-
 27 files changed, 1945 insertions(+), 1941 deletions(-)

diff --git a/SOL005/NSDManagement-API/ApiVersion.robot b/SOL005/NSDManagement-API/ApiVersion.robot
index aa117f09b..483496f5b 100644
--- a/SOL005/NSDManagement-API/ApiVersion.robot
+++ b/SOL005/NSDManagement-API/ApiVersion.robot
@@ -133,70 +133,70 @@ DELETE API Version with apiMajorVerion - Method not implemented
 *** Keywords ***
 POST API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
diff --git a/SOL005/NSDManagement-API/NSD.robot b/SOL005/NSDManagement-API/NSD.robot
index 2b8d3708f..6bdb58d6c 100644
--- a/SOL005/NSDManagement-API/NSD.robot
+++ b/SOL005/NSDManagement-API/NSD.robot
@@ -1,160 +1,160 @@
-*** Settings ***
-Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt    # Generic Parameters
-Resource          NSDManagementKeywords.robot
-Library           JSONLibrary
-Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
-Library           OperatingSystem
-
-*** Test Cases ***
-Get single file NSD in Plain Format
-    [Documentation]    Test ID: 5.3.1.11.1
-    ...    Test title: Get single file NSD in Plain Format
-    ...    Test objective: The objective is to test the retrieval of the NSD in plain format within a NSD archive and perform a validation that returned content is in plain format
-    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The NSD is implemented as a single file
-    ...    Post-Conditions: none
-    Get single file NSD in Plain Format
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    text/plain
-
-Get NSD in Zip Format
-    [Documentation]    Test ID: 5.3.1.11.2
-    ...    Test title: Get NSD in Zip Format
-    ...    Test objective: The objective is to test the retrieval of the NSD in zip format within a NSD archive and perform a validation that returned content is in zip format
-    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get NSD in Zip Format
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
-
-Get single file NSD in Plain or Zip Format 
-    [Documentation]    Test ID: 5.3.1.11.3
-    ...    Test title: Get single file NSDin Plain or Zip Format
-    ...    Test objective: The objective is to test the retrieval of the single file NSD within a NSD archive when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that response is in Plain or Zip format
-    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The NSD is implemented as a single file
-    ...    Post-Conditions: none
-    Get single file NSD in Plain or Zip Format
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is Any of   text/plain    application/zip
-    
-Get multi file NSD in Plain or Zip Format
-    [Documentation]    Test ID: 5.3.1.11.4
-    ...    Test title: Get multi file NSD in Plain or Zip Format
-    ...    Test objective: The objective is to test the retrieval of the multi file NSD within a NSD archive when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that returned content is in Zip format
-    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The NSD is implemented as a multi file
-    ...    Post-Conditions: none
-    Get multi file NSD in Plain or Zip Format
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
-
-Get multi file NSD in Plain Format
-    [Documentation]    Test ID: 5.3.1.11.5
-    ...    Test title: Get multi file NSD in Plain Format
-    ...    Test objective: The objective is to test that the retrieval of the multi file NSD within a NSD archive fails when requesting it in Plain format, and perform a validation of the JSON schema validation of the failed operation HTTP response
-    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The NSD is implemented as a multi file
-    ...    Post-Conditions: none
-    Get multi file NSD in Plain Format
-    Check HTTP Response Status Code Is    406
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-
-Get NSD Content with invalid resource identifier
-    [Documentation]    Test ID: 5.3.1.11.6
-    ...    Test title: Get NSD Content with invalid resource identifier
-    ...    Test objective: The objective is to test that the retrieval of the NSD within a NSD archive fails when using an invalid resource identifier
-    ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get NSD with invalid resource identifier
-    Check HTTP Response Status Code Is    404
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-
-Get NSD with conflict due to onboarding state
-    [Documentation]    Test ID: 5.3.1.11.7
-    ...    Test title: Get NSD with conflict due to onboarding state
-    ...    Test objective: The objective is to test that the retrieval of the NSD within a NSD archive fails due to a conflict when the NSD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
-    ...    Pre-conditions: The onboarding state of the NSD is different from ONBOARDED.
-    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Get NSD with conflict due to onboarding state
-    Check HTTP Response Status Code Is    409
-    Check HTTP Response Body Json Schema Is   ProblemDetails    
-    
-Get NSD with security information
-    [Documentation]    Test ID: 5.3.1.11.8
-    ...    Test title: Get NSD with security information
-    ...    Test objective: The objective is to test the retrieval of the NSD within a NSD archive shall include in the ZIP archive the security information when requested with "include_signature" parameter
-    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get NSD with security information
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip          
-
-POST NSD - Method not implemented
-    [Documentation]    Test ID: 5.3.1.11.9
-    ...    Test title: POST NSD - Method not implemented
-    ...    Test objective: The objective is to test that POST method is not allowed to create a new Network Service Descriptor
-    ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4a.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send POST Request for NSD
-    Check HTTP Response Status Code Is    405
-    
-PUT NSD - Method not implemented
-    [Documentation]    Test ID: 5.3.1.11.10
-    ...    Test title: PUT NSD - Method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor
-    ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4a.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send PUT Request for NSD
-    Check HTTP Response Status Code Is    405
-
-PATCH NSD - Method not implemented
-    [Documentation]    Test ID: 5.3.1.11.11
-    ...    Test title: PATCH NSD - Method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor
-    ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4a.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send PATCH Request for NSD
-    Check HTTP Response Status Code Is    405
-
-DELETE NSD - Method not implemented
-    [Documentation]    Test ID: 5.3.1.11.12
-    ...    Test title: DELETE NSD - Method not implemented
-    ...    Test objective: The objective is to test that DELETE method is not allowed to delete Network Service Descriptor
-    ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4a.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send DELETE Request for NSD
+*** Settings ***
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt    # Generic Parameters
+Resource          NSDManagementKeywords.robot
+Library           JSONLibrary
+Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+Library           OperatingSystem
+
+*** Test Cases ***
+Get single file NSD in Plain Format
+    [Documentation]    Test ID: 5.3.1.11.1
+    ...    Test title: Get single file NSD in Plain Format
+    ...    Test objective: The objective is to test the retrieval of the NSD in plain format within a NSD archive and perform a validation that returned content is in plain format
+    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NSD is implemented as a single file
+    ...    Post-Conditions: none
+    Get single file NSD in Plain Format
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    text/plain
+
+Get NSD in Zip Format
+    [Documentation]    Test ID: 5.3.1.11.2
+    ...    Test title: Get NSD in Zip Format
+    ...    Test objective: The objective is to test the retrieval of the NSD in zip format within a NSD archive and perform a validation that returned content is in zip format
+    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get NSD in Zip Format
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+
+Get single file NSD in Plain or Zip Format 
+    [Documentation]    Test ID: 5.3.1.11.3
+    ...    Test title: Get single file NSDin Plain or Zip Format
+    ...    Test objective: The objective is to test the retrieval of the single file NSD within a NSD archive when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that response is in Plain or Zip format
+    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NSD is implemented as a single file
+    ...    Post-Conditions: none
+    Get single file NSD in Plain or Zip Format
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is Any of   text/plain    application/zip
+    
+Get multi file NSD in Plain or Zip Format
+    [Documentation]    Test ID: 5.3.1.11.4
+    ...    Test title: Get multi file NSD in Plain or Zip Format
+    ...    Test objective: The objective is to test the retrieval of the multi file NSD within a NSD archive when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that returned content is in Zip format
+    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NSD is implemented as a multi file
+    ...    Post-Conditions: none
+    Get multi file NSD in Plain or Zip Format
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+
+Get multi file NSD in Plain Format
+    [Documentation]    Test ID: 5.3.1.11.5
+    ...    Test title: Get multi file NSD in Plain Format
+    ...    Test objective: The objective is to test that the retrieval of the multi file NSD within a NSD archive fails when requesting it in Plain format, and perform a validation of the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NSD is implemented as a multi file
+    ...    Post-Conditions: none
+    Get multi file NSD in Plain Format
+    Check HTTP Response Status Code Is    406
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+
+Get NSD Content with invalid resource identifier
+    [Documentation]    Test ID: 5.3.1.11.6
+    ...    Test title: Get NSD Content with invalid resource identifier
+    ...    Test objective: The objective is to test that the retrieval of the NSD within a NSD archive fails when using an invalid resource identifier
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get NSD with invalid resource identifier
+    Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+
+Get NSD with conflict due to onboarding state
+    [Documentation]    Test ID: 5.3.1.11.7
+    ...    Test title: Get NSD with conflict due to onboarding state
+    ...    Test objective: The objective is to test that the retrieval of the NSD within a NSD archive fails due to a conflict when the NSD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: The onboarding state of the NSD is different from ONBOARDED.
+    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Get NSD with conflict due to onboarding state
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails    
+    
+Get NSD with security information
+    [Documentation]    Test ID: 5.3.1.11.8
+    ...    Test title: Get NSD with security information
+    ...    Test objective: The objective is to test the retrieval of the NSD within a NSD archive shall include in the ZIP archive the security information when requested with "include_signature" parameter
+    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get NSD with security information
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip          
+
+POST NSD - Method not implemented
+    [Documentation]    Test ID: 5.3.1.11.9
+    ...    Test title: POST NSD - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not allowed to create a new Network Service Descriptor
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.4a.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send POST Request for NSD
+    Check HTTP Response Status Code Is    405
+    
+PUT NSD - Method not implemented
+    [Documentation]    Test ID: 5.3.1.11.10
+    ...    Test title: PUT NSD - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.4a.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PUT Request for NSD
+    Check HTTP Response Status Code Is    405
+
+PATCH NSD - Method not implemented
+    [Documentation]    Test ID: 5.3.1.11.11
+    ...    Test title: PATCH NSD - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.4a.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PATCH Request for NSD
+    Check HTTP Response Status Code Is    405
+
+DELETE NSD - Method not implemented
+    [Documentation]    Test ID: 5.3.1.11.12
+    ...    Test title: DELETE NSD - Method not implemented
+    ...    Test objective: The objective is to test that DELETE method is not allowed to delete Network Service Descriptor
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.4a.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send DELETE Request for NSD
     Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/NSDArchiveManifest.robot b/SOL005/NSDManagement-API/NSDArchiveManifest.robot
index cc759e25a..7a09f534f 100644
--- a/SOL005/NSDManagement-API/NSDArchiveManifest.robot
+++ b/SOL005/NSDManagement-API/NSDArchiveManifest.robot
@@ -1,95 +1,95 @@
-*** Settings ***
-Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt    # Generic Parameters
-Resource          NSDManagementKeywords.robot
-Library           JSONLibrary
-Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
-Library           OperatingSystem
-
-*** Test Cases ***
-Get NSD Archive Manifest
-    [Documentation]    Test ID: 5.3.1.12.1
-    ...    Test title: Get NSD Archive Manifest
-    ...    Test objective: The objective is to test that GET method reads the content of the manifest file within an NSD archive
-    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get NSD Archive Manifest
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    text/plain
-    
-Get NSD Archive Manifest with security information
-    [Documentation]    Test ID: 5.3.1.12.2
-    ...    Test title: Get NSD Archive Manifest with security information
-    ...    Test objective: The objective is to test the retrieval of content of the manifest file within an NSD archive shall include in the ZIP archive the security information when requested with "include_signature" parameter
-    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get NSD Archive Manifest with security information
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
-    
-Get NSD Archive Manifest with conflict due to onboarding state
-    [Documentation]    Test ID: 5.3.1.12.3
-    ...    Test title: Get NSD Archive Manifest with conflict due to onboarding state
-    ...    Test objective: The objective is to test that the retrieval of content of the manifest file within an NSD archive fails due to a conflict when the NSD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
-    ...    Pre-conditions: The onboarding state of the NSD is different from ONBOARDED.
-    ...    Reference: Clause 5.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Get NSD Archive Manifest with conflict due to onboarding state
-    Check HTTP Response Status Code Is    409
-    Check HTTP Response Body Json Schema Is   ProblemDetails  
-    
-POST NSD Archive Manifest - Method not implemented
-    [Documentation]    Test ID: 5.3.1.12.4
-    ...    Test title: POST NSD Archive Manifest - Method not implemented
-    ...    Test objective: The objective is to test that POST method is not allowed to create a new Network Service Descriptor Archive Manifest
-    ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4b.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send POST Request for NSD Archive Manifest
-    Check HTTP Response Status Code Is    405
-    
-PUT NSD Archive Manifest - Method not implemented
-    [Documentation]    Test ID: 5.3.1.12.5
-    ...    Test title: PUT NSD Archive Manifest - Method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor Archive Manifest
-    ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4b.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send PUT Request for NSD Archive Manifest
-    Check HTTP Response Status Code Is    405
-
-PATCH NSD Archive Manifest - Method not implemented
-    [Documentation]    Test ID: 5.3.1.12.6
-    ...    Test title: PATCH NSD Archive Manifest - Method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor Archive Manifest
-    ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4b.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send PATCH Request for NSD Archive Manifest
-    Check HTTP Response Status Code Is    405
-
-DELETE NSD Archive Manifest - Method not implemented
-    [Documentation]    Test ID: 5.3.1.12.7
-    ...    Test title: DELETE NSD Archive Manifest - Method not implemented
-    ...    Test objective: The objective is to test that DELETE method is not allowed to delete Network Service Descriptor Archive Manifest
-    ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4b.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send DELETE Request for NSD Archive Manifest
+*** Settings ***
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt    # Generic Parameters
+Resource          NSDManagementKeywords.robot
+Library           JSONLibrary
+Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+Library           OperatingSystem
+
+*** Test Cases ***
+Get NSD Archive Manifest
+    [Documentation]    Test ID: 5.3.1.12.1
+    ...    Test title: Get NSD Archive Manifest
+    ...    Test objective: The objective is to test that GET method reads the content of the manifest file within an NSD archive
+    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get NSD Archive Manifest
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    text/plain
+    
+Get NSD Archive Manifest with security information
+    [Documentation]    Test ID: 5.3.1.12.2
+    ...    Test title: Get NSD Archive Manifest with security information
+    ...    Test objective: The objective is to test the retrieval of content of the manifest file within an NSD archive shall include in the ZIP archive the security information when requested with "include_signature" parameter
+    ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get NSD Archive Manifest with security information
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get NSD Archive Manifest with conflict due to onboarding state
+    [Documentation]    Test ID: 5.3.1.12.3
+    ...    Test title: Get NSD Archive Manifest with conflict due to onboarding state
+    ...    Test objective: The objective is to test that the retrieval of content of the manifest file within an NSD archive fails due to a conflict when the NSD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: The onboarding state of the NSD is different from ONBOARDED.
+    ...    Reference: Clause 5.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Get NSD Archive Manifest with conflict due to onboarding state
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails  
+    
+POST NSD Archive Manifest - Method not implemented
+    [Documentation]    Test ID: 5.3.1.12.4
+    ...    Test title: POST NSD Archive Manifest - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not allowed to create a new Network Service Descriptor Archive Manifest
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.4b.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send POST Request for NSD Archive Manifest
+    Check HTTP Response Status Code Is    405
+    
+PUT NSD Archive Manifest - Method not implemented
+    [Documentation]    Test ID: 5.3.1.12.5
+    ...    Test title: PUT NSD Archive Manifest - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor Archive Manifest
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.4b.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PUT Request for NSD Archive Manifest
+    Check HTTP Response Status Code Is    405
+
+PATCH NSD Archive Manifest - Method not implemented
+    [Documentation]    Test ID: 5.3.1.12.6
+    ...    Test title: PATCH NSD Archive Manifest - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor Archive Manifest
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.4b.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PATCH Request for NSD Archive Manifest
+    Check HTTP Response Status Code Is    405
+
+DELETE NSD Archive Manifest - Method not implemented
+    [Documentation]    Test ID: 5.3.1.12.7
+    ...    Test title: DELETE NSD Archive Manifest - Method not implemented
+    ...    Test objective: The objective is to test that DELETE method is not allowed to delete Network Service Descriptor Archive Manifest
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.4b.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send DELETE Request for NSD Archive Manifest
     Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index cb5c306ff..9ea91b491 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -17,7 +17,7 @@ Variables  descriptors/SOL001/NSD/nsd_SOL001.yaml
 GET all Network Service Descriptors Information
     Log    The GET method queries multiple NS descriptors
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -25,7 +25,7 @@ GET all Network Service Descriptors Information
 GET Network Service Descriptors Information with attribute-based filter
     Log    The GET method queries multiple NS descriptors using Attribute-based filtering parameters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?${NSD_NAME}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -38,7 +38,7 @@ Check HTTP Response Body NsdInfos Matches the requested attribute-based filter
 GET Network Service Descriptors Information with invalid attribute-based filter
     Log    The GET method queries multiple NS descriptors using Attribute-based filtering parameters. Negative case, with erroneous attribute name
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?${NEG_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -47,7 +47,7 @@ Get all Network Service Descriptors Information with malformed authorization tok
     Pass Execution If    ${AUTH_USAGE} == 0    Skipping test as NFVO is not supporting authentication
     Log    The GET method queries using invalid token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Set Headers    {"Authorization": "${BAD_AUTHORIZATION}"}
+    Set Headers    {"${AUTHORIZATION_HEADER}": "${BAD_AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     REST.Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
@@ -66,7 +66,7 @@ Get all Network Service Descriptors Information with expired or revoked authoriz
     Pass Execution If    ${AUTH_USAGE} == 0    Skipping test as it is not supporting authentication
     Log    The GET method queries using invalid token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Set Headers    {"Authorization": "${NEG_AUTHORIZATION}"}
+    Set Headers    {"${AUTHORIZATION_HEADER}": "${NEG_AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
@@ -75,7 +75,7 @@ Get all Network Service Descriptors Information with expired or revoked authoriz
 GET all Network Service Descriptors Information with all_fields attribute selector
     Log    The GET method queries multiple NS descriptors using Attribute-based filtering parameters "all_fields"
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?all_fields
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -89,7 +89,7 @@ Check HTTP Response Body NsdInfos Matches the requested all_fields selector
 GET all Network Service Descriptors Information with exclude_default attribute selector
     Log    Trying to get all NSDs present in the NFVO Catalogue, using exclude_default filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -103,7 +103,7 @@ Check HTTP Response Body NsdInfos Matches the requested exclude_default selector
 GET all Network Service Descriptors Information with fields attribute selector
     Log    Trying to get all NSDs present in the NFVO Catalogue, using fields filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -111,7 +111,7 @@ GET all Network Service Descriptors Information with fields attribute selector
 GET all Network Service Descriptors Information with exclude_default and fields attribute selector
     Log    Trying to get all NSDs present in the NFVO Catalogue, using fields filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?exclude_default&fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}  
@@ -126,7 +126,7 @@ GET all Network Service Descriptors Information with exclude_fields attribute se
     Log    Trying to get all NSD Managements present in the NFVO Catalogue, using filter params
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use exclude_fields option
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
@@ -142,7 +142,7 @@ Send Post Request to create new Network Service Descriptor Resource
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${body}=    Get File    jsons/createNsdInfoRequest.json
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -150,7 +150,7 @@ Send Post Request to create new Network Service Descriptor Resource
 Check Postcondition NsdInfo Exists
     Log    Checking that nsd info exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -161,7 +161,7 @@ Send PUT Request for all Network Service Descriptors
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -170,7 +170,7 @@ Send PATCH Request for all Network Service Descriptors
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -179,7 +179,7 @@ Send DELETE Request for all Network Service Descriptors
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     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": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -191,7 +191,7 @@ Check Postcondition Network Service Descriptors Exist
 GET Individual Network Service Descriptor Information
     Log    The GET method reads information about an individual NS descriptor
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -204,7 +204,7 @@ Check HTTP Response Body NsdInfo Identifier matches the requested Network Servic
 GET Individual Network Service Descriptor Information with invalid resource identifier
     Log    Trying to perform a GET on an erroneous nsDescriptorInfoId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${erroneous_nsdInfoId}
     Integer    response status    404
     ${output}=    Output    response
@@ -216,7 +216,7 @@ Send PATCH to disable Individual Network Service Descriptor
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Set Headers    {"If-Match": "${original_etag}"}
     ${body}=    Get File    jsons/NsdInfoModificationDisable.json
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -237,7 +237,7 @@ Send PATCH to enable Individual Network Service Descriptor
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Set Headers    {"If-Match": "${original_etag}"}
     ${body}=    Get File    jsons/NsdInfoModificationEnable.json
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -248,7 +248,7 @@ Send PATCH to enable Individual Network Service Descriptor in onboarding state d
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Set Headers    {"If-Match": "${original_etag}"}
     ${body}=    Get File    jsons/NsdInfoModificationEnable.json
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -259,7 +259,7 @@ Send PATCH to enable Individual Network Service Descriptor in onboarding state d
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Set Headers    {"If-Match": "${wrong_etag}"}
     ${body}=    Get File    jsons/NsdInfoModificationEnable.json
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -267,21 +267,21 @@ Send PATCH to enable Individual Network Service Descriptor in onboarding state d
 Send DELETE Request for Individual Network Service Descriptor
     Log    Trying to perform a DELETE nsdInfo. The nsdInfo should be in "NOT_USED" usageState and in "DISABLED" operationalState.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${disabledNsdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Check Postcondition Network Service Descriptor is Deleted
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${disabledNsdInfoId}
     Integer    response status    404
 
 Send DELETE Request for Individual Network Service Descriptor in operational state ENABLED
     Log    Trying to perform a DELETE nsdInfo in ENABLED operational state
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -293,7 +293,7 @@ Send POST Request for Individual Network Service Descriptor
     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": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -302,7 +302,7 @@ Send PUT Request for Individual Network Service Descriptor
     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": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -330,7 +330,7 @@ Check HTTP Response Header Content-Length Is Present and Matches the requested r
 Get NSD Content in Zip Format
     Log    Trying to get a NSD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -338,7 +338,7 @@ Get NSD Content in Zip Format
 Get NSD Content with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${erroneous_nsdInfoId}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -346,7 +346,7 @@ Get NSD Content with invalid resource identifier
 Get NSD Content with conflict due to onboarding state
     Log    Trying to get a VNFD from a given NSD Management present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -356,7 +356,7 @@ GET NSD Content with Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${range}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -366,13 +366,13 @@ GET NSD Content with invalid Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send PUT Request to upload NSD Content as zip file in asynchronous mode
-    Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_JSON}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
+    Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_JSON}", "Content-Type": "application/zip", "${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}      verify=False
     ${body}=  Get Binary File  ${contentZipNsd}
     ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content     data=${body}
     Should Be Empty     ${response.text}
@@ -380,7 +380,7 @@ Send PUT Request to upload NSD Content as zip file in asynchronous mode
     Set Suite Variable      ${response}     ${response}
 
 Send PUT Request to upload NSD Content as zip file in synchronous mode
-    Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_JSON}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
+    Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_JSON}", "Content-Type": "application/zip", "${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}      verify=False
     ${body}=  Get Binary File  ${contentZipNsd}
     ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content     data=${body}
     Should Be Empty     ${response.text}
@@ -404,7 +404,7 @@ Check Postcondition NSD Content is uploaded and available in the NFVO
  
 Send PUT Request to upload NSD Content with conflict due to onboarding state
     Log    Trying to perform a PUT. This method upload the content of a NSD
-    Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_ZIP}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
+    Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_ZIP}", "Content-Type": "application/zip", "${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}      verify=False
     ${body}=  Get Binary File  ${contentZipNsd}
     ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content     data=${body}
     Log         ${response}
@@ -414,7 +414,7 @@ Send PUT Request to upload NSD Content with conflict due to onboarding state
 Send POST Request for NSD Content
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a POST. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -422,7 +422,7 @@ Send POST Request for NSD Content
 Send PATCH Request for NSD Content
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -430,7 +430,7 @@ Send PATCH Request for NSD Content
 Send DELETE Request for NSD Content
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a DELETE. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -438,7 +438,7 @@ Send DELETE Request for NSD Content
 GET all PNF Descriptors Information
     Log    The GET method queries multiple PNF descriptors
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -446,7 +446,7 @@ GET all PNF Descriptors Information
 GET PNF Descriptors Information with attribute-based filter
     Log    The GET method queries multiple PNF descriptors using Attribute-based filtering parameters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?${PNFD_NAME}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -459,7 +459,7 @@ Check HTTP Response Body PnfdInfos Matches the requested attribute-based filter
 GET PNF Descriptors Information with invalid attribute-based filter
     Log    The GET method queries multiple PNF descriptors using Attribute-based filtering parameters. Negative case, with erroneous attribute name
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?${NEG_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -467,7 +467,7 @@ GET PNF Descriptors Information with invalid attribute-based filter
 GET all PNF Descriptors Information with all_fields attribute selector
     Log    The GET method queries multiple PNF descriptors using Attribute-based filtering parameters "all_fields"
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?all_fields
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -481,7 +481,7 @@ Check HTTP Response Body PnfdInfos Matches the requested all_fields selector
 GET all PNF Descriptors Information with exclude_default attribute selector
     Log    Trying to get all PNFDs present in the NFVO Catalogue, using exclude_default filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -495,7 +495,7 @@ Check HTTP Response Body PnfdInfos Matches the requested exclude_default selecto
 GET all PNF Descriptors Information with fields attribute selector
     Log    Trying to get all PNFDs present in the NFVO Catalogue, using fields filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}  
@@ -503,7 +503,7 @@ GET all PNF Descriptors Information with fields attribute selector
 GET all PNF Descriptors Information with exclude_default and fields attribute selector
     Log    Trying to get all PNFDs present in the NFVO Catalogue, using fields filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?exclude_default&fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}  
@@ -518,7 +518,7 @@ GET all PNF Descriptors Information with exclude_fields attribute selector
     Log    Trying to get all PNF present in the NFVO Catalogue, using filter params
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use exclude_fields option
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
@@ -534,7 +534,7 @@ Send Post Request to create new PNF Descriptor Resource
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${body}=    Get File    jsons/createPnfdInfoRequest.json
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -542,7 +542,7 @@ Send Post Request to create new PNF Descriptor Resource
 Check Postcondition PnfdInfo Exists
     Log    Checking that nsd info exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -553,7 +553,7 @@ Send PUT Request for all PNF Descriptors
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -562,7 +562,7 @@ Send PATCH Request for all PNF Descriptors
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -571,7 +571,7 @@ Send DELETE Request for all PNF Descriptors
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     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": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -579,7 +579,7 @@ Send DELETE Request for all PNF Descriptors
 GET Individual PNF Descriptor Information
     Log    The GET method reads information about an individual PNF descriptor
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -592,7 +592,7 @@ Check HTTP Response Body PnfdInfo Identifier matches the requested PNF Descripto
 GET Individual PNF Descriptor Information with invalid resource identifier
     Log    Trying to perform a GET on an erroneous nsDescriptorInfoId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${erroneous_pnfdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -603,7 +603,7 @@ Send PATCH to update Individual PNF Descriptor
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Set Headers    {"If-Match": "${original_etag}"}
     ${body}=    Get File    jsons/PnfdInfoModification.json
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -619,7 +619,7 @@ Send PATCH to update Individual PNF Descriptor with HTTP Etag precondition failu
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Set Headers    {"If-Match": "${wrong_etag}"}
     ${body}=    Get File    jsons/PnfdInfoModification.json
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -627,14 +627,14 @@ Send PATCH to update Individual PNF Descriptor with HTTP Etag precondition failu
 Send DELETE Request for Individual PNF Descriptor
     Log    Trying to perform a DELETE pnfdInfo.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Check Postcondition PNF Descriptor is Deleted
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
     Integer    response status    404
 
@@ -642,7 +642,7 @@ Send POST Request for Individual PNF Descriptor
     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": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -651,7 +651,7 @@ Send PUT Request for Individual PNF Descriptor
     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": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -659,7 +659,7 @@ Send PUT Request for Individual PNF Descriptor
 Get PNFD Content
     Log    Trying to get a NSD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -668,7 +668,7 @@ Get PNFD Content with Range Request
     Log    Trying to get a NSD present in the NFVO Catalogue with range request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Range": "${range}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -677,7 +677,7 @@ Get PNFD Content with invalid Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -685,7 +685,7 @@ Get PNFD Content with invalid Range Request
 Get PNFD Content with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${erroneous_pnfdInfoId}/pnfd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -693,14 +693,14 @@ Get PNFD Content with invalid resource identifier
 Get PNFD Content with conflict due to onboarding state
     Log    Trying to get a PNFD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${onboardingStatePnfdId}/pnfd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
 Send PUT Request to upload PNFD Content as zip file
     Log    Trying to perform a PUT. This method upload the content of a PNFD
-    Create Session      pnfd     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}      headers={"Accept": "${ACCEPT_PLAIN}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
+    Create Session      pnfd     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}      headers={"Accept": "${ACCEPT_PLAIN}", "Content-Type": "application/zip", "${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}      verify=False
     ${body}=  Get Binary File  ${contentZipPnfd}
     ${response}=    Put Request     pnfd     ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content     data=${body}
     Should Be Empty     ${response.text}
@@ -711,7 +711,7 @@ Send PUT Request to upload PNFD Content with conflict due to onboarding state
     Log    Trying to perform a PUT. This method upload the content of a PNFD
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Content-Type": "application/zip"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=  Get Binary File  ${contentZipPnfd}
     REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${creatingPnfdInfoId}/pnfd_content    ${body}
     ${output}=    Output    response
@@ -720,7 +720,7 @@ Send PUT Request to upload PNFD Content with conflict due to onboarding state
 Send POST Request for PNFD Content
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a POST. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -728,7 +728,7 @@ Send POST Request for PNFD Content
 Send PATCH Request for PNFD Content
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -736,7 +736,7 @@ Send PATCH Request for PNFD Content
 Send DELETE Request for PNFD Content
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a DELETE. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -749,7 +749,7 @@ Get all NSD Management Subscriptions
     ...    specified in the Tables 5.4.8.3.2-1 and 5.4.8.3.2-2.
     Log    Trying to get the list of subscriptions
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -757,7 +757,7 @@ Get all NSD Management Subscriptions
 Get NSD Management Subscriptions with attribute-based filters
     Log    Trying to get the list of subscriptions using filters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ok}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -766,7 +766,7 @@ Get NSD Management Subscriptions with attribute-based filters
 Get NSD Management Subscriptions with invalid attribute-based filters
     Log    Trying to get the list of subscriptions using filters with wrong attribute name
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ko}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -775,7 +775,7 @@ Get NSD Management Subscriptions with invalid attribute-based filters
 Get NSD Management Subscriptions with invalid resource endpoint
     Log    Trying to perform a request on a Uri which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}    
@@ -790,7 +790,7 @@ Send Post Request for NSD Management Subscription
     Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File
     ${template}=    Get File    jsons/subscriptions.json
     ${body}=        Format String   ${template}     notifCallbackUri=${notifCallbackUri}    nsdId=${NS_DescriptorID}    nsdName=${NS_Name}    nsdVersion=${NS_Version}    nsdDesigner=${Designer}    nsdInvariantId=${NS_InvariantId}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -805,7 +805,7 @@ Send POST Request for Duplicated NSD Management Subscription
     Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File
     ${template}=    Get File    jsons/subscriptions.json
     ${body}=        Format String   ${template}     notifCallbackUri=${notifCallbackUri}    nsdId=${NS_DescriptorID}    nsdName=${NS_Name}    nsdVersion=${NS_Version}    nsdDesigner=${Designer}    nsdInvariantId=${NS_InvariantId}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -818,7 +818,7 @@ Send Put Request for NSD Management Subscriptions
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -828,7 +828,7 @@ Send Patch Request for NSD Management Subscriptions
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -837,7 +837,7 @@ Send Delete Request for NSD Management Subscriptions
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     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": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -881,7 +881,7 @@ Check Postcondition NSD Management Subscription Is Set
     Log    Check Postcondition subscription exist
     Log    Trying to get the subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -890,7 +890,7 @@ Check Postcondition NSD Management Subscription Is Set
     
 Check Postcondition Subscription Resource Returned in Location Header Is Available
     Log    Going to check postcondition
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${response['headers']['Location']}
     Integer    response status    200
     Log    Received a 200 OK as expected
@@ -908,7 +908,7 @@ Check Postcondition Subscription Resource Returned in Location Header Is Availab
 Get Individual NSD Management Subscription
     Log    Trying to get a single subscription identified by subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -916,7 +916,7 @@ Get Individual NSD Management Subscription
 GET individual NSD Management Subscription with invalid resource identifier
     Log    Trying to perform a request on a subscriptionID which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -924,7 +924,7 @@ GET individual NSD Management Subscription with invalid resource identifier
 Send Delete request for individual NSD Management Subscription
     Log    Trying to perform a DELETE on a subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -937,19 +937,19 @@ Check Postcondition NSD Management Subscription is Deleted
 Send Delete request for individual NSD Management Subscription with invalid resource identifier
     Log    Trying to perform a DELETE on a subscriptionId which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual NSD Management Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for individual NSD Management Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -958,7 +958,7 @@ Send Put request for individual NSD Management Subscription
     Set Suite Variable    ${response}    ${output}
     
 Send Patch request for individual NSD Management Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -1000,7 +1000,7 @@ Check HTTP Response Header Contain Link
 
 Check PostCondition GET Individual Network Service Descriptor Information
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
     Should Be Equal As Strings     ${response['status']}    200
     
@@ -1010,7 +1010,7 @@ Wait for individual grant successful notification
 Get single file NSD in Plain Format
     Log    Trying to get a NSD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1018,7 +1018,7 @@ Get single file NSD in Plain Format
 Get NSD in Zip Format
     Log    Trying to get a NSD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1027,7 +1027,7 @@ Get single file NSD in Plain or Zip Format
     Log    Trying to get a NSD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1036,7 +1036,7 @@ Get multi file NSD in Plain or Zip Format
     Log    Trying to get a VNFD from a given NSD Management present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1044,7 +1044,7 @@ Get multi file NSD in Plain or Zip Format
 Get multi file NSD in Plain Format
     Log    Trying to get a negative case performing a get on a NSD present in the NFVO Catalogue. Accept will be text/plain but NSD is composed my multiple files.
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1053,7 +1053,7 @@ Get NSD with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${erroneous_nsdInfoId}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1062,7 +1062,7 @@ Get NSD with conflict due to onboarding state
     Log    Trying to get a VNFD from a given NSD Management present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1070,7 +1070,7 @@ Get NSD with conflict due to onboarding state
 Send POST Request for NSD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a POST. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1078,7 +1078,7 @@ Send POST Request for NSD
 Send PUT Request for NSD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1086,7 +1086,7 @@ Send PUT Request for NSD
 Send PATCH Request for NSD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1094,7 +1094,7 @@ Send PATCH Request for NSD
 Send DELETE Request for NSD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a DELETE. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1102,14 +1102,14 @@ Send DELETE Request for NSD
 Get NSD with security information
     Log    Trying to get a NSD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Get NSD Archive Manifest
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdPlain}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1117,7 +1117,7 @@ Get NSD Archive Manifest
 Get NSD Archive Manifest with security information
     Log    Trying to get a NSD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1126,7 +1126,7 @@ Get NSD Archive Manifest with conflict due to onboarding state
     Log    Trying to get a VNFD from a given NSD Management present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1134,7 +1134,7 @@ Get NSD Archive Manifest with conflict due to onboarding state
 Send POST Request for NSD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a POST. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1142,7 +1142,7 @@ Send POST Request for NSD Archive Manifest
 Send PUT Request for NSD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1150,7 +1150,7 @@ Send PUT Request for NSD Archive Manifest
 Send PATCH Request for NSD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1158,7 +1158,7 @@ Send PATCH Request for NSD Archive Manifest
 Send DELETE Request for NSD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a DELETE. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1166,7 +1166,7 @@ Send DELETE Request for NSD Archive Manifest
 Get single file PNFD in Plain Format
     Log    Trying to get a PNFD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1174,7 +1174,7 @@ Get single file PNFD in Plain Format
 Get PNFD in Zip Format
     Log    Trying to get a PNFD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1183,7 +1183,7 @@ Get single file PNFD in Plain or Zip Format
     Log    Trying to get a PNFD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1192,7 +1192,7 @@ Get multi file PNFD in Plain or Zip Format
     Log    Trying to get a VNFD from a given PNFD Management present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1200,7 +1200,7 @@ Get multi file PNFD in Plain or Zip Format
 Get multi file PNFD in Plain Format
     Log    Trying to get a negative case performing a get on a PNFD present in the NFVO Catalogue. Accept will be text/plain but PNFD is composed my multiple files.
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1209,7 +1209,7 @@ Get PNFD with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${erroneous_PNFDInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1218,7 +1218,7 @@ Get PNFD with conflict due to onboarding state
     Log    Trying to get a VNFD from a given PNFD Management present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${onboardingStatePnfdId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1226,7 +1226,7 @@ Get PNFD with conflict due to onboarding state
 Get PNFD with security information
     Log    Trying to get a PNFD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1234,7 +1234,7 @@ Get PNFD with security information
 Send POST Request for PNFD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a POST. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1242,7 +1242,7 @@ Send POST Request for PNFD
 Send PUT Request for PNFD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1250,7 +1250,7 @@ Send PUT Request for PNFD
 Send PATCH Request for PNFD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1258,14 +1258,14 @@ Send PATCH Request for PNFD
 Send DELETE Request for PNFD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a DELETE. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
 Get PNFD Archive Manifest
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1273,7 +1273,7 @@ Get PNFD Archive Manifest
 Get PNFD Archive Manifest with security information
     Log    Trying to get a PNFD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1282,7 +1282,7 @@ Get PNFD Archive Manifest with conflict due to onboarding state
     Log    Trying to get a PNFD Management present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1290,7 +1290,7 @@ Get PNFD Archive Manifest with conflict due to onboarding state
 Send POST Request for PNFD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a POST. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1298,7 +1298,7 @@ Send POST Request for PNFD Archive Manifest
 Send PUT Request for PNFD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1306,7 +1306,7 @@ Send PUT Request for PNFD Archive Manifest
 Send PATCH Request for PNFD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1314,7 +1314,7 @@ Send PATCH Request for PNFD Archive Manifest
 Send DELETE Request for PNFD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a DELETE. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL005/NSDManagement-API/NotificationConsumer.robot b/SOL005/NSDManagement-API/NotificationConsumer.robot
index 59492691d..d769f58f1 100644
--- a/SOL005/NSDManagement-API/NotificationConsumer.robot
+++ b/SOL005/NSDManagement-API/NotificationConsumer.robot
@@ -1,190 +1,190 @@
-*** Settings ***
-Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt
-Library           OperatingSystem
-Library           JSONLibrary
-Library           String
-Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
-Suite Setup    Check resource existence and get CallbackUri
-Resource          NSDManagementKeywords.robot
-
-*** Test Cases ***
-NSD Onboarding Notification
-    [Documentation]    Test ID: 5.3.1.15.1
-    ...    Test title: NSD Onboarding Notification
-    ...    Test objective: The objective is to test that NSD Onboarding Notification is delivered with success to the notification consumer.
-    ...    Pre-conditions: A NSD management subscription for onboarding notification is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_Notif_Endpoint
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post NSD Onboarding Notification
-    Check HTTP Response Status Code Is    204
-    
-NSD Onboarding Failure Notification
-    [Documentation]    Test ID: 5.3.1.15.2
-    ...    Test title: NSD Onboarding Failure Notification
-    ...    Test objective: The objective is to test that NSD Onboarding Failure Notification is delivered with success to the notification consumer.
-    ...    Pre-conditions: A NSD management subscription for onboarding failure notification is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_Notif_Endpoint
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post NSD Onboarding Failure Notification
-    Check HTTP Response Status Code Is    204
-    
-NSD Change Notification
-    [Documentation]    Test ID: 5.3.1.15.3
-    ...    Test title: NSD Change Notification
-    ...    Test objective: The objective is to test that NSD Change Notification is delivered with success to the notification consumer.
-    ...    Pre-conditions: A NSD management subscription for change notification is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_Notif_Endpoint
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post NSD Change Notification
-    Check HTTP Response Status Code Is    204
-    
-NSD Deletion Notification
-    [Documentation]    Test ID: 5.3.1.15.4
-    ...    Test title: NSD Deletion Notification
-    ...    Test objective: The objective is to test that NSD Deletion Notification is delivered with success to the notification consumer.
-    ...    Pre-conditions: A NSD management subscription for deletion notification is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_Notif_Endpoint
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post NSD Deletion Notification
-    Check HTTP Response Status Code Is    204
-    
-Pnfd Onboarding Notification
-    [Documentation]    Test ID: 5.3.1.15.5
-    ...    Test title: Pnfd Onboarding Notification
-    ...    Test objective: The objective is to test that Pnfd Onboarding Notification is delivered with success to the notification consumer.
-    ...    Pre-conditions: A Pnfd management subscription for onboarding notification is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_Notif_Endpoint
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post Pnfd Onboarding Notification
-    Check HTTP Response Status Code Is    204
-    
-Pnfd Onboarding Failure Notification
-    [Documentation]    Test ID: 5.3.1.15.6
-    ...    Test title: Pnfd Onboarding Failure Notification
-    ...    Test objective: The objective is to test that Pnfd Onboarding Failure Notification is delivered with success to the notification consumer.
-    ...    Pre-conditions: A Pnfd management subscription for onboarding failure notification is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_Notif_Endpoint
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post Pnfd Onboarding Failure Notification
-    Check HTTP Response Status Code Is    204
-    
-Pnfd Deletion Notification
-    [Documentation]    Test ID: 5.3.1.15.7
-    ...    Test title: pnfd Deletion Notification
-    ...    Test objective: The objective is to test that Pnfd Deletion Notification is delivered with success to the notification consumer.
-    ...    Pre-conditions: A Pnfd management subscription for deletion notification is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_Notif_Endpoint
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post Pnfd Deletion Notification
-    Check HTTP Response Status Code Is    204
-    
-*** Keywords ***
-Check resource existence and get CallbackUri
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
-    Integer    response status    200
-    Validate Json    response body    PkgmSubscription.schema.json
-    Set Global Variable    ${callbackResp}    response body callbackUri
-
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings    ${response['status']}    ${expected_status}
-    Log    Status code validated 
-    
-Post NSD Onboarding Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File
-    ${template} =    Get File    jsons/notifications/NsdOnBoardingNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsdInfoId=${nsdInfoId}    nsdId=${NS_DescriptorID}    
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}
-
-Post NSD Onboarding Failure Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File    
-    ${template} =    Get File    jsons/notifications/NsdOnBoardingFailureNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsdInfoId=${nsdInfoId}    nsdId=${NS_DescriptorID}     
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}
-	
-Post NSD Change Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File        
-    ${template} =    Get File    jsons/notifications/NsdChangeNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsdInfoId=${nsdInfoId}    nsdId=${NS_DescriptorID} 
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}
-	
-Post NSD Deletion Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File        
-    ${template} =    Get File    jsons/notifications/NsdDeletionNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsdInfoId=${nsdInfoId}    nsdId=${NS_DescriptorID} 
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}
-	
-Post Pnfd Onboarding Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/notifications/PnfdOnBoardingNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    pnfdInfoId=${pnfdInfoId} 
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}
-
-Post Pnfd Onboarding Failure Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/notifications/PnfdOnBoardingFailureNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    pnfdInfoId=${pnfdInfoId} 
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}
-	
-Post Pnfd Deletion Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/notifications/pnfdDeletionNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    pnfdInfoId=${pnfdInfoId} 
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
+*** Settings ***
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt
+Library           OperatingSystem
+Library           JSONLibrary
+Library           String
+Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+Suite Setup    Check resource existence and get CallbackUri
+Resource          NSDManagementKeywords.robot
+
+*** Test Cases ***
+NSD Onboarding Notification
+    [Documentation]    Test ID: 5.3.1.15.1
+    ...    Test title: NSD Onboarding Notification
+    ...    Test objective: The objective is to test that NSD Onboarding Notification is delivered with success to the notification consumer.
+    ...    Pre-conditions: A NSD management subscription for onboarding notification is available in the NFVO.
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post NSD Onboarding Notification
+    Check HTTP Response Status Code Is    204
+    
+NSD Onboarding Failure Notification
+    [Documentation]    Test ID: 5.3.1.15.2
+    ...    Test title: NSD Onboarding Failure Notification
+    ...    Test objective: The objective is to test that NSD Onboarding Failure Notification is delivered with success to the notification consumer.
+    ...    Pre-conditions: A NSD management subscription for onboarding failure notification is available in the NFVO.
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post NSD Onboarding Failure Notification
+    Check HTTP Response Status Code Is    204
+    
+NSD Change Notification
+    [Documentation]    Test ID: 5.3.1.15.3
+    ...    Test title: NSD Change Notification
+    ...    Test objective: The objective is to test that NSD Change Notification is delivered with success to the notification consumer.
+    ...    Pre-conditions: A NSD management subscription for change notification is available in the NFVO.
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post NSD Change Notification
+    Check HTTP Response Status Code Is    204
+    
+NSD Deletion Notification
+    [Documentation]    Test ID: 5.3.1.15.4
+    ...    Test title: NSD Deletion Notification
+    ...    Test objective: The objective is to test that NSD Deletion Notification is delivered with success to the notification consumer.
+    ...    Pre-conditions: A NSD management subscription for deletion notification is available in the NFVO.
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post NSD Deletion Notification
+    Check HTTP Response Status Code Is    204
+    
+Pnfd Onboarding Notification
+    [Documentation]    Test ID: 5.3.1.15.5
+    ...    Test title: Pnfd Onboarding Notification
+    ...    Test objective: The objective is to test that Pnfd Onboarding Notification is delivered with success to the notification consumer.
+    ...    Pre-conditions: A Pnfd management subscription for onboarding notification is available in the NFVO.
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Pnfd Onboarding Notification
+    Check HTTP Response Status Code Is    204
+    
+Pnfd Onboarding Failure Notification
+    [Documentation]    Test ID: 5.3.1.15.6
+    ...    Test title: Pnfd Onboarding Failure Notification
+    ...    Test objective: The objective is to test that Pnfd Onboarding Failure Notification is delivered with success to the notification consumer.
+    ...    Pre-conditions: A Pnfd management subscription for onboarding failure notification is available in the NFVO.
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Pnfd Onboarding Failure Notification
+    Check HTTP Response Status Code Is    204
+    
+Pnfd Deletion Notification
+    [Documentation]    Test ID: 5.3.1.15.7
+    ...    Test title: pnfd Deletion Notification
+    ...    Test objective: The objective is to test that Pnfd Deletion Notification is delivered with success to the notification consumer.
+    ...    Pre-conditions: A Pnfd management subscription for deletion notification is available in the NFVO.
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Pnfd Deletion Notification
+    Check HTTP Response Status Code Is    204
+    
+*** Keywords ***
+Check resource existence and get CallbackUri
+    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}/subscriptions/${subscriptionId}
+    Integer    response status    200
+    Validate Json    response body    PkgmSubscription.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+    
+Post NSD Onboarding Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File
+    ${template} =    Get File    jsons/notifications/NsdOnBoardingNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsdInfoId=${nsdInfoId}    nsdId=${NS_DescriptorID}    
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+
+Post NSD Onboarding Failure Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File    
+    ${template} =    Get File    jsons/notifications/NsdOnBoardingFailureNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsdInfoId=${nsdInfoId}    nsdId=${NS_DescriptorID}     
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	
+Post NSD Change Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File        
+    ${template} =    Get File    jsons/notifications/NsdChangeNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsdInfoId=${nsdInfoId}    nsdId=${NS_DescriptorID} 
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	
+Post NSD Deletion Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File        
+    ${template} =    Get File    jsons/notifications/NsdDeletionNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsdInfoId=${nsdInfoId}    nsdId=${NS_DescriptorID} 
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	
+Post Pnfd Onboarding Notification
+    log    Trying to perform a POST to get notification
+    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/notifications/PnfdOnBoardingNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    pnfdInfoId=${pnfdInfoId} 
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+
+Post Pnfd Onboarding Failure Notification
+    log    Trying to perform a POST to get notification
+    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/notifications/PnfdOnBoardingFailureNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    pnfdInfoId=${pnfdInfoId} 
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	
+Post Pnfd Deletion Notification
+    log    Trying to perform a POST to get notification
+    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/notifications/pnfdDeletionNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    pnfdInfoId=${pnfdInfoId} 
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/PNFD.robot b/SOL005/NSDManagement-API/PNFD.robot
index 342fefbcd..04a83b634 100644
--- a/SOL005/NSDManagement-API/PNFD.robot
+++ b/SOL005/NSDManagement-API/PNFD.robot
@@ -1,161 +1,161 @@
-*** Settings ***
-Documentation     This Clause defines the content of the individual NS descriptor, i.e. PNFD content
-Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt    # Generic Parameters
-Resource          NSDManagementKeywords.robot
-Library           JSONLibrary
-Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
-Library           OperatingSystem
-
-*** Test Cases ***
-Get single file PNFD in Plain Format
-    [Documentation]    Test ID: 5.3.1.13.1
-    ...    Test title: Get single file PNFD in Plain Format
-    ...    Test objective: The objective is to test the retrieval of the PNFD in plain format within a PNFD archive and perform a validation that returned content is in plain format
-    ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The PNFD is implemented as a single file
-    ...    Post-Conditions: none
-    Get single file PNFD in Plain Format
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    text/plain
-
-Get PNFD in Zip Format
-    [Documentation]    Test ID: 5.3.1.13.2
-    ...    Test title: Get PNFD in Zip Format
-    ...    Test objective: The objective is to test the retrieval of the PNFD in zip format within a PNFD archive and perform a validation that returned content is in zip format
-    ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get PNFD in Zip Format
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
-
-Get single file PNFD in Plain or Zip Format 
-    [Documentation]    Test ID: 5.3.1.13.3
-    ...    Test title: Get single file PNFDin Plain or Zip Format
-    ...    Test objective: The objective is to test the retrieval of the single file PNFD within a PNFD archive when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that response is in Plain or Zip format
-    ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The PNFD is implemented as a single file
-    ...    Post-Conditions: none
-    Get single file PNFD in Plain or Zip Format
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is Any of   text/plain    application/zip
-    
-Get multi file PNFD in Plain or Zip Format
-    [Documentation]    Test ID: 5.3.1.13.4
-    ...    Test title: Get multi file PNFD in Plain or Zip Format
-    ...    Test objective: The objective is to test the retrieval of the multi file PNFD within a PNFD archive when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that returned content is in Zip format
-    ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The PNFD is implemented as a multi file
-    ...    Post-Conditions: none
-    Get multi file PNFD in Plain or Zip Format
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
-
-Get multi file PNFD in Plain Format
-    [Documentation]    Test ID: 5.3.1.13.5
-    ...    Test title: Get multi file PNFD in Plain Format
-    ...    Test objective: The objective is to test that the retrieval of the multi file PNFD within a PNFD archive fails when requesting it in Plain format, and perform a validation of the JSON schema validation of the failed operation HTTP response
-    ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The PNFD is implemented as a multi file
-    ...    Post-Conditions: none
-    Get multi file PNFD in Plain Format
-    Check HTTP Response Status Code Is    406
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-
-Get PNFD Content with invalid resource identifier
-    [Documentation]    Test ID: 5.3.1.13.6
-    ...    Test title: Get PNFD Content with invalid resource identifier
-    ...    Test objective: The objective is to test that the retrieval of the PNFD within a PNFD archive fails when using an invalid resource identifier
-    ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get PNFD with invalid resource identifier
-    Check HTTP Response Status Code Is    404
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-
-Get PNFD with conflict due to onboarding state
-    [Documentation]    Test ID: 5.3.1.13.7
-    ...    Test title: Get PNFD with conflict due to onboarding state
-    ...    Test objective: The objective is to test that the retrieval of the PNFD within a PNFD archive fails due to a conflict when the PNFD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
-    ...    Pre-conditions: The onboarding state of the PNFD is different from ONBOARDED.
-    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Get PNFD with conflict due to onboarding state
-    Check HTTP Response Status Code Is    409
-    Check HTTP Response Body Json Schema Is   ProblemDetails    
-    
-Get PNFD with security information
-    [Documentation]    Test ID: 5.3.1.13.8
-    ...    Test title: Get PNFD with security information
-    ...    Test objective: The objective is to test the retrieval of the PNFD within a PNFD archive shall include in the ZIP archive the security information when requested with "include_signature" parameter
-    ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get PNFD with security information
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip   
-    
-POST PNFD - Method not implemented
-    [Documentation]    Test ID: 5.3.1.13.9
-    ...    Test title: POST PNFD - Method not implemented
-    ...    Test objective: The objective is to test that POST method is not allowed to create a new PNFD
-    ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7a.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send POST Request for PNFD
-    Check HTTP Response Status Code Is    405
-    
-PUT PNFD - Method not implemented
-    [Documentation]    Test ID: 5.3.1.13.10
-    ...    Test title: PUT PNFD - Method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to update PNFD
-    ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7a.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send PUT Request for PNFD
-    Check HTTP Response Status Code Is    405
-
-PATCH PNFD - Method not implemented
-    [Documentation]    Test ID: 5.3.1.13.11
-    ...    Test title: PATCH PNFD - Method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to update PNFD
-    ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7a.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send PATCH Request for PNFD
-    Check HTTP Response Status Code Is    405
-
-DELETE PNFD - Method not implemented
-    [Documentation]    Test ID: 5.3.1.13.12
-    ...    Test title: DELETE PNFD - Method not implemented
-    ...    Test objective: The objective is to test that DELETE method is not allowed to delete PNFD
-    ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7a.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send DELETE Request for PNFD
+*** Settings ***
+Documentation     This Clause defines the content of the individual NS descriptor, i.e. PNFD content
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt    # Generic Parameters
+Resource          NSDManagementKeywords.robot
+Library           JSONLibrary
+Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+Library           OperatingSystem
+
+*** Test Cases ***
+Get single file PNFD in Plain Format
+    [Documentation]    Test ID: 5.3.1.13.1
+    ...    Test title: Get single file PNFD in Plain Format
+    ...    Test objective: The objective is to test the retrieval of the PNFD in plain format within a PNFD archive and perform a validation that returned content is in plain format
+    ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The PNFD is implemented as a single file
+    ...    Post-Conditions: none
+    Get single file PNFD in Plain Format
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    text/plain
+
+Get PNFD in Zip Format
+    [Documentation]    Test ID: 5.3.1.13.2
+    ...    Test title: Get PNFD in Zip Format
+    ...    Test objective: The objective is to test the retrieval of the PNFD in zip format within a PNFD archive and perform a validation that returned content is in zip format
+    ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get PNFD in Zip Format
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+
+Get single file PNFD in Plain or Zip Format 
+    [Documentation]    Test ID: 5.3.1.13.3
+    ...    Test title: Get single file PNFDin Plain or Zip Format
+    ...    Test objective: The objective is to test the retrieval of the single file PNFD within a PNFD archive when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that response is in Plain or Zip format
+    ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The PNFD is implemented as a single file
+    ...    Post-Conditions: none
+    Get single file PNFD in Plain or Zip Format
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is Any of   text/plain    application/zip
+    
+Get multi file PNFD in Plain or Zip Format
+    [Documentation]    Test ID: 5.3.1.13.4
+    ...    Test title: Get multi file PNFD in Plain or Zip Format
+    ...    Test objective: The objective is to test the retrieval of the multi file PNFD within a PNFD archive when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that returned content is in Zip format
+    ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The PNFD is implemented as a multi file
+    ...    Post-Conditions: none
+    Get multi file PNFD in Plain or Zip Format
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+
+Get multi file PNFD in Plain Format
+    [Documentation]    Test ID: 5.3.1.13.5
+    ...    Test title: Get multi file PNFD in Plain Format
+    ...    Test objective: The objective is to test that the retrieval of the multi file PNFD within a PNFD archive fails when requesting it in Plain format, and perform a validation of the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The PNFD is implemented as a multi file
+    ...    Post-Conditions: none
+    Get multi file PNFD in Plain Format
+    Check HTTP Response Status Code Is    406
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+
+Get PNFD Content with invalid resource identifier
+    [Documentation]    Test ID: 5.3.1.13.6
+    ...    Test title: Get PNFD Content with invalid resource identifier
+    ...    Test objective: The objective is to test that the retrieval of the PNFD within a PNFD archive fails when using an invalid resource identifier
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get PNFD with invalid resource identifier
+    Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+
+Get PNFD with conflict due to onboarding state
+    [Documentation]    Test ID: 5.3.1.13.7
+    ...    Test title: Get PNFD with conflict due to onboarding state
+    ...    Test objective: The objective is to test that the retrieval of the PNFD within a PNFD archive fails due to a conflict when the PNFD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: The onboarding state of the PNFD is different from ONBOARDED.
+    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Get PNFD with conflict due to onboarding state
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails    
+    
+Get PNFD with security information
+    [Documentation]    Test ID: 5.3.1.13.8
+    ...    Test title: Get PNFD with security information
+    ...    Test objective: The objective is to test the retrieval of the PNFD within a PNFD archive shall include in the ZIP archive the security information when requested with "include_signature" parameter
+    ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get PNFD with security information
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip   
+    
+POST PNFD - Method not implemented
+    [Documentation]    Test ID: 5.3.1.13.9
+    ...    Test title: POST PNFD - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not allowed to create a new PNFD
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.7a.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send POST Request for PNFD
+    Check HTTP Response Status Code Is    405
+    
+PUT PNFD - Method not implemented
+    [Documentation]    Test ID: 5.3.1.13.10
+    ...    Test title: PUT PNFD - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to update PNFD
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.7a.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PUT Request for PNFD
+    Check HTTP Response Status Code Is    405
+
+PATCH PNFD - Method not implemented
+    [Documentation]    Test ID: 5.3.1.13.11
+    ...    Test title: PATCH PNFD - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to update PNFD
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.7a.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PATCH Request for PNFD
+    Check HTTP Response Status Code Is    405
+
+DELETE PNFD - Method not implemented
+    [Documentation]    Test ID: 5.3.1.13.12
+    ...    Test title: DELETE PNFD - Method not implemented
+    ...    Test objective: The objective is to test that DELETE method is not allowed to delete PNFD
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.7a.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send DELETE Request for PNFD
     Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/PNFDArchiveManifest.robot b/SOL005/NSDManagement-API/PNFDArchiveManifest.robot
index a2adf90a4..8ab2a1874 100644
--- a/SOL005/NSDManagement-API/PNFDArchiveManifest.robot
+++ b/SOL005/NSDManagement-API/PNFDArchiveManifest.robot
@@ -1,95 +1,95 @@
-*** Settings ***
-Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt    # Generic Parameters
-Resource          NSDManagementKeywords.robot
-Library           JSONLibrary
-Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
-Library           OperatingSystem
-
-*** Test Cases ***
-Get PNFD Archive Manifest
-    [Documentation]    Test ID: 5.3.1.14.1
-    ...    Test title: Get PNFD Archive Manifest
-    ...    Test objective: The objective is to test that GET method reads the content of the manifest file within an PNFD archive
-    ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7b.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get PNFD Archive Manifest
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    text/plain
-    
-Get PNFD Archive Manifest with security information
-    [Documentation]    Test ID: 5.3.1.14.2
-    ...    Test title: Get PNFD Archive Manifest with security information
-    ...    Test objective: The objective is to test the retrieval of content of the manifest file within an PNFD archive shall include in the ZIP archive the security information when requested with "include_signature" parameter
-    ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7b.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get PNFD Archive Manifest with security information
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
-    
-Get PNFD Archive Manifest with conflict due to onboarding state
-    [Documentation]    Test ID: 5.3.1.14.3
-    ...    Test title: Get PNFD Archive Manifest with conflict due to onboarding state
-    ...    Test objective: The objective is to test that the retrieval of content of the manifest file within an PNFD archive fails due to a conflict when the PNFD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
-    ...    Pre-conditions: The onboarding state of the PNFD is different from ONBOARDED.
-    ...    Reference: Clause 5.4.7b.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Get PNFD Archive Manifest with conflict due to onboarding state
-    Check HTTP Response Status Code Is    409
-    Check HTTP Response Body Json Schema Is   ProblemDetails  
-    
-POST PNFD Archive Manifest - Method not implemented
-    [Documentation]    Test ID: 5.3.1.14.4
-    ...    Test title: POST PNFD Archive Manifest - Method not implemented
-    ...    Test objective: The objective is to test that POST method is not allowed to create a new Network Service Descriptor Archive Manifest
-    ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7b.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send POST Request for PNFD Archive Manifest
-    Check HTTP Response Status Code Is    405
-    
-PUT PNFD Archive Manifest - Method not implemented
-    [Documentation]    Test ID: 5.3.1.14.5
-    ...    Test title: PUT PNFD Archive Manifest - Method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor Archive Manifest
-    ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7b.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send PUT Request for PNFD Archive Manifest
-    Check HTTP Response Status Code Is    405
-
-PATCH PNFD Archive Manifest - Method not implemented
-    [Documentation]    Test ID: 5.3.1.14.6
-    ...    Test title: PATCH PNFD Archive Manifest - Method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor Archive Manifest
-    ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7b.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send PATCH Request for PNFD Archive Manifest
-    Check HTTP Response Status Code Is    405
-
-DELETE PNFD Archive Manifest - Method not implemented
-    [Documentation]    Test ID: 5.3.1.14.7
-    ...    Test title: DELETE PNFD Archive Manifest - Method not implemented
-    ...    Test objective: The objective is to test that DELETE method is not allowed to delete Network Service Descriptor Archive Manifest
-    ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7b.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send DELETE Request for PNFD Archive Manifest
+*** Settings ***
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt    # Generic Parameters
+Resource          NSDManagementKeywords.robot
+Library           JSONLibrary
+Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+Library           OperatingSystem
+
+*** Test Cases ***
+Get PNFD Archive Manifest
+    [Documentation]    Test ID: 5.3.1.14.1
+    ...    Test title: Get PNFD Archive Manifest
+    ...    Test objective: The objective is to test that GET method reads the content of the manifest file within an PNFD archive
+    ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.7b.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get PNFD Archive Manifest
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    text/plain
+    
+Get PNFD Archive Manifest with security information
+    [Documentation]    Test ID: 5.3.1.14.2
+    ...    Test title: Get PNFD Archive Manifest with security information
+    ...    Test objective: The objective is to test the retrieval of content of the manifest file within an PNFD archive shall include in the ZIP archive the security information when requested with "include_signature" parameter
+    ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
+    ...    Reference: Clause 5.4.7b.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get PNFD Archive Manifest with security information
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get PNFD Archive Manifest with conflict due to onboarding state
+    [Documentation]    Test ID: 5.3.1.14.3
+    ...    Test title: Get PNFD Archive Manifest with conflict due to onboarding state
+    ...    Test objective: The objective is to test that the retrieval of content of the manifest file within an PNFD archive fails due to a conflict when the PNFD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: The onboarding state of the PNFD is different from ONBOARDED.
+    ...    Reference: Clause 5.4.7b.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Get PNFD Archive Manifest with conflict due to onboarding state
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails  
+    
+POST PNFD Archive Manifest - Method not implemented
+    [Documentation]    Test ID: 5.3.1.14.4
+    ...    Test title: POST PNFD Archive Manifest - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not allowed to create a new Network Service Descriptor Archive Manifest
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.7b.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send POST Request for PNFD Archive Manifest
+    Check HTTP Response Status Code Is    405
+    
+PUT PNFD Archive Manifest - Method not implemented
+    [Documentation]    Test ID: 5.3.1.14.5
+    ...    Test title: PUT PNFD Archive Manifest - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor Archive Manifest
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.7b.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PUT Request for PNFD Archive Manifest
+    Check HTTP Response Status Code Is    405
+
+PATCH PNFD Archive Manifest - Method not implemented
+    [Documentation]    Test ID: 5.3.1.14.6
+    ...    Test title: PATCH PNFD Archive Manifest - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor Archive Manifest
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.7b.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PATCH Request for PNFD Archive Manifest
+    Check HTTP Response Status Code Is    405
+
+DELETE PNFD Archive Manifest - Method not implemented
+    [Documentation]    Test ID: 5.3.1.14.7
+    ...    Test title: DELETE PNFD Archive Manifest - Method not implemented
+    ...    Test objective: The objective is to test that DELETE method is not allowed to delete Network Service Descriptor Archive Manifest
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.7b.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send DELETE Request for PNFD Archive Manifest
     Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/environment/variables.txt b/SOL005/NSDManagement-API/environment/variables.txt
index 7fd3ab762..71dfea8be 100644
--- a/SOL005/NSDManagement-API/environment/variables.txt
+++ b/SOL005/NSDManagement-API/environment/variables.txt
@@ -2,12 +2,13 @@
 ${NFVO_HOST}    localhost    # Hostname of the NFVO
 ${NFVO_PORT}    8081    # Listening port of the NFVO
 ${NFVO_SCHEMA}    https
-${AUTHORIZATION}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
+${AUTHORIZATION_HEADER}    Authorization
+${AUTHORIZATION_TOKEN}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 ${CONTENT_TYPE_JSON}    application/json
 ${ACCEPT_JSON}    application/json
 ${apiRoot}        /
 ${AUTH_USAGE}     1
-${NEG_AUTHORIZATION}    Bearer negativetoken
+${NEG_AUTHORIZATION_TOKEN}    Bearer negativetoken
 ${apiMajorVersion}     v1
 ${apiName}        nsd
 ${FIELD_USAGE}    1
@@ -67,7 +68,7 @@ ${onboardingStateNsdInfoId}    b992a851-08b1-45a8-9282-a5f7a7df04a6
 ${contentZipNsd}    files/nsd.zip
 ${contentFileNsd}    files/nsd.yml
 ${creatingNsdInfoId}    71241932-994a-46e2-ad6c-1740674dda44
-${BAD_AUTHORIZATION}    Bear sometoken
+${BAD_AUTHORIZATION_TOKEN}    Bear sometoken
 ${original_etag}    1234
 ${wrong_etag}    abcd
 ${usageState}    state
diff --git a/SOL005/NSFaultManagement-API/ApiVersion.robot b/SOL005/NSFaultManagement-API/ApiVersion.robot
index 5b8291f74..663f8b96d 100644
--- a/SOL005/NSFaultManagement-API/ApiVersion.robot
+++ b/SOL005/NSFaultManagement-API/ApiVersion.robot
@@ -133,70 +133,70 @@ DELETE API Version with apiMajorVerion - Method not implemented
 *** Keywords ***
 POST API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
diff --git a/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot b/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
index d67a251d2..414f1a847 100644
--- a/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
+++ b/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
@@ -18,7 +18,7 @@ Create Sessions
     
 Check Individual Subscription existence
     Set Headers    {"Accept":"${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
     Integer    response status    200
     
@@ -60,7 +60,7 @@ Check Operation Occurrence Id
 POST Alarms
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
@@ -68,7 +68,7 @@ POST Alarms
 PATCH Alarms
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse} =    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
@@ -76,7 +76,7 @@ PATCH Alarms
 PUT Alarms
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
@@ -84,7 +84,7 @@ PUT Alarms
 DELETE Alarms
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -92,7 +92,7 @@ DELETE Alarms
 GET Alarms
     Log    Query NFVO The GET method queries information about multiple alarms.
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response
@@ -101,7 +101,7 @@ GET Alarms
 GET Alarms With Filters
 	Log    Query NFVO The GET method queries information about multiple alarms with filters.
 	Set Headers  {"Accept":"${ACCEPT}"}  
-	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
 	Log    Execute Query
 	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?${alarm_filter}=${nsInstanceId}
 	${outputResponse}=    Output    response
@@ -110,7 +110,7 @@ GET Alarms With Filters
 GET Alarms With Invalid Filters
 	Log    Query NFVO The GET method queries information about multiple alarms with filters.
 	Set Headers  {"Accept":"${ACCEPT}"}  
-	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
 	Log    Execute Query
 	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?${invalid_alarm_filter}=${nsInstanceId}
 	${outputResponse}=    Output    response
@@ -118,35 +118,35 @@ GET Alarms With Invalid Filters
 GET Alarms Task with all_fields attribute selector
     Log    Query VNF The GET method queries information about multiple alarms, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 GET Alarms Task with exclude_default attribute selector
     Log    Query VNF The GET method queries information about multiple alarms, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 GET Alarms Task with fields attribute selector
     Log    Query VNF The GET method queries information about multiple alarms, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 GET Alarms Task with exclude_fields attribute selector
     Log    Query VNF The GET method queries information about multiple alarms, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}    
 POST Individual Alarm
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
@@ -154,7 +154,7 @@ POST Individual Alarm
 DELETE Individual Alarm
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -162,7 +162,7 @@ DELETE Individual Alarm
 PUT Individual Alarm
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -171,7 +171,7 @@ GET Individual Alarm
     Log    Query NFVO The GET method queries information about an alarm.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query 
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${outputResponse}=    Output    response
@@ -181,7 +181,7 @@ GET Invalid Individual Alarm
     Log    Query NFVO The GET method queries information about an invalid alarm. Should return does not exist
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query 
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${invalidAlarmId}
     ${outputResponse}=    Output    response
@@ -191,7 +191,7 @@ PATCH Individual Alarm
     log    Trying to perform a PATCH. This method modifies an individual alarm resource
     Set Headers  {"Accept":"${ACCEPT}"} 
     Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/alarmModifications.json
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}    ${body}
     ${outputResponse}=    Output    response
@@ -202,7 +202,7 @@ PATCH Individual Alarm Conflict
     Set Headers  {"Accept":"${ACCEPT}"} 
     Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
     Set Headers    {"If-Match": "${Etag}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/alarmModifications.json
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}    ${body}
     ${outputResponse}=    Output    response
@@ -212,7 +212,7 @@ POST Subscription
     Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
@@ -224,7 +224,7 @@ POST Subscription
     # Pass Execution If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 0    NVFO is not permitting duplication. Skipping the test
     # Set Headers    {"Accept": "${ACCEPT}"}
     # Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    # Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    # Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     # ${template}=    Get File    jsons/fmSubscriptionRequest.json
     # ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     # Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}		
@@ -236,7 +236,7 @@ POST Subscription
     # Pass Execution If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 1    NVFO permits duplication. Skipping the test
     # Set Headers    {"Accept": "${ACCEPT}"}
     # Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    # Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    # Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     # ${template}=    Get File    jsons/fmSubscriptionRequest.json
     # ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     # Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
@@ -246,7 +246,7 @@ POST Subscription
 GET Subscriptions
     Log    Get the list of active subscriptions
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -254,7 +254,7 @@ GET Subscriptions
 GET Subscriptions with filter
     Log    Get the list of active subscriptions using a filter
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}    
@@ -262,7 +262,7 @@ GET Subscriptions with filter
 GET Subscriptions with Invalid filter   
     Log    Get the list of active subscriptions using an invalid filter
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter_invalid}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -270,35 +270,35 @@ GET Subscriptions with Invalid filter
 Get subscriptions with all_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get subscriptions with exclude_default attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get subscriptions with fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 Get subscriptions with exclude_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}     
 PUT Subscriptions
     log    Trying to perform a PUT Subscriptions. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -306,7 +306,7 @@ PUT Subscriptions
 PATCH Subscriptions
     log    Trying to perform a PATCH Subscriptions. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -314,7 +314,7 @@ PATCH Subscriptions
 DELETE Subscriptions
     log    Trying to perform a DELETE Subscriptions. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -322,7 +322,7 @@ DELETE Subscriptions
 POST Individual Subscription
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -330,7 +330,7 @@ POST Individual Subscription
 GET Individual Subscription
     log    Trying to get information about an individual subscription
     Set Headers    {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}   
@@ -338,7 +338,7 @@ GET Individual Subscription
 PUT Individual Subscription
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -346,7 +346,7 @@ PUT Individual Subscription
 PATCH Individual Subscription
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -354,7 +354,7 @@ PATCH Individual Subscription
 DELETE Individual Subscription
     log    Trying to perform a DELETE.
     Set Headers  {"Accept":"${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -435,7 +435,7 @@ Check HTTP Response Header Contains Location
 GET Alarm With Filter "id"
 	Log    Query NFVO The GET method queries information about multiple alarms with filter "id".
 	Set Headers  {"Accept":"${ACCEPT}"}  
-	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
 	Log    Execute Query
 	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?id=${alarmId}
 	${outputResponse}=    Output    response
@@ -447,7 +447,7 @@ Check PostCondition HTTP Response Body alarms Matches the requested attribute-ba
 GET Alarms With Filter "rootCauseFaultyComponent_faultyNestedNsInstanceId"
 	Log    Query NFVO The GET method queries information about multiple alarms with filter "rootCauseFaultyComponent.faultyNestedNsInstanceId".
 	Set Headers  {"Accept":"${ACCEPT}"}  
-	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
 	Log    Execute Query
 	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?rootCauseFaultyComponent.faultyNestedNsInstanceId=${faultyNestedNsInstanceId}
 	${outputResponse}=    Output    response
@@ -461,7 +461,7 @@ Check PostCondition HTTP Response Body alarms Matches the requested attribute-ba
 GET Alarms With Filter "rootCauseFaultyComponent_faultyNsVirtualLinkInstanceId"
 	Log    Query NFVO The GET method queries information about multiple alarms with filter "rootCauseFaultyComponent.faultyNsVirtualLinkInstanceId".
 	Set Headers  {"Accept":"${ACCEPT}"}  
-	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
 	Log    Execute Query
 	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?rootCauseFaultyComponent.faultyNsVirtualLinkInstanceId=${faultyNsVirtualLinkInstanceId}
 	${outputResponse}=    Output    response
@@ -475,7 +475,7 @@ Check PostCondition HTTP Response Body alarms Matches the requested attribute-ba
 GET Alarms With Filter "rootCauseFaultyComponent_faultyVnfInstanceId"
 	Log    Query NFVO The GET method queries information about multiple alarms with filter "rootCauseFaultyComponent.faultyVnfInstanceId".
 	Set Headers  {"Accept":"${ACCEPT}"}  
-	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
 	Log    Execute Query
 	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?rootCauseFaultyComponent.faultyVnfInstanceId=${faultyVnfInstanceId}
 	${outputResponse}=    Output    response
@@ -489,7 +489,7 @@ Check PostCondition HTTP Response Body alarms Matches the requested attribute-ba
 GET Alarms With Filter "rootCauseFaultyResource_faultyResourceType"
 	Log    Query NFVO The GET method queries information about multiple alarms with filter "rootCauseFaultyResource.faultyResourceType".
 	Set Headers  {"Accept":"${ACCEPT}"}  
-	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
 	Log    Execute Query
 	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?rootCauseFaultyResource.faultyResourceType=${faultyResourceType}
 	${outputResponse}=    Output    response
@@ -503,7 +503,7 @@ Check PostCondition HTTP Response Body alarms Matches the requested attribute-ba
 GET Alarms with filter "eventType"
 	Log    Query VNF The GET method queries information about multiple alarms with filters "eventType".
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?eventType=${eventType}
     ${outputResponse}=    Output    response
@@ -517,7 +517,7 @@ Check PostCondition HTTP Response Body alarms Matches the requested attribute-ba
 GET Alarms with filter "perceivedSeverity"
 	Log    Query VNF The GET method queries information about multiple alarms with filters "perceivedSeverity".
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?perceivedSeverity=${perceivedSeverity}
     ${outputResponse}=    Output    response
@@ -531,7 +531,7 @@ Check PostCondition HTTP Response Body alarms Matches the requested attribute-ba
 GET Alarms with filter "probableCause"
 	Log    Query VNF The GET method queries information about multiple alarms with filters "probableCause".
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?probableCause=${probableCause}
     ${outputResponse}=    Output    response
@@ -545,7 +545,7 @@ Check PostCondition HTTP Response Body alarms Matches the requested attribute-ba
 Get subscriptions with filter "id"
     Log    Get the list of active subscriptions using a filter "id"
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?id=${subscription_id}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -556,7 +556,7 @@ Check PostCondition HTTP Response Body Subscription Matches the requested attrib
 Get subscriptions with filter "filter_notificationTypes"
     Log    Get the list of active subscriptions using a filter "filter.notificationTypes"
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.notificationTypes=${notification_type}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -569,7 +569,7 @@ Check PostCondition HTTP Response Body Subscriptions Matches the requested attri
 Get subscriptions with filter "filter_faultyResourceTypes"
     Log    Get the list of active subscriptions using a filter "filter.faultyResourceTypes"
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.faultyResourceTypes=${faultyResourceType}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -582,7 +582,7 @@ Check PostCondition HTTP Response Body Subscriptions Matches the requested attri
 Get subscriptions with filter "filter_perceivedSeverities"
     Log    Get the list of active subscriptions using a filter "filter.perceivedSeverities"
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.perceivedSeverities=${perceivedSeverity}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -595,7 +595,7 @@ Check PostCondition HTTP Response Body Subscriptions Matches the requested attri
 Get subscriptions with filter "filter_eventTypes"
     Log    Get the list of active subscriptions using a filter "filter.eventTypes"
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.eventTypes=${eventType}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -608,7 +608,7 @@ Check PostCondition HTTP Response Body Subscriptions Matches the requested attri
 Get subscriptions with filter "filter_probableCauses"
     Log    Get the list of active subscriptions using a filter "filter.probableCauses"
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.probableCauses=${probableCause}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
diff --git a/SOL005/NSFaultManagement-API/NotificationConsumer.robot b/SOL005/NSFaultManagement-API/NotificationConsumer.robot
index eaeb2cc10..5964b816e 100644
--- a/SOL005/NSFaultManagement-API/NotificationConsumer.robot
+++ b/SOL005/NSFaultManagement-API/NotificationConsumer.robot
@@ -1,93 +1,93 @@
-*** Settings ***
-Library    String
-Library    OperatingSystem
-Resource    environment/variables.txt  
-Library    JSONLibrary
-Library    JSONSchemaLibrary    schemas/
-Library    REST     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}       ssl_verify=false
-Suite Setup    Check resource existence and get CallbackUri
-
-*** Test Cases ***
-NS Fault Alarm Notification
-    [Documentation]    Test ID: 5.3.3.7.1
-    ...    Test title: NS Fault Alarm Notification
-    ...    Test objective: The objective is to test that NS Fault Alarm Notification is delivered with success to the notification consumer
-    ...    Pre-conditions: A NS instance is instantiated, and a subscription for fault alarm notifications is available in the NFVO.
-    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_Notif_Endpoint
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post Alarm Notification
-    Check HTTP Response Status Code Is    204
-    
-NS Fault Alarm Cleared Notification
-    [Documentation]    Test ID: 5.3.3.7.2
-    ...    Test title: NS Fault Alarm Cleared Notification
-    ...    Test objective: The objective is to test that NS Fault Alarm Cleared Notification is delivered with success to the notification consumer
-    ...    Pre-conditions: A NS instance is instantiated, and a subscription for fault alarm cleared notifications is available in the NFVO.
-    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_Notif_Endpoint
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post Alarm Cleared Notification
-    Check HTTP Response Status Code Is    204
-    
-NS Fault Alarm List Rebuilt Notification
-    [Documentation]    Test ID: 5.3.3.7.3
-    ...    Test title: NS Fault Alarm List Rebuilt Notification
-    ...    Test objective: The objective is to test that NS Fault Alarm List Rebuilt Notification is delivered with success to the notification consumer
-    ...    Pre-conditions: A NS instance is instantiated, and a subscription for fault alarm list rebuilt notifications is available in the NFVO.
-    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_Notif_Endpoint
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post Alarm List Rebuilt Notification
-    Check HTTP Response Status Code Is    204
-    
-*** Keywords ***
-Check resource existence and get CallbackUri
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
-    Integer    response status    200
-    Validate Json    response body    FmSubscription.schema.json
-    Set Global Variable    ${callbackResp}    response body callbackUri
-
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings    ${response['status']}    ${expected_status}
-    Log    Status code validated 
-    
-Post Alarm Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/AlarmNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}   
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}
-
-Post Alarm Cleared Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/AlarmClearedNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    alarmId=${alarmId}
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}
-	
-Post Alarm List Rebuilt Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/AlarmListRebuiltNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}   
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
+*** Settings ***
+Library    String
+Library    OperatingSystem
+Resource    environment/variables.txt  
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+Library    REST     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}       ssl_verify=false
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+NS Fault Alarm Notification
+    [Documentation]    Test ID: 5.3.3.7.1
+    ...    Test title: NS Fault Alarm Notification
+    ...    Test objective: The objective is to test that NS Fault Alarm Notification is delivered with success to the notification consumer
+    ...    Pre-conditions: A NS instance is instantiated, and a subscription for fault alarm notifications is available in the NFVO.
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Alarm Notification
+    Check HTTP Response Status Code Is    204
+    
+NS Fault Alarm Cleared Notification
+    [Documentation]    Test ID: 5.3.3.7.2
+    ...    Test title: NS Fault Alarm Cleared Notification
+    ...    Test objective: The objective is to test that NS Fault Alarm Cleared Notification is delivered with success to the notification consumer
+    ...    Pre-conditions: A NS instance is instantiated, and a subscription for fault alarm cleared notifications is available in the NFVO.
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Alarm Cleared Notification
+    Check HTTP Response Status Code Is    204
+    
+NS Fault Alarm List Rebuilt Notification
+    [Documentation]    Test ID: 5.3.3.7.3
+    ...    Test title: NS Fault Alarm List Rebuilt Notification
+    ...    Test objective: The objective is to test that NS Fault Alarm List Rebuilt Notification is delivered with success to the notification consumer
+    ...    Pre-conditions: A NS instance is instantiated, and a subscription for fault alarm list rebuilt notifications is available in the NFVO.
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Alarm List Rebuilt Notification
+    Check HTTP Response Status Code Is    204
+    
+*** Keywords ***
+Check resource existence and get CallbackUri
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    Integer    response status    200
+    Validate Json    response body    FmSubscription.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+    
+Post Alarm Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template} =    Get File    jsons/AlarmNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+
+Post Alarm Cleared Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template} =    Get File    jsons/AlarmClearedNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    alarmId=${alarmId}
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	
+Post Alarm List Rebuilt Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template} =    Get File    jsons/AlarmListRebuiltNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
\ No newline at end of file
diff --git a/SOL005/NSFaultManagement-API/environment/variables.txt b/SOL005/NSFaultManagement-API/environment/variables.txt
index 0ae86d8e1..2214bef51 100644
--- a/SOL005/NSFaultManagement-API/environment/variables.txt
+++ b/SOL005/NSFaultManagement-API/environment/variables.txt
@@ -2,7 +2,8 @@
 ${NFVO_HOST}      localhost    # Hostname of the VNFM
 ${NFVO_PORT}      8080    # Listening port of the VNFM
 ${NFVO_SCHEMA}    https
-${AUTHORIZATION}    Bearer    QWxhZGRpbjpvcGVuIHNlc2FtZQ==
+${AUTHORIZATION_HEADER}    Authorization
+${AUTHORIZATION_TOKEN}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 ${ACCEPT}         application/json
 ${ACCEPT_JSON}         application/json
 ${AUTH_USAGE}     1
diff --git a/SOL005/NSLifecycleManagement-API/ApiVersion.robot b/SOL005/NSLifecycleManagement-API/ApiVersion.robot
index fcbaad59f..d21b76e5e 100644
--- a/SOL005/NSLifecycleManagement-API/ApiVersion.robot
+++ b/SOL005/NSLifecycleManagement-API/ApiVersion.robot
@@ -133,70 +133,70 @@ DELETE API Version with apiMajorVerion - Method not implemented
 *** Keywords ***
 POST API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index 5eefe233d..aa89c7eec 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -31,50 +31,50 @@ Create Sessions
 Check subscription existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
     Integer    response status    200
     
 Check Instance Deleted
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}
     Integer    response status    404
     
 Check Fail not supported
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}
     # how to check if Fail is not supported? Also In Sol002
     
 Check Cancel not supported
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}
     # how to check if Cancel is not supported? Also In Sol002
     
 Check Continue not supported
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}
     # how to check if Continue is not supported? Also In Sol002
     
 Check retry not supported
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}
     # how to check if retry is not supported? Also In Sol002
     
 Check Rollback not supported
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}
     # how to check if rollback is not supported? Also In Sol002
     
 Check resource FAILED_TEMP
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId} 
     String    response body operationState    FAILED_TEMP
 
 Check resource not 
     [Arguments]   ${status}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId} 
     Should Not Be Equal As Strings  response body operationState    ${status}
 
@@ -122,7 +122,7 @@ Check resource Instantiated
 Probe resource Instantiated 
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId} 
     String    response body nsState    INSTANTIATED
 
@@ -133,7 +133,7 @@ Probe resource not_instantiated
     [Arguments]  ${fresh_resource}=0
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log     ${fresh_resource}
     ${instanceId}=  Set Variable If	    ${fresh_resource} == 0   ${nsInstanceId}   ${response['body']['id']}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${instanceId}
@@ -142,7 +142,7 @@ Probe resource not_instantiated
 Check operation resource state is FAILED_TEMP    
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId} 
     String    response body instantiationState    FAILED_TEMP 
     
@@ -150,21 +150,21 @@ Check operation resource state is not FAILED_TEMP
     Check operation resource state is FAILED_TEMP    
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId} 
     String  response body instantiationState  not  FAILED_TEMP
 
 Check resource is finally failed
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId} 
     String    response body instantiationState    FINALLY_FAILED 
 
 Launch another LCM operation
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/scaleNsToLevelRequest.json
     ${body}=        Format String   ${template}     instantiationLevelId=${instantiationLevelId}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/scale_to_level    ${body}
@@ -173,7 +173,7 @@ Launch another LCM operation
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId} 
     Integer    response status    200
     
@@ -186,7 +186,7 @@ Check HTTP Response Status Code Is
 Check Postcondition NS Instance is deleted
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${disabledNsdId} 
     Integer    response status    404
     
@@ -204,7 +204,7 @@ Check HTTP Response Body Json Schema Is
 Check Postcondition NS Instance is not deleted
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId} 
     Integer    response status    200
     
@@ -218,7 +218,7 @@ POST New nsInstance
     Log    Create NS instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File
     ${template}=    Get File    jsons/CreateNsRequest.json 
     ${body}=        Format String   ${template}     nsdId=${NS_DescriptorID}   nsInstanceName=${nsInstanceName}   vimAccountId=${vimAccountId}   nsInstanceDescription=${nsInstanceDescription}
@@ -369,7 +369,7 @@ POST New nsInstance with DISABLED nsd
     Log    Create NS instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/CreateNsRequest.json 
     ${body}=        Format String   ${template}     nsdId=${disabledNsdId}   nsInstanceName=${nsInstanceName}   vimAccountId=${vimAccountId}   nsInstanceDescription=${nsInstanceDescription}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances    ${body}
@@ -380,7 +380,7 @@ GET NsInstances
     Log    Query NS The GET method queries information about multiple NS instances.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -390,7 +390,7 @@ GET NsInstance Invalid Attribute-Based filtering parameter
     Log    Query NS The GET method queries information about multiple NS instances.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get   ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances?attribute_not_exist=some_value
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -399,7 +399,7 @@ GET NsInstance Invalid Attribute Selector
     Log    Query NS The GET method queries information about multiple NS instances.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"} 
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances?fields=wrong_field	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  
@@ -407,35 +407,35 @@ GET NsInstance Invalid Attribute Selector
 Get NSInstances with all_fields attribute selector
     Log    Get the list of NSInstances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get NSInstances with exclude_default attribute selector
     Log    Get the list of NSInstances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get NSInstances with fields attribute selector
     Log    Get the list of NSInstances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get NSInstances with fields and exclude_default attribute selector
     Log    Get the list of NSInstances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances?fields=${fields}&exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 Get NSInstances with exclude_fields attribute selector
     Log    Get the list of NSInstances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -444,7 +444,7 @@ PUT NSInstances
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}   
@@ -453,7 +453,7 @@ PATCH NSInstances
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  
@@ -462,7 +462,7 @@ DELETE NSInstances
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -471,7 +471,7 @@ POST IndividualNSInstance
     Log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nonExistentNsId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -480,7 +480,7 @@ GET IndividualNSInstance
     Log    Trying to get information about an individual NS instance
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}
     ${Etag}=    Output    response headers ETag
     ${outputResponse}=    Output    response
@@ -491,7 +491,7 @@ PUT IndividualNSInstance
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
@@ -500,14 +500,14 @@ PATCH IndividualNSInstance
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 	
 DELETE IndividualNSInstance
     log    Trying to delete an individual VNF instance
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
@@ -515,7 +515,7 @@ DELETE IndividualNSInstance
 
 DELETE IndividualNSInstance Conflict
     log    Trying to delete an individual VNF instance
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${ConflictNsInstanceId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
@@ -523,7 +523,7 @@ DELETE IndividualNSInstance Conflict
 
 DELETE Instantiate NSInstance
     log    Trying to delete an instantiate NS instance. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/instantiate
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -532,7 +532,7 @@ DELETE Instantiate NSInstance
     log    Trying to patch an instantiate NS instance. This method should not be implemented 
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/instantiate
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -541,7 +541,7 @@ PUT Instantiate NSInstance
     log    Trying to put an instantiate NS instance. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/instantiate
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -550,7 +550,7 @@ GET Instantiate NSInstance
     log    Trying to get an instantiate NS instance. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/instantiate
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -559,7 +559,7 @@ GET Instantiate NSInstance
     Log    Trying to Instantiate a ns Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File
     ${template}=    Get File    jsons/InstantiateNs.json
     ${body}=        Format String   ${template}     nsFlavourId=${nsFlavourId}   vimAccountId=${vimAccountId}   nsdId=${nsdId}    sapdId=${SAP_IDs[0]}
@@ -569,7 +569,7 @@ GET Instantiate NSInstance
 	
 DELETE Scale NSInstance
     log    Trying to delete an Scale NS instance. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/scale
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -578,7 +578,7 @@ DELETE Scale NSInstance
     log    Trying to patch an Scale NS instance. This method should not be implemented 
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/scale
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -587,7 +587,7 @@ PUT Scale NSInstance
     log    Trying to put an Scale NS instance. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/scale
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -596,7 +596,7 @@ GET Scale NSInstance
     log    Trying to get an Scale NS instance. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/scale
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -605,7 +605,7 @@ POST scale nsInstance
 	Log    Trying to Instantiate a scale NS Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File
     ${template}=    Get File    jsons/ScaleNs.json
     ${body}=        Format String   ${template}     scaleType=${scaleType}   scaleTimeout=${scaleTimeout}   scaleVnfType=${scaleVnfType}   scaleGroupDescriptor=${scaleGroupDescriptor}   scaleMemberVnfIndex=${scaleMemberVnfIndex}    vnfInstantiationLevelId=${InstantiationLevel_IDs[0]}
@@ -615,7 +615,7 @@ POST scale nsInstance
 	
 DELETE Update NSInstance
     log    Trying to delete an Update NS instance. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/update
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -624,7 +624,7 @@ DELETE Update NSInstance
     log    Trying to patch an Update NS instance. This method should not be implemented 
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/update
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -633,7 +633,7 @@ PUT Update NSInstance
     log    Trying to put an Update NS instance. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/update
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -642,7 +642,7 @@ GET Update NSInstance
     log    Trying to get an Update NS instance. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/update
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -651,7 +651,7 @@ POST Update NSInstance
 	Log    Trying to Instantiate a Update NS Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File
     Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File  
     ${template} =    Get File    jsons/UpdateNsRequest.json
@@ -662,7 +662,7 @@ POST Update NSInstance
  
 DELETE Heal NSInstance
     log    Trying to Delete an Heal NS instance. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/heal
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -671,7 +671,7 @@ DELETE Heal NSInstance
     log    Trying to patch an Heal NS instance. This method should not be implemented 
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/heal
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -680,7 +680,7 @@ PUT Heal NSInstance
     log    Trying to put an Heal NS instance. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/heal
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -689,7 +689,7 @@ GET Heal NSInstance
     log    Trying to get an Heal NS instance. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/heal
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -698,7 +698,7 @@ POST Heal NSInstance
 	Log    Trying to Instantiate a Heal NS Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/HealNsRequest.json
     ${body}=        Format String   ${template}     nsDegreeHealing=${nsDegreeHealing}
 	Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/heal    ${body}
@@ -707,7 +707,7 @@ POST Heal NSInstance
 	
 DELETE Terminate NSInstance
     log    Trying to Delete an Terminate NS instance. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/terminate
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -716,7 +716,7 @@ PATCH Terminate NSInstance
     log    Trying to patch an Terminate NS instance. This method should not be implemented 
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/terminate
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -725,7 +725,7 @@ PUT Terminate NSInstance
     log    Trying to put an Terminate NS instance. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/terminate
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -734,7 +734,7 @@ GET Terminate NSInstance
     log    Trying to Get an Terminate NS instance. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/terminate
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -743,7 +743,7 @@ POST Terminate NSInstance
 	Log    Trying to Instantiate a Terminate NS Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/TerminateNsRequest.json
 	Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/terminate    ${body}
     ${outputResponse}=    Output    response
@@ -752,7 +752,7 @@ POST Terminate NSInstance
 POST NS LCM OP Occurrences
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -760,7 +760,7 @@ POST NS LCM OP Occurrences
 PUT NS LCM OP Occurrences
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -768,7 +768,7 @@ PUT NS LCM OP Occurrences
 PATCH NS LCM OP Occurrences
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -776,7 +776,7 @@ PATCH NS LCM OP Occurrences
 DELETE NS LCM OP Occurrences
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -784,7 +784,7 @@ DELETE NS LCM OP Occurrences
 GET NS LCM OP Occurrences
     Log    Query status information about multiple NS lifecycle management operation occurrences.
 	Set Headers  {"Accept":"${ACCEPT}"}  
-	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
 	Log    Execute Query and validate response
 	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs
 	${outputResponse}=    Output    response
@@ -793,7 +793,7 @@ GET NS LCM OP Occurrences
 GET NS LCM OP Occurrences Invalid attribute-based filtering parameters
     Log    Query status information about multiple NS lifecycle management operation occurrences.
 	Set Headers  {"Accept":"${ACCEPT}"}  
-	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"} 
+	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"} 
 	GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs?${NEG_FILTER}
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -801,42 +801,42 @@ GET NS LCM OP Occurrences Invalid attribute-based filtering parameters
 GET NS LCM OP Occurrences Invalid attribute selector
     Log    Query status information about multiple NS lifecycle management operation occurrences.
     Set Headers  {"Accept":"${ACCEPT}"}  
-	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"} 
+	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"} 
 	GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs?${NEG_SELECTOR}
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 Get NS LCM OP Occurrences with all_fields attribute selector
     Log    Query status information about multiple NS lifecycle management operation occurrences, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get NS LCM OP Occurrences with exclude_default attribute selector
     Log    Query status information about multiple NS lifecycle management operation occurrences using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get NS LCM OP Occurrences with fields attribute selector
     Log    Query status information about multiple NS lifecycle management operation occurrences, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get NS LCM OP Occurrences with fields and exclude_default attribute selector
     Log    Query status information about multiple NS lifecycle management operation occurrences, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs?fields=${fields}&exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 Get NS LCM OP Occurrences with exclude_fields attribute selector
     Log    Query status information about multiple NS lifecycle management operation occurrences, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -844,7 +844,7 @@ Get NS LCM OP Occurrences with exclude_fields attribute selector
 POST Individual NS LCM OP Occurrence
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId} 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -852,7 +852,7 @@ POST Individual NS LCM OP Occurrence
 PUT Individual NS LCM OP Occurrence
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId} 		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -860,7 +860,7 @@ PUT Individual NS LCM OP Occurrence
 PATCH Individual NS LCM OP Occurrence
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId} 	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -868,7 +868,7 @@ PATCH Individual NS LCM OP Occurrence
 DELETE Individual NS LCM OP Occurrence
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId} 	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -876,7 +876,7 @@ DELETE Individual NS LCM OP Occurrence
 GET Individual NS LCM OP Occurrence
     Log    Query status information about individual NS lifecycle management operation occurrence.
 	Set Headers  {"Accept":"${ACCEPT}"}  
-	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
 	Log    Execute Query and validate response
 	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId} 
 	${outputResponse}=    Output    response
@@ -884,14 +884,14 @@ GET Individual NS LCM OP Occurrence
 	
 GET Retry operation task
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/retry 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PUT Retry operation task
     log    Trying to perform a PUT. This method should not be implemented 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/retry  		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -905,14 +905,14 @@ PATCH Retry operation task
 	
 DELETE Retry operation task
     log    Trying to perform a DELETE. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/retry  	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 POST Retry operation task
     Log    Retry a NS lifecycle operation if that operation has experienced a temporary failure
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/retry
     ${outputResponse}=    Output    response
@@ -920,14 +920,14 @@ POST Retry operation task
 	
 GET Rollback operation task
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/rollback 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PUT Rollback operation task
     log    Trying to perform a PUT. This method should not be implemented 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/rollback  		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -941,14 +941,14 @@ PATCH Rollback operation task
 	
 DELETE Rollback operation task
     log    Trying to perform a DELETE. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/rollback  	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 POST Rollback operation task
     Log    Rollback a NS lifecycle operation task
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/rollback
     ${outputResponse}=    Output    response
@@ -956,14 +956,14 @@ POST Rollback operation task
 	
 GET Continue operation task
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/continue 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PUT Continue operation task
     log    Trying to perform a PUT. This method should not be implemented 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/continue  		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -977,14 +977,14 @@ PATCH Continue operation task
 	
 DELETE Continue operation task
     log    Trying to perform a DELETE. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/continue  	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 POST Continue operation task
     Log    Continue a NS lifecycle operation task
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/continue
     ${outputResponse}=    Output    response
@@ -992,14 +992,14 @@ POST Continue operation task
 
 GET Fail operation task
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/fail 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PUT Fail operation task
     log    Trying to perform a PUT. This method should not be implemented 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/fail  		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -1013,14 +1013,14 @@ PATCH Fail operation task
 	
 DELETE Fail operation task
     log    Trying to perform a DELETE. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/fail  	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 POST Fail operation task
     Log    Fail a NS lifecycle operation task
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/fail
     ${outputResponse}=    Output    response
@@ -1028,14 +1028,14 @@ POST Fail operation task
 	
 GET Cancel operation task
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/cancel 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PUT Cancel operation task
     log    Trying to perform a PUT. This method should not be implemented 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/cancel  		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -1049,14 +1049,14 @@ PATCH Cancel operation task
 	
 DELETE Cancel operation task
     Log    Trying to perform a DELETE. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/cancel  	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 POST Cancel operation task
     Log    Cancel a NS lifecycle operation task
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_lcm_op_occs/${nsLcmOpOccId}/cancel
     ${outputResponse}=    Output    response
@@ -1066,7 +1066,7 @@ PUT subscriptions
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -1075,7 +1075,7 @@ PATCH subscriptions
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -1084,7 +1084,7 @@ DELETE subscriptions
     Log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -1093,7 +1093,7 @@ POST subscriptions
     Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File
     ${template}=    Get File    jsons/LccnSubscriptionRequest.json
     ${body}=        Format String   ${template}     callbackUri=${callback_uri}   callbackEndpoint=${callback_endpoint}   callbackPort=${callback_port}   nsdId=${NS_DescriptorID}
@@ -1106,7 +1106,7 @@ POST subscriptions DUPLICATION
     Pass Execution If    ${NFVO_DUPLICATION} == 0    NFVO is not permitting duplication. Skipping the test
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File
     ${template}=    Get File    jsons/LccnSubscriptionRequest.json
     ${body}=        Format String   ${template}     callbackUri=${callback_uri}   callbackEndpoint=${callback_endpoint}   callbackPort=${callback_port}     nsdId=${NS_DescriptorID}
@@ -1119,7 +1119,7 @@ POST subscriptions NO DUPLICATION
     Pass Execution If    ${NFVO_DUPLICATION} == 1    NFVO is permitting duplication.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File
     ${template}=    Get File    jsons/LccnSubscriptionRequest.json
     ${body}=        Format String   ${template}     callbackUri=${callback_uri}   callbackEndpoint=${callback_endpoint}   callbackPort=${callback_port}     nsdId=${NS_DescriptorID}
@@ -1131,7 +1131,7 @@ GET Subscriptions
     Log    Get the list of active subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${outputResponse}=    Output    response
@@ -1140,28 +1140,28 @@ GET Subscriptions
 Get subscriptions with all_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?all_fields
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get subscriptions with exclude_default attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get subscriptions with fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 Get subscriptions with exclude_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}     
@@ -1169,7 +1169,7 @@ Get subscriptions with exclude_fields attribute selector
 GET subscriptions with filter  
     Log    Get the list of active subscriptions using a filter
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -1177,7 +1177,7 @@ GET subscriptions with filter
 Get subscriptions - invalid filter
     Log    Get the list of active subscriptions using an invalid filter
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter_invalid} 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -1186,7 +1186,7 @@ POST Individual Subscription
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  
@@ -1195,7 +1195,7 @@ PUT Individual Subscription
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  
@@ -1204,7 +1204,7 @@ PATCH Individual Subscription
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -1212,7 +1212,7 @@ PATCH Individual Subscription
 GET Individual subscription
     log    Trying to get information about an individual subscription
     Set Headers    {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -1220,7 +1220,7 @@ GET Individual subscription
 DELETE Individual subscription
     log    Try to delete an individual subscription
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}    
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
diff --git a/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot b/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot
index 5944b173e..09fc94e3e 100644
--- a/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot
+++ b/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot
@@ -1,97 +1,97 @@
-*** Settings ***
-Library    String
-Resource   environment/variables.txt   
-Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=false
-Library    OperatingSystem
-Library    JSONLibrary
-Library    JSONSchemaLibrary    schemas/
-Resource   NSLCMOperationKeywords.robot   
-
-Suite Setup    Check resource existence and get CallbackUri
-
-*** Test Cases ***
-Ns Lcm Operation Occurrence Notification
-    [Documentation]    Test ID: 5.3.2.26.1
-    ...    Test title: Ns Lcm Operation Occurrence Notification
-    ...    Test objective: The objective is to test that Ns Lcm Operation Occurrence Notification is delivered with success to the notification consumer.
-    ...    Pre-conditions: A subscription for NS LCM Operation Occurrence notifications is available in the NFVO.
-    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_Notif_Endpoint
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post Ns Lcm Operation Occurrence Notification
-    Check HTTP Response Status Code Is    204
-    
-Ns Identifier Creation Notification
-    [Documentation]    Test ID: 5.3.2.26.2
-    ...    Test title: Ns Identifier Creation Notification
-    ...    Test objective: The objective is to test that Ns Identifier Creation Notification is delivered with success to the notification consumer.
-    ...    Pre-conditions: A subscription for Ns Identifier Creation notification is available in the NFVO.
-    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_Notif_Endpoint
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post Ns Identifier Creation Notification
-    Check HTTP Response Status Code Is    204
-    
-Ns Identifier Deletion Notification
-    [Documentation]    Test ID: 5.3.2.26.3
-    ...    Test title: Ns Identifier Deletion Notification
-    ...    Test objective: The objective is to test that Ns Identifier Deletion Notification is delivered with success to the notification consumer.
-    ...    Pre-conditions: A subscription for Ns Identifier Deletion notification is available in the NFVO.
-    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_Notif_Endpoint
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post Ns Identifier Deletion Notification
-    Check HTTP Response Status Code Is    204
-    
-*** Keywords ***
-Check resource existence and get CallbackUri
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
-    Integer    response status    200
-    Validate Json    response body    subscription.schema.json
-    Set Global Variable    ${callbackResp}    response body callbackUri
-
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings    ${response['status']}    ${expected_status}
-    Log    Status code validated 
-    
-Post Ns Lcm Operation Occurrence Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File
-    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File
-    ${template} =    Get File    jsons/NsLcmOperationOccurrenceNotification.json
-    ${body}=        Format String   ${template}    nsInstanceId=${nsInstanceId}    nsLcmOpOccId=${nsLcmOpOccId}    subscriptionId=${subscriptionId}    vnfdId=${Descriptor_ID}    nsdId=${NS_DescriptorID}  
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}
-		
-Post Ns Identifier Creation Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/NsIdentifierCreationNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsInstanceId=${nsInstanceId}   
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}
-	
-Post Ns Identifier Deletion Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/NsIdentifierDeletionNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsInstanceId=${nsInstanceId}   
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}
+*** Settings ***
+Library    String
+Resource   environment/variables.txt   
+Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=false
+Library    OperatingSystem
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+Resource   NSLCMOperationKeywords.robot   
+
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+Ns Lcm Operation Occurrence Notification
+    [Documentation]    Test ID: 5.3.2.26.1
+    ...    Test title: Ns Lcm Operation Occurrence Notification
+    ...    Test objective: The objective is to test that Ns Lcm Operation Occurrence Notification is delivered with success to the notification consumer.
+    ...    Pre-conditions: A subscription for NS LCM Operation Occurrence notifications is available in the NFVO.
+    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Ns Lcm Operation Occurrence Notification
+    Check HTTP Response Status Code Is    204
+    
+Ns Identifier Creation Notification
+    [Documentation]    Test ID: 5.3.2.26.2
+    ...    Test title: Ns Identifier Creation Notification
+    ...    Test objective: The objective is to test that Ns Identifier Creation Notification is delivered with success to the notification consumer.
+    ...    Pre-conditions: A subscription for Ns Identifier Creation notification is available in the NFVO.
+    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Ns Identifier Creation Notification
+    Check HTTP Response Status Code Is    204
+    
+Ns Identifier Deletion Notification
+    [Documentation]    Test ID: 5.3.2.26.3
+    ...    Test title: Ns Identifier Deletion Notification
+    ...    Test objective: The objective is to test that Ns Identifier Deletion Notification is delivered with success to the notification consumer.
+    ...    Pre-conditions: A subscription for Ns Identifier Deletion notification is available in the NFVO.
+    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Ns Identifier Deletion Notification
+    Check HTTP Response Status Code Is    204
+    
+*** Keywords ***
+Check resource existence and get CallbackUri
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    Integer    response status    200
+    Validate Json    response body    subscription.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+    
+Post Ns Lcm Operation Occurrence Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File
+    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File
+    ${template} =    Get File    jsons/NsLcmOperationOccurrenceNotification.json
+    ${body}=        Format String   ${template}    nsInstanceId=${nsInstanceId}    nsLcmOpOccId=${nsLcmOpOccId}    subscriptionId=${subscriptionId}    vnfdId=${Descriptor_ID}    nsdId=${NS_DescriptorID}  
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+		
+Post Ns Identifier Creation Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template} =    Get File    jsons/NsIdentifierCreationNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsInstanceId=${nsInstanceId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	
+Post Ns Identifier Deletion Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template} =    Get File    jsons/NsIdentifierDeletionNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsInstanceId=${nsInstanceId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
diff --git a/SOL005/NSLifecycleManagement-API/environment/variables.txt b/SOL005/NSLifecycleManagement-API/environment/variables.txt
index b1eb55915..dd923a049 100644
--- a/SOL005/NSLifecycleManagement-API/environment/variables.txt
+++ b/SOL005/NSLifecycleManagement-API/environment/variables.txt
@@ -6,7 +6,8 @@ ${NFVO_PORT}      8081    # Listening port of the NFVO
 ${VNFM_SCHEMA}    https
 ${NFVO_SCHEMA}    https
 
-${AUTHORIZATION}    Bearer    QWxhZGRpbjpvcGVuIHNlc2FtZQ==
+${AUTHORIZATION_HEADER}    Authorization
+${AUTHORIZATION_TOKEN}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 ${CONTENT_TYPE}    application/json
 ${CONTENT_TYPE_PATCH}    application/merge-patch+json
 ${ACCEPT_JSON}         application/json
diff --git a/SOL005/NSPerformanceManagement-API/ApiVersion.robot b/SOL005/NSPerformanceManagement-API/ApiVersion.robot
index 8619b4931..a0ca7d926 100644
--- a/SOL005/NSPerformanceManagement-API/ApiVersion.robot
+++ b/SOL005/NSPerformanceManagement-API/ApiVersion.robot
@@ -133,70 +133,70 @@ DELETE API Version with apiMajorVerion - Method not implemented
 *** Keywords ***
 POST API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
diff --git a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
index d70330ae1..d1cef9426 100644
--- a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
+++ b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
@@ -14,7 +14,7 @@ Library    String
 GET all NS Performance Monitoring Jobs
     Log    Trying to get all PM Jobs present in the NFVO
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -22,7 +22,7 @@ GET all NS Performance Monitoring Jobs
 GET NS Performance Monitoring Jobs with attribute-based filter
     Log    Trying to get all PM Jobs present in the NFVO, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?${POS_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -30,7 +30,7 @@ GET NS Performance Monitoring Jobs with attribute-based filter
 GET NS Performance Monitoring Jobs with all_fields attribute selector
     Log    Trying to get all PM Jobs present in the NFVO, using 'all_fields' filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?all_fields
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -38,7 +38,7 @@ GET NS Performance Monitoring Jobs with all_fields attribute selector
 GET NS Performance Monitoring Jobs with exclude_default attribute selector
     Log    Trying to get all NS Packages present in the NFVO, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -47,7 +47,7 @@ GET NS Performance Monitoring Jobs with fields attribute selector
     Log    Trying to get all NS Packages present in the NFVO, using filter params
     Pass Execution If    ${FIELD_USAGE} == 0    Skipping test as NFVO is not supporting 'fields'
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -56,7 +56,7 @@ GET NS Performance Monitoring Jobs with fields and exclude_default attribute sel
     Log    Trying to get all NS Packages present in the NFVO, using filter params
     Pass Execution If    ${FIELD_USAGE} == 0    Skipping test as NFVO is not supporting 'fields'
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?fields=${fields}&exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -65,7 +65,7 @@ GET NS Performance Monitoring Jobs with exclude attribute selector
     Log    Trying to get all NS Packages present in the NFVO, using filter params
     Pass Execution If    ${FIELD_USAGE} == 0    Skipping test as NFVO is not supporting 'fields'
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?exclude=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -73,7 +73,7 @@ GET NS Performance Monitoring Jobs with exclude attribute selector
 GET NS Performance Monitoring Jobs with invalid attribute-based filter
     Log    Trying to get all PM Jobs present in the NFVO, using an erroneous filter param
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?${NEG_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -81,7 +81,7 @@ GET NS Performance Monitoring Jobs with invalid attribute-based filter
 GET NS Performance Monitoring Jobs with invalid resource endpoint    
     Log    Trying to perform a GET on a erroneous URI
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_job    # wrong URI /pm_job instead of /pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -90,7 +90,7 @@ Send Post Request Create new NS Performance Monitoring Job
     Log    Creating a new PM Job
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/CreatePmJobRequest.json
     ${body}=        Format String   ${template}     pmJobId=${pmJobId}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs    ${body}
@@ -100,7 +100,7 @@ Send Post Request Create new NS Performance Monitoring Job
 Send PUT Request for all NS Performance Monitoring Jobs 
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -108,7 +108,7 @@ Send PUT Request for all NS Performance Monitoring Jobs
 Send PATCH Request for all NS Performance Monitoring Jobs 
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -116,7 +116,7 @@ Send PATCH Request for all NS Performance Monitoring Jobs
 Send DELETE Request for all NS Performance Monitoring Jobs 
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -125,7 +125,7 @@ Send DELETE Request for all NS Performance Monitoring Jobs
 Check Postcondition PmJob Exists
     Log    Checking that Pm Job exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -186,7 +186,7 @@ Check HTTP Response Body PmJobs Do Not Contain reports
 GET individual NS Performance Job
     Log    Trying to get a Pm Job present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -194,7 +194,7 @@ GET individual NS Performance Job
 GET individual NS Performance Job with invalid resource identifier  
     Log    Trying to perform a negative get, using erroneous PM Job identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${erroneousPmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -202,7 +202,7 @@ GET individual NS Performance Job with invalid resource identifier
 Send Delete request for individual NS Performance Job
     Log    Trying to delete an existing PM Job
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -210,7 +210,7 @@ Send Delete request for individual NS Performance Job
 Send Delete request for individual NS Performance Job with invalid resource identifier
     Log    Trying to perform a negative delete, using erroneous PM Job identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${erroneousPmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -218,7 +218,7 @@ Send Delete request for individual NS Performance Job with invalid resource iden
 Send Post request for individual NS Performance Job    
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${newPmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -226,7 +226,7 @@ Send Post request for individual NS Performance Job
 Send Put request for individual NS Performance Job    
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -238,7 +238,7 @@ Send Patch request for individual NS Performance Job
     Log    Trying to perform a PATCH 
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/PmJobModifications.json
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}    ${body}
     ${output}=    Output    response
@@ -247,7 +247,7 @@ Send Patch request for individual NS Performance Job
 Check Postcondition NS Performance Job is not Created
     Log    Trying to get a new Pm Job
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${newPmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -275,7 +275,7 @@ Check HTTP Response Body Pm Job Identifier matches the requested Pm Job
 Get Individual Performance Report
     Log    Trying to get a performance report present in the NFVO
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -283,21 +283,21 @@ Get Individual Performance Report
 Get Individual Performance Report with invalid resource endpoint
     Log    Trying to get a performance report with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${erroneousReportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for Individual Performance Report
     Log    Trying to create new performance report
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for Individual Performance Report
     Log    Trying to update performance report
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -307,7 +307,7 @@ Send Put request for Individual Performance Report
     
 Send Patch request for Individual Performance Report
     Log    Trying to update performance report
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -317,7 +317,7 @@ Send Patch request for Individual Performance Report
 
 Send Delete request for Individual Performance Report
     Log    Trying to delete performance report   
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -325,7 +325,7 @@ Send Delete request for Individual Performance Report
 GET all Performance Thresholds
     Log    Trying to get all thresholds present in the NFVO    
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -333,7 +333,7 @@ GET all Performance Thresholds
 GET Performance Thresholds with attribute-based filter
     Log    Trying to get thresholds present in the NFVO with filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds?${FILTER_OK_Threshold}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -341,7 +341,7 @@ GET Performance Thresholds with attribute-based filter
 GET Performance Thresholds with invalid attribute-based filter
     Log    Trying to get thresholds present in the NFVO with invalid filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds?${FILTER_KO}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -349,14 +349,14 @@ GET Performance Thresholds with invalid attribute-based filter
 GET NS performance Thresholds with invalid resource endpoint
     Log    Trying to get thresholds present in the NFVO with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/threshold
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post Request Create new Performance Threshold
     Log    Creating a new THreshold
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${template}=    Get File    jsons/CreateThresholdRequest.json
@@ -367,7 +367,7 @@ Send Post Request Create new Performance Threshold
 
 Send PUT Request for all Performance Thresholds
     Log    PUT THresholds
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
@@ -376,7 +376,7 @@ Send PUT Request for all Performance Thresholds
     
 Send PATCH Request for all Performance Thresholds
     Log    PUT THresholds
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
@@ -385,7 +385,7 @@ Send PATCH Request for all Performance Thresholds
 
 Send DELETE Request for all Performance Thresholds
     Log    DELETE THresholds
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -393,7 +393,7 @@ Send DELETE Request for all Performance Thresholds
 Check Postcondition Threshold Exists
     Log    Checking that Threshold exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -409,7 +409,7 @@ Check HTTP Response Body Thresholds match the requested attribute-based filter
 GET Individual NS performance Threshold
     Log    Trying to get a Threhsold present in the NFVO
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -417,28 +417,28 @@ GET Individual NS performance Threshold
 GET individual NS performance Threshold with invalid resource identifier
     Log    Trying to get a Threhsold with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${erroneousThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual NS performance Threshold
     Log    Trying to delete a Threhsold in the NFVO
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual NS performance Threshold with invalid resource identifier
     Log    Trying to delete a Threhsold in the NFVO with invalid id
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${erroneousThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual NS performance Threshold
     Log    Trying to create new threshold
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${newThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -446,7 +446,7 @@ Send Post request for individual NS performance Threshold
 Send Put request for individual NS performance Threshold
     Log    Trying to PUT threshold
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -458,7 +458,7 @@ Send Patch request for individual NS performance Threshold
     Log    Trying to PUT threshold
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/ThresholdModifications.json
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}    ${body}
     ${output}=    Output    response
diff --git a/SOL005/NSPerformanceManagement-API/NotificationConsumer.robot b/SOL005/NSPerformanceManagement-API/NotificationConsumer.robot
index d4efbea11..3f7aca724 100644
--- a/SOL005/NSPerformanceManagement-API/NotificationConsumer.robot
+++ b/SOL005/NSPerformanceManagement-API/NotificationConsumer.robot
@@ -1,68 +1,68 @@
-*** Settings ***
-Library    JSONSchemaLibrary    schemas/
-Resource    environment/variables.txt
-Library    JSONLibrary
-Library    OperatingSystem
-Library    String
-Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
-Suite Setup    Check resource existence and get CallbackUri
-
-*** Test Cases ***
-NS Performance Information Availability Notification
-    [Documentation]    Test ID: 5.3.4.10.1
-    ...    Test title: NS Performance Information Availability Notification
-    ...    Test objective: The objective is to test that NS Performance Information Availability Notification is delivered with success to the notification consumer
-    ...    Pre-conditions: A NS performance job is created, and information availability notifications is available in the NFVO.
-    ...    Reference: Clause 7.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_Notif_Endpoint
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post NS Performance Information Availability Notification
-    Check HTTP Response Status Code Is    204
-    
-NS Threshold Crossed Notification
-    [Documentation]    Test ID: 5.3.4.10.2
-    ...    Test title: NS Threshold Crossed Notification
-    ...    Test objective: The objective is to test that NS Threshold Crossed Notification is delivered with success to the notification consumer
-    ...    Pre-conditions: A NS performance job is created, and threshold crossed notifications is available in the NFVO.
-    ...    Reference: Clause 7.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_Notif_Endpoint
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post NS Threshold Crossed Notification
-    Check HTTP Response Status Code Is    204
-    
-*** Keywords ***
-Check resource existence and get CallbackUri
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
-    Integer    response status    200
-    Validate Json    response body    PmJob.schema.json
-    Set Global Variable    ${callbackResp}    response body callbackUri
-
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings    ${response['status']}    ${expected_status}
-    Log    Status code validated 
-    
-Post NS Performance Information Availability Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body} =    Get File    jsons/PerformanceInformationAvailableNotification.json  
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}
-	
-Post NS Threshold Crossed Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body} =    Get File    jsons/ThresholdCrossedNotification.json  
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
+*** Settings ***
+Library    JSONSchemaLibrary    schemas/
+Resource    environment/variables.txt
+Library    JSONLibrary
+Library    OperatingSystem
+Library    String
+Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+NS Performance Information Availability Notification
+    [Documentation]    Test ID: 5.3.4.10.1
+    ...    Test title: NS Performance Information Availability Notification
+    ...    Test objective: The objective is to test that NS Performance Information Availability Notification is delivered with success to the notification consumer
+    ...    Pre-conditions: A NS performance job is created, and information availability notifications is available in the NFVO.
+    ...    Reference: Clause 7.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post NS Performance Information Availability Notification
+    Check HTTP Response Status Code Is    204
+    
+NS Threshold Crossed Notification
+    [Documentation]    Test ID: 5.3.4.10.2
+    ...    Test title: NS Threshold Crossed Notification
+    ...    Test objective: The objective is to test that NS Threshold Crossed Notification is delivered with success to the notification consumer
+    ...    Pre-conditions: A NS performance job is created, and threshold crossed notifications is available in the NFVO.
+    ...    Reference: Clause 7.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post NS Threshold Crossed Notification
+    Check HTTP Response Status Code Is    204
+    
+*** Keywords ***
+Check resource existence and get CallbackUri
+    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}/pm_jobs/${pmJobId}
+    Integer    response status    200
+    Validate Json    response body    PmJob.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+    
+Post NS Performance Information Availability Notification
+    log    Trying to perform a POST to get notification
+    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/PerformanceInformationAvailableNotification.json  
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	
+Post NS Threshold Crossed Notification
+    log    Trying to perform a POST to get notification
+    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/ThresholdCrossedNotification.json  
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
\ No newline at end of file
diff --git a/SOL005/NSPerformanceManagement-API/environment/variables.txt b/SOL005/NSPerformanceManagement-API/environment/variables.txt
index ff91e2963..46ef3afbb 100644
--- a/SOL005/NSPerformanceManagement-API/environment/variables.txt
+++ b/SOL005/NSPerformanceManagement-API/environment/variables.txt
@@ -2,12 +2,12 @@
 ${NFVO_HOST}      localhost    # Hostname of the NFVO
 ${NFVO_PORT}      8081    # Listening port of the NFVO
 ${NFVO_SCHEMA}    https
-${AUTHORIZATION}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
+${AUTHORIZATION_HEADER}    Authorization
+${AUTHORIZATION_TOKEN}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 ${CONTENT_TYPE_JSON}    application/json
 ${ACCEPT_JSON}    application/json
 ${apiRoot}        /
 ${AUTH_USAGE}     1
-${NEG_AUTHORIZATION}    Bearer negativetoken
 ${apiMajorVersion}     v2
 ${apiName}        nspm
 ${FIELD_USAGE}    1
diff --git a/SOL005/VNFPackageManagement-API/AccessConfigurationForExternalArtifacts.robot b/SOL005/VNFPackageManagement-API/AccessConfigurationForExternalArtifacts.robot
index 0637fe22a..c8da3d025 100644
--- a/SOL005/VNFPackageManagement-API/AccessConfigurationForExternalArtifacts.robot
+++ b/SOL005/VNFPackageManagement-API/AccessConfigurationForExternalArtifacts.robot
@@ -1,109 +1,109 @@
-*** Settings ***
-Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt
-Resource          VNFPackageManagementKeywords.robot    
-Library           JSONLibrary
-Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
-
-*** Test Cases ***
-Get Access configuration for external artifacts
-    [Documentation]    Test ID: 5.3.5.10.1
-    ...    Test title: Get Access configuration for external artifacts
-    ...    Test objective: The objective is to test the GET method reads the access configuration information that is used by the NFVO to get the content of external VNF package artifacts and perform a JSON schema and content validation of the collected data structure
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get access configuration information for external artifacts
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is   ExternalArtifactsAccessConfig
-
-Get Access configuration for external artifacts - Not Found
-    [Documentation]    Test ID: 5.3.5.10.2
-    ...    Test title: Get Access configuration for external artifacts - Not Found
-    ...    Test objective: The objective is to test that the retrieval of access configuration information that is used by the NFVO to get the content of external VNF package artifacts fails because resource is not present.
-    ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get access configuration information for external artifacts
-    Check HTTP Response Status Code Is    404
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-    
-PUT Access configuration for external artifacts 
-    [Documentation]    Test ID: 5.3.5.10.3
-    ...    Test title: 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:  the individual VNF package resource shall have been created, and the value of "onboardingState" attribute shall equal to "CREATED" or "ERROR"
-    ...    Reference: Clause 9.4.4a.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Check Postcondition individual VNF Package is created
-    Send PUT Request to access configuration information for external artifacts
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is   ExternalArtifactsAccessConfig
-    
-PUT Access configuration for external artifacts - Downloading
-    [Documentation]    Test ID: 5.3.5.10.4
-    ...    Test title: Access configuration for external artifacts - Downloading
-    ...    Test objective: The objective is to test that VNF package has been uploaded successfully previously, to indicate that the access configuration information has been stored successfully by the NFVO and the NFVO now starts downloading external artifacts.
-    ...    Pre-conditions:  the individual VNF package resource shall have been created, and the value of "onboardingState" attribute shall equal to "CREATED" or "ERROR"
-    ...    Reference: Clause 9.4.4a.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Check Postcondition individual VNF Package is created
-    Send PUT Request to access configuration information for external artifacts
-    Check HTTP Response Status Code Is    202
-    
-PUT Access configuration for external artifacts - Conflict
-    [Documentation]    Test ID: 5.3.5.10.5
-    ...    Test title: 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:  the individual VNF package resource shall have been created, and the value of "onboardingState" attribute is neither "CREATED" nor "ERROR"
-    ...    Reference: Clause 9.4.4a.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send PUT Request to access configuration information for external artifacts
-    Check HTTP Response Status Code Is    409
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-    
-POST Access configuration for external artifacts - Method not implemented
-    [Documentation]    Test ID: 5.3.5.10.6
-    ...    Test title: POST Access configuration for external artifacts - Method not implemented
-    ...    Test objective: The objective is to test that POST method is not allowed to create access configuration for external artifacts
-    ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.4a.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send POST Request for access configuration for external artifacts
-    Check HTTP Response Status Code Is    405
-
-PATCH Access configuration for external artifacts - Method not implemented
-    [Documentation]    Test ID: 5.3.5.10.7
-    ...    Test title: PATCH Access configuration for external artifacts - Method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to update access configuration for external artifacts
-    ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.4a.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send PATCH Request for 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.5.10.8
-    ...    Test title: DELETE Access configuration for external artifacts - Method not implemented
-    ...    Test objective: The objective is to test that DELETE  method is not allowed to delete access configuration for external artifacts
-    ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.4a.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send DELETE Request for Access configuration for external artifacts
+*** Settings ***
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt
+Resource          VNFPackageManagementKeywords.robot    
+Library           JSONLibrary
+Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+
+*** Test Cases ***
+Get Access configuration for external artifacts
+    [Documentation]    Test ID: 5.3.5.10.1
+    ...    Test title: Get Access configuration for external artifacts
+    ...    Test objective: The objective is to test the GET method reads the access configuration information that is used by the NFVO to get the content of external VNF package artifacts and perform a JSON schema and content validation of the collected data structure
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get access configuration information for external artifacts
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is   ExternalArtifactsAccessConfig
+
+Get Access configuration for external artifacts - Not Found
+    [Documentation]    Test ID: 5.3.5.10.2
+    ...    Test title: Get Access configuration for external artifacts - Not Found
+    ...    Test objective: The objective is to test that the retrieval of access configuration information that is used by the NFVO to get the content of external VNF package artifacts fails because resource is not present.
+    ...    Pre-conditions: none
+    ...    Reference: Clause 9.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get access configuration information for external artifacts
+    Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+PUT Access configuration for external artifacts 
+    [Documentation]    Test ID: 5.3.5.10.3
+    ...    Test title: 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:  the individual VNF package resource shall have been created, and the value of "onboardingState" attribute shall equal to "CREATED" or "ERROR"
+    ...    Reference: Clause 9.4.4a.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Check Postcondition individual VNF Package is created
+    Send PUT Request to access configuration information for external artifacts
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is   ExternalArtifactsAccessConfig
+    
+PUT Access configuration for external artifacts - Downloading
+    [Documentation]    Test ID: 5.3.5.10.4
+    ...    Test title: Access configuration for external artifacts - Downloading
+    ...    Test objective: The objective is to test that VNF package has been uploaded successfully previously, to indicate that the access configuration information has been stored successfully by the NFVO and the NFVO now starts downloading external artifacts.
+    ...    Pre-conditions:  the individual VNF package resource shall have been created, and the value of "onboardingState" attribute shall equal to "CREATED" or "ERROR"
+    ...    Reference: Clause 9.4.4a.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Check Postcondition individual VNF Package is created
+    Send PUT Request to access configuration information for external artifacts
+    Check HTTP Response Status Code Is    202
+    
+PUT Access configuration for external artifacts - Conflict
+    [Documentation]    Test ID: 5.3.5.10.5
+    ...    Test title: 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:  the individual VNF package resource shall have been created, and the value of "onboardingState" attribute is neither "CREATED" nor "ERROR"
+    ...    Reference: Clause 9.4.4a.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PUT Request to access configuration information for external artifacts
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+POST Access configuration for external artifacts - Method not implemented
+    [Documentation]    Test ID: 5.3.5.10.6
+    ...    Test title: POST Access configuration for external artifacts - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not allowed to create access configuration for external artifacts
+    ...    Pre-conditions: none
+    ...    Reference: Clause 9.4.4a.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send POST Request for access configuration for external artifacts
+    Check HTTP Response Status Code Is    405
+
+PATCH Access configuration for external artifacts - Method not implemented
+    [Documentation]    Test ID: 5.3.5.10.7
+    ...    Test title: PATCH Access configuration for external artifacts - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to update access configuration for external artifacts
+    ...    Pre-conditions: none
+    ...    Reference: Clause 9.4.4a.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PATCH Request for 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.5.10.8
+    ...    Test title: DELETE Access configuration for external artifacts - Method not implemented
+    ...    Test objective: The objective is to test that DELETE  method is not allowed to delete access configuration for external artifacts
+    ...    Pre-conditions: none
+    ...    Reference: Clause 9.4.4a.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send DELETE Request for Access configuration for external artifacts
     Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/ApiVersion.robot b/SOL005/VNFPackageManagement-API/ApiVersion.robot
index 5dc01749c..c3b82eec1 100644
--- a/SOL005/VNFPackageManagement-API/ApiVersion.robot
+++ b/SOL005/VNFPackageManagement-API/ApiVersion.robot
@@ -132,70 +132,70 @@ DELETE API Version with apiMajorVerion - Method not implemented
 *** Keywords ***
 POST API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
diff --git a/SOL005/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot b/SOL005/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot
index 0b6441057..75dbfc62c 100644
--- a/SOL005/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot
+++ b/SOL005/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot
@@ -1,107 +1,107 @@
-*** Settings ***
-Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt
-Resource          VNFPackageManagementKeywords.robot    
-Library           JSONLibrary
-Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
-
-*** Test Cases ***
-Get Manifest in Individual VNF Package
-    [Documentation]    Test ID: 5.3.5.11.1
-    ...    Test title: Get Manifest in Individual VNF Package
-    ...    Test objective: The objective is to test that content of manifest within a NVF Package is read successfully.
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Manifest in Individual VNF Package in plainFormat
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    text/plain
-    
-Get Manifest in Individual VNF Package with security information
-    [Documentation]    Test ID: 5.3.5.11.2
-    ...    Test title: Get Manifest in Individual VNF Package with security information
-    ...    Test objective: The objective is to test the retrieval of the Manifest in individual VNF package shall include in the ZIP archive the security information when requested with "include_signature" parameter, and perform a validation that returned content is in zip format
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Manifest in Individual VNF Package with security information
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
-    
-Get Manifest in Individual VNF Package - Not Acceptable
-    [Documentation]    Test ID: 5.3.5.11.3
-    ...    Test title: Get Manifest in Individual VNF Package - Not Acceptable
-    ...    Test objective: The objective is to test that the "Accept" header is not compatible with Content type "application/zip" but "incude_signature" is provided.\
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Manifest in Individual VNF Package with unacceptable request
-    Check HTTP Response Status Code Is    406
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-    
-Get Manifest in Individual VNF Package - Conflict
-    [Documentation]    Test ID: 5.3.5.11.4
-    ...    Test title: Get Manifest in Individual VNF Package - Conflict
-    ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the resource.
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Manifest in Individual VNF Package in plainFormat
-    Check HTTP Response Status Code Is    409
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-    
-POST Manifest in Individual VNF Package - Method not implemented
-    [Documentation]    Test ID: 5.3.5.11.5
-    ...    Test title: POST Manifest in Individual VNF Package - Method not implemented
-    ...    Test objective: The objective is to test that POST method is not allowed to create new Manifest
-    ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.4b.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send POST Request for Manifest in individual VNF Package
-    Check HTTP Response Status Code Is    405
-
-PUT Manifest in Individual VNF Package - Method not implemented
-    [Documentation]    Test ID: 5.3.5.11.6
-    ...    Test title: PUT Manifest in Individual VNF Package - Method not implemented
-    ...    Test objective: The objective is to test that PUT method is not allowed to modify a Manifest
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4b.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send PUT Request for Manifest in individual VNF Package
-    Check HTTP Response Status Code Is    405
-
-PATCH Manifest in Individual VNF Package - Method not implemented
-    [Documentation]    Test ID: 5.3.5.11.7
-    ...    Test title: PATCH Manifest in Individual VNF Package - Method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to update a Manifest
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4b.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send PATCH Request for Manifest in individual VNF Package
-    Check HTTP Response Status Code Is    405
-
-DELETE Manifest in Individual VNF Package - Method not implemented
-    [Documentation]    Test ID: 5.3.5.11.8
-    ...    Test title: DELETE Manifest in Individual VNF Package - Method not implemented
-    ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a Manifest
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4b.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send DELETE Request for Manifest in individual VNF Package
+*** Settings ***
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt
+Resource          VNFPackageManagementKeywords.robot    
+Library           JSONLibrary
+Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+
+*** Test Cases ***
+Get Manifest in Individual VNF Package
+    [Documentation]    Test ID: 5.3.5.11.1
+    ...    Test title: Get Manifest in Individual VNF Package
+    ...    Test objective: The objective is to test that content of manifest within a NVF Package is read successfully.
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Manifest in Individual VNF Package in plainFormat
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    text/plain
+    
+Get Manifest in Individual VNF Package with security information
+    [Documentation]    Test ID: 5.3.5.11.2
+    ...    Test title: Get Manifest in Individual VNF Package with security information
+    ...    Test objective: The objective is to test the retrieval of the Manifest in individual VNF package shall include in the ZIP archive the security information when requested with "include_signature" parameter, and perform a validation that returned content is in zip format
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Manifest in Individual VNF Package with security information
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get Manifest in Individual VNF Package - Not Acceptable
+    [Documentation]    Test ID: 5.3.5.11.3
+    ...    Test title: Get Manifest in Individual VNF Package - Not Acceptable
+    ...    Test objective: The objective is to test that the "Accept" header is not compatible with Content type "application/zip" but "incude_signature" is provided.\
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Manifest in Individual VNF Package with unacceptable request
+    Check HTTP Response Status Code Is    406
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+Get Manifest in Individual VNF Package - Conflict
+    [Documentation]    Test ID: 5.3.5.11.4
+    ...    Test title: Get Manifest in Individual VNF Package - Conflict
+    ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the resource.
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Manifest in Individual VNF Package in plainFormat
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+POST Manifest in Individual VNF Package - Method not implemented
+    [Documentation]    Test ID: 5.3.5.11.5
+    ...    Test title: POST Manifest in Individual VNF Package - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not allowed to create new Manifest
+    ...    Pre-conditions: none
+    ...    Reference: Clause 9.4.4b.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send POST Request for Manifest in individual VNF Package
+    Check HTTP Response Status Code Is    405
+
+PUT Manifest in Individual VNF Package - Method not implemented
+    [Documentation]    Test ID: 5.3.5.11.6
+    ...    Test title: PUT Manifest in Individual VNF Package - Method not implemented
+    ...    Test objective: The objective is to test that PUT method is not allowed to modify a Manifest
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.4b.3.3 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PUT Request for Manifest in individual VNF Package
+    Check HTTP Response Status Code Is    405
+
+PATCH Manifest in Individual VNF Package - Method not implemented
+    [Documentation]    Test ID: 5.3.5.11.7
+    ...    Test title: PATCH Manifest in Individual VNF Package - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to update a Manifest
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.4b.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PATCH Request for Manifest in individual VNF Package
+    Check HTTP Response Status Code Is    405
+
+DELETE Manifest in Individual VNF Package - Method not implemented
+    [Documentation]    Test ID: 5.3.5.11.8
+    ...    Test title: DELETE Manifest in Individual VNF Package - Method not implemented
+    ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a Manifest
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.4b.3.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send DELETE Request for Manifest in individual VNF Package
     Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/NotificationConsumer.robot b/SOL005/VNFPackageManagement-API/NotificationConsumer.robot
index 62fd52bc1..751754359 100644
--- a/SOL005/VNFPackageManagement-API/NotificationConsumer.robot
+++ b/SOL005/VNFPackageManagement-API/NotificationConsumer.robot
@@ -1,73 +1,73 @@
-*** Settings ***
-Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt
-Resource          VNFPackageManagementKeywords.robot
-Library           OperatingSystem
-Library           JSONLibrary
-Library           String
-Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
-Suite Setup    Check resource existence and get CallbackUri
-
-*** Test Cases ***
-VNF Package Onboarding Notification
-    [Documentation]    Test ID: 5.3.5.13.1
-    ...    Test title: VNF Package Onboarding Notification
-    ...    Test objective: The objective is to test that VNF Package Onboarding Notification is delivered with success to the notification consumer
-    ...    Pre-conditions: A VNF package subscription for onboarding notifications is available in the NFVO.
-    ...    Reference: Clause 9.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_Notif_Endpoint
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post VNF Package Onboarding Notification
-    Check HTTP Response Status Code Is    204
-    
-VNF Package Change Notification
-    [Documentation]    Test ID: 5.3.5.13.2
-    ...    Test title: VNF Package Change Notification
-    ...    Test objective: The objective is to test that VNF Package Change Notification is delivered with success to the notification consumer
-    ...    Pre-conditions: A VNF package subscription for change notifications is available in the NFVO.
-    ...    Reference: Clause 9.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    ...    Config ID: Config_prod_Notif_Endpoint
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post VNF Package Change Notification
-    Check HTTP Response Status Code Is    204
-
-*** Keywords ***
-Check resource existence and get CallbackUri
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
-    Integer    response status    200
-    Validate Json    response body    PkgmSubscription.schema.json
-    Set Global Variable    ${callbackResp}    response body callbackUri
-
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings    ${response['status']}    ${expected_status}
-    Log    Status code validated 
-    
-Post VNF Package Onboarding Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Run Keyword If    ${check_descriptors} == 1    Parse the Descriptor File
-    ${template} =    Get File    jsons/VnfPackageOnboardingNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPkgId=${vnfPkgId}    vnfdId=${Descriptor_ID}
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}
-
-Post VNF Package Change Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Run Keyword If    ${check_descriptors} == 1    Parse the Descriptor File
-    ${template} =    Get File    jsons/VnfPackageChangeNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPkgId=${vnfPkgId}    vnfdId=${Descriptor_ID}
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
+*** Settings ***
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt
+Resource          VNFPackageManagementKeywords.robot
+Library           OperatingSystem
+Library           JSONLibrary
+Library           String
+Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+VNF Package Onboarding Notification
+    [Documentation]    Test ID: 5.3.5.13.1
+    ...    Test title: VNF Package Onboarding Notification
+    ...    Test objective: The objective is to test that VNF Package Onboarding Notification is delivered with success to the notification consumer
+    ...    Pre-conditions: A VNF package subscription for onboarding notifications is available in the NFVO.
+    ...    Reference: Clause 9.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF Package Onboarding Notification
+    Check HTTP Response Status Code Is    204
+    
+VNF Package Change Notification
+    [Documentation]    Test ID: 5.3.5.13.2
+    ...    Test title: VNF Package Change Notification
+    ...    Test objective: The objective is to test that VNF Package Change Notification is delivered with success to the notification consumer
+    ...    Pre-conditions: A VNF package subscription for change notifications is available in the NFVO.
+    ...    Reference: Clause 9.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF Package Change Notification
+    Check HTTP Response Status Code Is    204
+
+*** Keywords ***
+Check resource existence and get CallbackUri
+    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}/subscriptions/${subscriptionId}
+    Integer    response status    200
+    Validate Json    response body    PkgmSubscription.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+    
+Post VNF Package Onboarding Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Run Keyword If    ${check_descriptors} == 1    Parse the Descriptor File
+    ${template} =    Get File    jsons/VnfPackageOnboardingNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPkgId=${vnfPkgId}    vnfdId=${Descriptor_ID}
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+
+Post VNF Package Change Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Run Keyword If    ${check_descriptors} == 1    Parse the Descriptor File
+    ${template} =    Get File    jsons/VnfPackageChangeNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPkgId=${vnfPkgId}    vnfdId=${Descriptor_ID}
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageArtifacts.robot b/SOL005/VNFPackageManagement-API/VNFPackageArtifacts.robot
index 4a49bf0bc..4d4b7d5bc 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageArtifacts.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageArtifacts.robot
@@ -1,200 +1,200 @@
-*** Settings ***
-Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt
-Resource          VNFPackageManagementKeywords.robot    
-Library           JSONLibrary
-Library           OperatingSystem    
-Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
-
-*** Test Cases ***
-Get VNF Package Artifact
-    [Documentation]    Test ID: 5.3.5.12.1
-    ...    Test title: Get VNF Package Artifact
-    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully, and perform a validation that returned content is in Zip format
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Artifact in VNF Package
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
-    
-Get VNF Package Artifact with "exclude_all_mano_artifacts" parameter
-    [Documentation]    Test ID: 5.3.5.12.2
-    ...    Test title: Get VNF Package Artifact with "exclude_all_mano_artifacts" parameter
-    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and it doesnot contain additional MANO artifacts  when requested with "exclude_all_mano_artifacts" parameter
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Artifact in VNF Package with exclude_all_mano_artifacts parameter
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
-    
-Get VNF Package Artifact with "exclude_all_non_mano_artifacts" parameter
-    [Documentation]    Test ID: 5.3.5.12.3
-    ...    Test title: Get VNF Package Artifact with "exclude_all_non_mano_artifacts" parameter
-    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and it doesnot contain non-MANO Artifacts when requested with "exclude_all_non_mano_artifacts" parameter
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Artifact in VNF Package with exclude_all_non_mano_artifacts parameter
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
-    
-Get VNF Package Artifact with "select_non_mano_artifact_sets" parameter
-    [Documentation]    Test ID: 5.3.5.12.4
-    ...    Test title: Get VNF Package Artifact with "select_non_mano_artifact_sets" parameter
-    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and also contain non_MANO artifacts set when requested with "select_non_mano_artifact_sets" parameter
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Artifact in VNF Package with select_non_mano_artifact_sets parameter
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
-    
-Get VNF Package Artifact with "include_signatures" parameter
-    [Documentation]    Test ID: 5.3.5.12.5
-    ...    Test title: Get VNF Package Artifact with "include_signatures" parameter
-    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and also contain security certificates when requested with "include_signature" parameter, and perform a validation that returned content is in Zip format
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Artifact in VNF Package with include_signatures parameter
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
-    
-Get VNF Package Artifact with Range Request and NFVO supporting Range Requests
-    [Documentation]    Test ID: 5.3.5.12.6
-    ...    Test title: Get VNF Package Artifact with Range Request and NFVO supporting Range Requests
-    ...    Test objective: The objective is to test the GET request read the whole content of the archive containing the artifact files successfully when using a range request to return single range of bytes from the file, with the NFVO supporting it. The test also perform a validation that returned content matches the issued range
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
-    ...    Post-Conditions: none
-    Get Artifact in VNF Package with Range Request
-    Check HTTP Response Status Code Is    206
-    Check HTTP Response Header Content-Range Is Present and Matches the requested range
-    Check HTTP Response Header Content-Length Is Present and Matches the requested range length
-    
-Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "select_non_mano_artifact_sets"
-    [Documentation]    Test ID: 5.3.5.12.7
-    ...    Test title: Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "select_non_mano_artifact_sets"
-    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when both "exclude_all_non_mano_artifacts" and "select_non_mano_artifact_sets" are present in request
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Artifact in VNF Package with exclude_all_non_mano_artifacts and select_non_mano_artifact_sets
-    Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-    
-Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "exclude_all_mano_artifacts"
-    [Documentation]    Test ID: 5.3.5.12.8
-    ...    Test title: Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "exclude_all_mano_artifactss"
-    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when both "exclude_all_non_mano_artifacts" and "exclude_all_mano_artifacts" are present in request
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Artifact in VNF Package with exclude_all_non_mano_artifacts and exclude_all_mano_artifacts
-    Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-    
-Get VNF Package Artifact with invalid URI parameters undifend select_non_mano_artifact_sets
-    [Documentation]    Test ID: 5.3.5.12.9
-    ...    Test title: Get VNF Package Artifact with invalid URI parameters undefined select_non_mano_artifact_sets
-    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when one or more value provided in "select_non_mano_artifact_sets" are not provided in Manifest.
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Artifact in VNF Package with select_non_mano_artifact_sets parameter
-    Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-
-Get VNF Package Artifact with conflict due to onboarding state
-    [Documentation]    Test ID: 5.3.5.12.10
-    ...    Test title: Get VNF Package Artifact with conflict due to onboarding state
-    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
-    ...    Pre-conditions: The onboarding state of the VNF package for which the content is requested is different from ONBOARDED.
-    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none   
-    GET Artifact of VNF Package in onboarding state different from ONBOARDED
-    Check HTTP Response Status Code Is    409
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-    
-GET VNF Package Artifact with invalid Range Request
-    [Documentation]    Test ID: 5.3.5.12.11
-    ...    Test title: GET VNF Package Artifact with invalid Range Request
-    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when using a range request that does not match any available byte range in the file.
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
-    ...    Post-Conditions: none      
-    GET VNF Package Artifact with invalid Range Request
-    Check HTTP Response Status Code Is    416
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-    
-POST VNF Package Artifact - Method not implemented
-    [Documentation]    Test ID: 5.3.5.12.12
-    ...    Test title: POST VNF Package Artifact - Method not implemented
-    ...    Test objective: The objective is to test that POST method is not allowed to create new VNF Package artifact
-    ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.5a.3.1 - ETSI GS NFV-SOL 005 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send POST Request for VNF Package Artifact
-    Check HTTP Response Status Code Is    405
-
-PUT VNF Package Artifact - Method not implemented
-    [Documentation]    Test ID: 5.3.5.12.13
-    ...    Test title: PUT VNF Package Artifact - Method not implemented
-    ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNF Package artifact
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5a.3.3 - ETSI GS NFV-SOL 005 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send PUT Request for VNF Package Artifact
-    Check HTTP Response Status Code Is    405
-
-PATCH VNF Package Artifact - Method not implemented
-    [Documentation]    Test ID: 5.3.5.12.14
-    ...    Test title: PATCH VNF Package Artifact - Method not implemented
-    ...    Test objective: The objective is to test that PATCH  method is not allowed to update a VNF Package artifact
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5a.3.4 - ETSI GS NFV-SOL 005 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send PATCH Request for VNF Package Artifact
-    Check HTTP Response Status Code Is    405
-
-DELETE VNF Package Artifact - Method not implemented
-    [Documentation]    Test ID: 5.3.5.12.15
-    ...    Test title: DELETE VNF Package Artifact - Method not implemented
-    ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNF Package artifact
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.6.3.5 - ETSI GS NFV-SOL 005 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send DELETE Request for VNF Package Artifact
+*** Settings ***
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt
+Resource          VNFPackageManagementKeywords.robot    
+Library           JSONLibrary
+Library           OperatingSystem    
+Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+
+*** Test Cases ***
+Get VNF Package Artifact
+    [Documentation]    Test ID: 5.3.5.12.1
+    ...    Test title: Get VNF Package Artifact
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully, and perform a validation that returned content is in Zip format
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get VNF Package Artifact with "exclude_all_mano_artifacts" parameter
+    [Documentation]    Test ID: 5.3.5.12.2
+    ...    Test title: Get VNF Package Artifact with "exclude_all_mano_artifacts" parameter
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and it doesnot contain additional MANO artifacts  when requested with "exclude_all_mano_artifacts" parameter
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with exclude_all_mano_artifacts parameter
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get VNF Package Artifact with "exclude_all_non_mano_artifacts" parameter
+    [Documentation]    Test ID: 5.3.5.12.3
+    ...    Test title: Get VNF Package Artifact with "exclude_all_non_mano_artifacts" parameter
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and it doesnot contain non-MANO Artifacts when requested with "exclude_all_non_mano_artifacts" parameter
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with exclude_all_non_mano_artifacts parameter
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get VNF Package Artifact with "select_non_mano_artifact_sets" parameter
+    [Documentation]    Test ID: 5.3.5.12.4
+    ...    Test title: Get VNF Package Artifact with "select_non_mano_artifact_sets" parameter
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and also contain non_MANO artifacts set when requested with "select_non_mano_artifact_sets" parameter
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with select_non_mano_artifact_sets parameter
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get VNF Package Artifact with "include_signatures" parameter
+    [Documentation]    Test ID: 5.3.5.12.5
+    ...    Test title: Get VNF Package Artifact with "include_signatures" parameter
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and also contain security certificates when requested with "include_signature" parameter, and perform a validation that returned content is in Zip format
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with include_signatures parameter
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get VNF Package Artifact with Range Request and NFVO supporting Range Requests
+    [Documentation]    Test ID: 5.3.5.12.6
+    ...    Test title: Get VNF Package Artifact with Range Request and NFVO supporting Range Requests
+    ...    Test objective: The objective is to test the GET request read the whole content of the archive containing the artifact files successfully when using a range request to return single range of bytes from the file, with the NFVO supporting it. The test also perform a validation that returned content matches the issued range
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with Range Request
+    Check HTTP Response Status Code Is    206
+    Check HTTP Response Header Content-Range Is Present and Matches the requested range
+    Check HTTP Response Header Content-Length Is Present and Matches the requested range length
+    
+Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "select_non_mano_artifact_sets"
+    [Documentation]    Test ID: 5.3.5.12.7
+    ...    Test title: Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "select_non_mano_artifact_sets"
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when both "exclude_all_non_mano_artifacts" and "select_non_mano_artifact_sets" are present in request
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with exclude_all_non_mano_artifacts and select_non_mano_artifact_sets
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "exclude_all_mano_artifacts"
+    [Documentation]    Test ID: 5.3.5.12.8
+    ...    Test title: Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "exclude_all_mano_artifactss"
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when both "exclude_all_non_mano_artifacts" and "exclude_all_mano_artifacts" are present in request
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with exclude_all_non_mano_artifacts and exclude_all_mano_artifacts
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+Get VNF Package Artifact with invalid URI parameters undifend select_non_mano_artifact_sets
+    [Documentation]    Test ID: 5.3.5.12.9
+    ...    Test title: Get VNF Package Artifact with invalid URI parameters undefined select_non_mano_artifact_sets
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when one or more value provided in "select_non_mano_artifact_sets" are not provided in Manifest.
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with select_non_mano_artifact_sets parameter
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+
+Get VNF Package Artifact with conflict due to onboarding state
+    [Documentation]    Test ID: 5.3.5.12.10
+    ...    Test title: Get VNF Package Artifact with conflict due to onboarding state
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: The onboarding state of the VNF package for which the content is requested is different from ONBOARDED.
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none   
+    GET Artifact of VNF Package in onboarding state different from ONBOARDED
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+GET VNF Package Artifact with invalid Range Request
+    [Documentation]    Test ID: 5.3.5.12.11
+    ...    Test title: GET VNF Package Artifact with invalid Range Request
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when using a range request that does not match any available byte range in the file.
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
+    ...    Post-Conditions: none      
+    GET VNF Package Artifact with invalid Range Request
+    Check HTTP Response Status Code Is    416
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+POST VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 5.3.5.12.12
+    ...    Test title: POST VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not allowed to create new VNF Package artifact
+    ...    Pre-conditions: none
+    ...    Reference: Clause 9.4.5a.3.1 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send POST Request for VNF Package Artifact
+    Check HTTP Response Status Code Is    405
+
+PUT VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 5.3.5.12.13
+    ...    Test title: PUT VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNF Package artifact
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.5a.3.3 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PUT Request for VNF Package Artifact
+    Check HTTP Response Status Code Is    405
+
+PATCH VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 5.3.5.12.14
+    ...    Test title: PATCH VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that PATCH  method is not allowed to update a VNF Package artifact
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.5a.3.4 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PATCH Request for VNF Package Artifact
+    Check HTTP Response Status Code Is    405
+
+DELETE VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 5.3.5.12.15
+    ...    Test title: DELETE VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNF Package artifact
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 9.4.6.3.5 - ETSI GS NFV-SOL 005 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send DELETE Request for VNF Package Artifact
     Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 9473c3fbf..389a9bf59 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -17,7 +17,7 @@ Variables         descriptors/SOL006/VNFD/vnfd_SOL006.yaml
 Get all VNF Packages
     Log    Trying to get all VNF Packages present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
@@ -49,7 +49,7 @@ Check HTTP Response Body Does Not Contain checksum
 GET VNF Packages with attribute-based filter
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?${POS_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -64,7 +64,7 @@ Check HTTP Response Body VnfPkgsInfo Matches the requested Attribute-Based Filte
 GET VNF Packages with invalid attribute-based filter
     Log    Trying to perform a negative get, filtering by the inexistent filter 'nfvId'
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?${NEG_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -73,7 +73,7 @@ Get all VNF Packages with malformed authorization token
     Pass Execution If    ${AUTH_USAGE} == 0    Skipping test as NFVO is not supporting authentication
     Log    The GET method queries using invalid token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Set Headers    {"Authorization": "${BAD_AUTHORIZATION}"}
+    Set Headers    {"${AUTHORIZATION_HEADER}": "${BAD_AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
@@ -91,7 +91,7 @@ Get all VNF Packages without authorization token
 GET VNF Packages with all_fields attribute selector
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?all_fields
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -112,7 +112,7 @@ Check HTTP Response Body VnfPkgsInfo Matches the requested all_fields selector
 GET VNF Packages with exclude_default attribute selector
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using exclude_default filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?exclude_default   
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -131,7 +131,7 @@ GET VNF Packages with fields attribute selector
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using fields
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -150,7 +150,7 @@ GET VNF Packages with exclude_fields attribute selector
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using fields
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -168,7 +168,7 @@ Check HTTP Response Body vnfPkgsInfo Matches the requested exclude_fields select
 GET all VNF Packages with invalid resource endpoint
     Log    Trying to perform a GET on a erroneous URI
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -178,7 +178,7 @@ Send Post Request to create new VNF Package Resource
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${body} =    Get File    jsons/CreateVnfPkgInfoRequest.json
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -231,7 +231,7 @@ Match the Response Attributes of vnfPkgInfo with Descriptors
 Check Postcondition VNF Package Resource Exists
     Log    Checking that nsd info exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -241,7 +241,7 @@ Check Postcondition VNF Package Resource Exists
 Send PUT Request for all VNF Packages
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -249,7 +249,7 @@ Send PUT Request for all VNF Packages
 Send PATCH Request for all VNF Packages
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -257,7 +257,7 @@ Send PATCH Request for all VNF Packages
 Send DELETE Request for all VNF Packages
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -265,7 +265,7 @@ Send DELETE Request for all VNF Packages
 GET Individual VNF Package
     Log    Trying to get a VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -278,7 +278,7 @@ Check HTTP Response Body vnfPkgInfo Identifier matches the requested VNF Package
 GET Individual VNF Package with invalid resource identifier
     Log    Trying to perform a negative get, using wrong authorization bearer
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -286,7 +286,7 @@ GET Individual VNF Package with invalid resource identifier
 Send POST Request for individual VNF Package
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -294,7 +294,7 @@ Send POST Request for individual VNF Package
 Send PUT Request for individual VNF Package
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -304,7 +304,7 @@ Send PATCH to disable Individual VNF Package
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${body}=    Get File    jsons/VnfPkgInfoModificationsDisabled.json
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -319,7 +319,7 @@ Send PATCH to enable Individual VNF Package
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${body}=    Get File    jsons/VnfPkgInfoModifications.json
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -327,21 +327,21 @@ Send PATCH to enable Individual VNF Package
 Send DELETE Request for individual VNF Package
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${disabledVnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Check Postcondition VNF Package is Deleted
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${disabledVnfPackageId}
     Integer    response status    404
 
 Send DELETE Request for Individual VNF Package in operational state ENABLED
     Log    Trying to perform a DELETE nsdInfo in ENABLED operational state
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -353,7 +353,7 @@ Check Postcondition VNF Package Exists
 Send DELETE Request for Individual VNF Package used for instantiated VNF instances
     Log    Trying to perform a DELETE nsdInfo in ENABLED operational state
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${instantiatedVnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -361,7 +361,7 @@ Send DELETE Request for Individual VNF Package used for instantiated VNF instanc
 Get VNFD in Individual VNF Package in Zip Format
     Log    Trying to get a VNFD from a given VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -369,7 +369,7 @@ Get VNFD in Individual VNF Package in Zip Format
 Get VNFD in Individual VNF Package with security information
     Log    Trying to get a VNFD from a given VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -381,7 +381,7 @@ Check HTTP Response Header Content-Type Is Any of
 Get multi file VNFD in Individual VNF Package in Plain Format
     Log    Trying to get a negative case performing a get on a VNFD from a given VNF Package present in the NFVO Catalogue. Accept will be text/plain but VNFD is composed my multiple files.
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -390,7 +390,7 @@ Get VNFD in Individual VNF Package with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -399,7 +399,7 @@ Get VNFD in Individual VNF Package with conflict due to onboarding state
     Log    Trying to get a VNFD from a given VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -407,7 +407,7 @@ Get VNFD in Individual VNF Package with conflict due to onboarding state
 Send POST Request for VNFD in individual VNF Package
     Log    Trying to perform a POST. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -415,7 +415,7 @@ Send POST Request for VNFD in individual VNF Package
 Send PUT Request for VNFD in individual VNF Package
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -423,7 +423,7 @@ Send PUT Request for VNFD in individual VNF Package
 Send PATCH Request for VNFD in individual VNF Package
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -431,7 +431,7 @@ Send PATCH Request for VNFD in individual VNF Package
 Send DELETE Request for VNFD in individual VNF Package
     Log    Trying to perform a DELETE. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -439,7 +439,7 @@ Send DELETE Request for VNFD in individual VNF Package
 GET Individual VNF Package Content  
     Log    Trying to get a VNF Package Content
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -453,7 +453,7 @@ GET Individual VNF Package Content with Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${range}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -462,7 +462,7 @@ GET Individual VNF Package Content with explicit Range Request
     Log    Trying to get a VNF Package Content using RANGE using an NFVO that can handle it
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${range}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -485,7 +485,7 @@ GET Individual VNF Package Content with invalid Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -493,7 +493,7 @@ GET Individual VNF Package Content with invalid Range Request
 GET Individual VNF Package Content with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -501,7 +501,7 @@ GET Individual VNF Package Content with invalid resource identifier
 GET Content for VNF Package in onboarding state different from ONBOARDED
     Log    Trying to get a VNF Package content present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -509,7 +509,7 @@ GET Content for VNF Package in onboarding state different from ONBOARDED
 Send POST Request for individual VNF Package Content
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -517,14 +517,14 @@ Send POST Request for individual VNF Package Content
 Send PUT Request for individual VNF Package Content
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send PUT Request to upload VNF Package Content
     Log    Trying to perform a PUT. This method upload the content of a NSD
-    Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_ZIP}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
+    Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_ZIP}", "Content-Type": "application/zip", "${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}      verify=False
     ${body}=  Get Binary File     ${contentZipVnfPackage}
     ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${newVnfPackageId}/package_content    data=${body}
     Should Be Empty     ${response.text}
@@ -535,13 +535,13 @@ Send PUT Request to upload VNF Package Content
 Check Postcondition VNF Package Content is uploaded and available in the NFVO
     Log    Trying to get a VNF Package Content
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${newVnfPackageId}/package_content
     Integer    response status    200
  
 Send PUT Request to upload VNF Package Content with conflict due to onboarding state
     Log    Trying to perform a PUT. This method upload the content of a NSD
-    Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_ZIP}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
+    Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_ZIP}", "Content-Type": "application/zip", "${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}      verify=False
     ${body}=  Get Binary File     ${contentZipVnfPackage}
     ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${creatingVnfPackageId}/package_content    data=${body}
     Should Be Empty     ${response.text}
@@ -551,7 +551,7 @@ Send PUT Request to upload VNF Package Content with conflict due to onboarding s
 Send PATCH Request for individual VNF Package Content
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -559,21 +559,21 @@ Send PATCH Request for individual VNF Package Content
 Send DELETE Request for individual VNF Package Content
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 GET Individual VNF Package Artifact
     Log    Trying to get a VNF Package Artifact
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 GET Individual VNF Package Artifact in octet stream format  
     Log    Trying to get a VNF Package Artifact
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageOctetStreamId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -582,7 +582,7 @@ GET Individual VNF Package Artifact with Range Request
     Log    Trying to get an Artifact using RANGE Header and using an NFVO that can handle it
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Range": "${range}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -592,21 +592,21 @@ GET Individual VNF Package Artifact with invalid Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
 GET Individual VNF Package Artifact with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 GET Artifact for VNF Package in onboarding state different from ONBOARDED
     Log    Trying to get a VNF Package artifact present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -614,7 +614,7 @@ GET Artifact for VNF Package in onboarding state different from ONBOARDED
 Send POST Request for individual VNF Package Artifact
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -622,7 +622,7 @@ Send POST Request for individual VNF Package Artifact
 Send PUT Request for individual VNF Package Artifact
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -630,7 +630,7 @@ Send PUT Request for individual VNF Package Artifact
 Send PATCH Request for individual VNF Package Artifact
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -638,7 +638,7 @@ Send PATCH Request for individual VNF Package Artifact
 Send DELETE Request for individual VNF Package Artifact
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -646,7 +646,7 @@ Send DELETE Request for individual VNF Package Artifact
 Send POST Request to upload VNF Package Content from URI
     Log    Trying to perform a POST. The POST method provides the information for the NFVO to get the content of a VNF package.
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/UploadVnfPkgFromUriRequest.json
     ${body}=        Format String   ${template}     vnfPkgUri=${vnfPkgUri}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri    ${body}
@@ -656,7 +656,7 @@ Send POST Request to upload VNF Package Content from URI
 Send POST Request to upload VNF Package Content from URI with conflict due to onboarding state
     Log    Trying to perform a POST. The POST method provides the information for the NFVO to get the content of a VNF package.
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/UploadVnfPkgFromUriRequest.json
     ${body}=        Format String   ${template}     vnfPkgUri=${vnfPkgUri}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${creatingVnfPkgViaUriId}/package_content/upload_from_uri    ${body}
@@ -666,7 +666,7 @@ Send POST Request to upload VNF Package Content from URI with conflict due to on
 Send GET Request for individual VNF Package Content from URI
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -674,7 +674,7 @@ Send GET Request for individual VNF Package Content from URI
 Send PUT Request for individual VNF Package Content from URI
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -682,7 +682,7 @@ Send PUT Request for individual VNF Package Content from URI
 Send PATCH Request for individual VNF Package Content from URI
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -690,7 +690,7 @@ Send PATCH Request for individual VNF Package Content from URI
 Send DELETE Request for individual VNF Package Content from URI
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -698,7 +698,7 @@ Send DELETE Request for individual VNF Package Content from URI
 Get all VNF Package Subscriptions
     Log    Trying to get the list of subscriptions
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -706,7 +706,7 @@ Get all VNF Package Subscriptions
 Get VNF Package Subscriptions with attribute-based filters
     Log    Trying to get the list of subscriptions using filters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ok}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}    
@@ -714,7 +714,7 @@ Get VNF Package Subscriptions with attribute-based filters
 Get VNF Package Subscriptions with invalid attribute-based filters
     Log    Trying to get the list of subscriptions using filters with wrong attribute name
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ko}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -722,7 +722,7 @@ Get VNF Package Subscriptions with invalid attribute-based filters
 Get VNF Package Subscriptions with invalid resource endpoint
     Log    Trying to perform a request on a Uri which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -734,7 +734,7 @@ Send Post Request for VNF Package Subscription
     Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File
     ${template}=    Get File    jsons/subscriptions.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}    vnfdId=${Descriptor_ID}    vnfProvider=${Provider}    vnfProductName=${Product_Name}    vnfSoftwareVersion=${Software_Version}    vnfdVersions=${Descriptor_Version}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -747,7 +747,7 @@ Send Post Request for Duplicated VNF Package Subscription
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${template}=    Get File    jsons/subscriptions.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -755,7 +755,7 @@ Send Post Request for Duplicated VNF Package Subscription
 Send Put Request for VNF Package Subscriptions
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -763,7 +763,7 @@ Send Put Request for VNF Package Subscriptions
 Send Patch Request for VNF Package Subscriptions
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -771,7 +771,7 @@ Send Patch Request for VNF Package Subscriptions
 Send Delete Request for VNF Package Subscriptions
     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": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}    
@@ -789,7 +789,7 @@ Check Postcondition VNF Package Subscription Is Set
     Log    Check Postcondition subscription exist
     Log    Trying to get the subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Run Keyword If    ${location} == Location
     ...    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
     Run Keyword If    ${location} == Location
@@ -800,7 +800,7 @@ Check Postcondition VNF Package Subscription Is Set
 
 Check Postcondition Subscription Resource Returned in Location Header Is Available
     Log    Going to check postcondition
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${response['headers']['Location']}
     Integer    response status    200
     Log    Received a 200 OK as expected
@@ -818,7 +818,7 @@ Check Postcondition Subscription Resource Returned in Location Header Is Availab
 Get Individual VNF Package Subscription
     Log    Trying to get a single subscription identified by subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -826,7 +826,7 @@ Get Individual VNF Package Subscription
 GET individual VNF Package Subscription with invalid resource identifier
     Log    Trying to perform a request on a subscriptionID which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -834,7 +834,7 @@ GET individual VNF Package Subscription with invalid resource identifier
 Send Delete request for individual VNF Package Subscription
     Log    Trying to perform a DELETE on a subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -847,19 +847,19 @@ Check Postcondition VNF Package Subscription is Deleted
 Send Delete request for individual VNF Package Subscription with invalid resource identifier
     Log    Trying to perform a DELETE on a subscriptionId which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual VNF Package Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for individual VNF Package Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -868,7 +868,7 @@ Send Put request for individual VNF Package Subscription
     Set Suite Variable    ${response}    ${output}
     
 Send Patch request for individual VNF Package Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -887,7 +887,7 @@ Check Postcondition VNF Package Subscription is Unmodified (Implicit)
 Check Postcondition VNF Package Subscription is not Created
     Log    Trying to get a new subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -965,14 +965,14 @@ Check HTTP Response Header Contains Location
     Should Not Be Empty    ${linkURL}
 
 Get access configuration information for external artifacts
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Send PUT Request to access configuration information for external artifacts
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=  Get File     jsons/ExternalArtifactsAccessConfig.json
     REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access    ${body}
     ${output}=    Output    response
@@ -987,7 +987,7 @@ Check Postcondition individual VNF Package is created
 Send POST Request for access configuration for external artifacts
     Log    Trying to perform a POST. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -995,7 +995,7 @@ Send POST Request for access configuration for external artifacts
 Send PATCH Request for access configuration for external artifacts
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1003,14 +1003,14 @@ Send PATCH Request for access configuration for external artifacts
 Send DELETE Request for Access configuration for external artifacts
     Log    Trying to perform a DELETE. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Get Manifest in Individual VNF Package in plainFormat
         Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1018,14 +1018,14 @@ Get Manifest in Individual VNF Package in plainFormat
 Get Manifest in Individual VNF Package with security information
     Log    Trying to get a manifest from a given VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Get Manifest in Individual VNF Package with unacceptable request
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1033,7 +1033,7 @@ Get Manifest in Individual VNF Package with unacceptable request
 Send POST Request for manifest in individual VNF Package
     Log    Trying to perform a POST. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1041,7 +1041,7 @@ Send POST Request for manifest in individual VNF Package
 Send PUT Request for manifest in individual VNF Package
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1049,7 +1049,7 @@ Send PUT Request for manifest in individual VNF Package
 Send PATCH Request for manifest in individual VNF Package
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1057,7 +1057,7 @@ Send PATCH Request for manifest in individual VNF Package
 Send DELETE Request for manifest in individual VNF Package
     Log    Trying to perform a DELETE. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1065,7 +1065,7 @@ Send DELETE Request for manifest in individual VNF Package
 Get Artifact in VNF Package
     Log    Trying to get Artifact in VNF Package
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1073,7 +1073,7 @@ Get Artifact in VNF Package
 Get Artifact in VNF Package with exclude_all_mano_artifacts parameter
     Log    Trying to get Artifact in VNF Package with exclude_all_mano_artifacts
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_mano_artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1081,7 +1081,7 @@ Get Artifact in VNF Package with exclude_all_mano_artifacts parameter
 Get Artifact in VNF Package with exclude_all_non_mano_artifacts parameter
     Log    Trying to get Artifact in VNF Package with security certificates
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1090,7 +1090,7 @@ Get Artifact in VNF Package with select_non_mano_artifact_sets parameter
     Log    Trying to get Artifact in VNF Package with security certificates
     Pass Execution If    ${NFVO_non-MANO_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/select_non_mano_artifact_sets=${non_mano_artifact_sets}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1098,7 +1098,7 @@ Get Artifact in VNF Package with select_non_mano_artifact_sets parameter
 Get Artifact in VNF Package with include_signatures parameter
     Log    Trying to get Artifact in VNF Package with security certificates
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1107,7 +1107,7 @@ Get Artifact in VNF Package with Range Request
     Log    Trying to get an Artifact using RANGE Header and using an NFVO that can handle it
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Range": "${range}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1115,7 +1115,7 @@ Get Artifact in VNF Package with Range Request
 Get Artifact in VNF Package with exclude_all_non_mano_artifacts and select_non_mano_artifact_sets
     Log    Trying to get Artifact in VNF Package 
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&select_non_mano_artifact_sets=${non_mano_artifact_sets}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1123,14 +1123,14 @@ Get Artifact in VNF Package with exclude_all_non_mano_artifacts and select_non_m
 Get Artifact in VNF Package with exclude_all_non_mano_artifacts and exclude_all_mano_artifacts
     Log    Trying to get Artifact in VNF Package 
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&exclude_all_non_mano_artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 GET Artifact of VNF Package in onboarding state different from ONBOARDED
     Log    Trying to get a VNF Package artifact present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1140,7 +1140,7 @@ GET VNF Package Artifact with invalid Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1148,7 +1148,7 @@ GET VNF Package Artifact with invalid Range Request
 Send POST Request for VNF Package Artifact
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1156,7 +1156,7 @@ Send POST Request for VNF Package Artifact
 Send PUT Request for VNF Package Artifact
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1164,7 +1164,7 @@ Send PUT Request for VNF Package Artifact
 Send PATCH Request for VNF Package Artifact
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1172,7 +1172,7 @@ Send PATCH Request for VNF Package Artifact
 Send DELETE Request for VNF Package Artifact
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL005/VNFPackageManagement-API/environment/variables.txt b/SOL005/VNFPackageManagement-API/environment/variables.txt
index 948974169..8846ff677 100644
--- a/SOL005/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFPackageManagement-API/environment/variables.txt
@@ -3,12 +3,13 @@
 ${NFVO_HOST}      localhost    # Hostname of the NFVO
 ${NFVO_PORT}      8081    # Listening port of the NFVO
 ${NFVO_SCHEMA}    https
-${AUTHORIZATION}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
+${AUTHORIZATION_HEADER}    Authorization
+${AUTHORIZATION_TOKEN}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 ${CONTENT_TYPE_JSON}    application/json
 ${ACCEPT_JSON}    application/json
 ${apiRoot}        /
 ${AUTH_USAGE}     1
-${NEG_AUTHORIZATION}    Bearer negativetoken
+${NEG_AUTHORIZATION_TOKEN}    Bearer negativetoken
 ${apiMajorVersion}     v2
 ${apiName}        vnfpkgm
 ${FIELD_USAGE}    1
@@ -78,7 +79,7 @@ ${POS_FILTER}     vnfdId=41fdd38a-3d4c-465c-83e0-f80e014425f8&vnfProvider=NXW
 ${NEG_FILTER}     nfvId=41fdd38a-3d4c-465c-83e0-f80e014425f8    # Negative case, using wrong name of field
 ${CAN_FILTER}     1    # NFVO in able to use filters when retrieving VNF Packages
 ${fields}         softwareImages,additionalArtifacts
-${BAD_AUTHORIZATION}    Bear sometoken
+${BAD_AUTHORIZATION_TOKEN}    Bear sometoken
 ${VAR_SEPERATOR}    &
 
 ${vnfPkgViaUriId}       788106a2-d692-44f3-a86d-384f0ce35e42
-- 
GitLab


From bf39094b9294ff8e16a082185850d857a6a10629 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Fri, 12 Feb 2021 10:51:20 +0100
Subject: [PATCH 284/322] =?UTF-8?q?updated=20authorization=20header=20and?=
 =?UTF-8?q?=20token=20use=20in=20SOL002=C3=B9=20v2.7.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SOL002/VNFConfiguration-API/ApiVersion.robot  |  20 +-
 .../VNFConfiguration-API/Configuration.robot  |  12 +-
 .../environment/variables.txt                 |   3 +-
 SOL002/VNFFaultManagement-API/Alarms.robot    |  34 +--
 .../VNFFaultManagement-API/ApiVersion.robot   |  20 +-
 .../EscalatePerceivedSeverityTask.robot       |  12 +-
 .../IndividualAlarm.robot                     |  16 +-
 .../IndividualSubscription.robot              |  16 +-
 .../NotificationConsumer.robot                | 184 +++++++-------
 .../Subscriptions.robot                       |  40 +--
 .../environment/variables.txt                 |   3 +-
 SOL002/VNFIndicator-API/ApiVersion.robot      |  20 +-
 .../IndividualSubscription.robot              |  14 +-
 .../IndividualVNFindicator.robot              |  24 +-
 .../NoificationConsumer.robot                 |  90 +++----
 SOL002/VNFIndicator-API/Subscriptions.robot   |  22 +-
 SOL002/VNFIndicator-API/VNFIndicators.robot   |  20 +-
 .../VnfIndicatorsInVnfInstanceId.robot        |  16 +-
 .../environment/variables.txt                 |   7 +-
 .../ApiVersion.robot                          |  20 +-
 .../CancelOperationTask.robot                 |   2 +-
 .../ChangeExternalVNFConnectivityTask.robot   |   2 +-
 .../ChangeVNFFlavourTask.robot                |   2 +-
 .../HealVNFTask.robot                         |   2 +-
 .../InstantiateVNFTask.robot                  |   2 +-
 .../NotificationConsumer.robot                | 176 +++++++-------
 .../OperateVNFTask.robot                      |   2 +-
 .../RetryOperationTask.robot                  |   2 +-
 .../RollbackOperationTask.robot               |   2 +-
 .../ScaleVNFTask.robot                        |   2 +-
 .../ScaleVNFToLevelTask.robot                 |   2 +-
 .../TerminateVNFTask.robot                    |   2 +-
 .../VnfLcmOperationKeywords.robot             | 228 +++++++++---------
 .../environment/variables.txt                 |   3 +-
 .../ApiVersion.robot                          |  20 +-
 .../IndividualPmJob.robot                     |  14 +-
 .../IndividualReport.robot                    |  14 +-
 .../IndividualThreshold.robot                 |  14 +-
 .../NotificationConsumer.robot                | 142 +++++------
 .../VNFPerformanceManagement-API/PMJobs.robot |  28 +--
 .../Thresholds.robot                          |  18 +-
 .../VNFPerformanceManagementKeywords.robot    |  34 +--
 .../environment/variables.txt                 |   3 +-
 43 files changed, 657 insertions(+), 652 deletions(-)

diff --git a/SOL002/VNFConfiguration-API/ApiVersion.robot b/SOL002/VNFConfiguration-API/ApiVersion.robot
index 108cbe0d9..f3afab525 100644
--- a/SOL002/VNFConfiguration-API/ApiVersion.robot
+++ b/SOL002/VNFConfiguration-API/ApiVersion.robot
@@ -131,70 +131,70 @@ DELETE API Version with apiMajorVerion - Method not implemented
 *** Keywords ***
 POST API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
diff --git a/SOL002/VNFConfiguration-API/Configuration.robot b/SOL002/VNFConfiguration-API/Configuration.robot
index a8ccf57c9..69239787a 100644
--- a/SOL002/VNFConfiguration-API/Configuration.robot
+++ b/SOL002/VNFConfiguration-API/Configuration.robot
@@ -107,7 +107,7 @@ Get VNF configuration
     Log    Query VNF The GET method queries information about a configuration.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/configuration
     ${output}=    Output    response
@@ -117,7 +117,7 @@ Send VNF configuration
     log    Trying to perform a PATCH. This method modifies the configuration    
     Set Headers  {"Accept":"${ACCEPT}"} 
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/vnfConfigModifications.json
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/configuration    ${body}
     ${output}=    Output    response
@@ -158,7 +158,7 @@ Send Duplicated VNF configuration
     Set Headers  {"Accept":"${ACCEPT}"}
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Set Headers    {"If-Match": "${etag}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/vnfConfigModifications.json
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/configuration    ${body}
     ${output}=    Output    response
@@ -167,7 +167,7 @@ Send Duplicated VNF configuration
 Send POST Request for VNF Configuration
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/configuration
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -175,7 +175,7 @@ Send POST Request for VNF Configuration
 Send PUT Request for VNF Configuration
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/configuration
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -183,7 +183,7 @@ Send PUT Request for VNF Configuration
 Send DELETE Request for VNF Configuration
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/configuration
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
\ No newline at end of file
diff --git a/SOL002/VNFConfiguration-API/environment/variables.txt b/SOL002/VNFConfiguration-API/environment/variables.txt
index 0cd66a08c..0d4c026b1 100644
--- a/SOL002/VNFConfiguration-API/environment/variables.txt
+++ b/SOL002/VNFConfiguration-API/environment/variables.txt
@@ -10,7 +10,8 @@ ${EM-VNF_SCHEMA}    https
 
 ${ACCEPT}         application/json
 ${AUTH_USAGE}     1
-${AUTHORIZATION}    Bearer    QWxhZGRpbjpvcGVuIHNlc2FtZQ==
+${AUTHORIZATION_HEADER}    Authorization
+${AUTHORIZATION_TOKEN}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 
 ${CONTENT_TYPE}    application/json
 
diff --git a/SOL002/VNFFaultManagement-API/Alarms.robot b/SOL002/VNFFaultManagement-API/Alarms.robot
index b2c226c55..f8827ba03 100644
--- a/SOL002/VNFFaultManagement-API/Alarms.robot
+++ b/SOL002/VNFFaultManagement-API/Alarms.robot
@@ -261,35 +261,35 @@ GET information about multiple alarms with attribute-based filter "probableCause
 POST Alarms Task
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 PUT Alarms Task
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 PATCH Alarms Task
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 DELETE Alarms Task
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}			
 GET Alarms Task	
 	Log    Query VNF The GET method queries information about multiple alarms.
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response
@@ -297,7 +297,7 @@ GET Alarms Task
 GET Alarms Task with filter
 	Log    Query VNF The GET method queries information about multiple alarms with filters.
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?${alarm_filter}=${managedObjectId} 
     ${outputResponse}=    Output    response
@@ -305,7 +305,7 @@ GET Alarms Task with filter
 GET Alarms Task with invalid filter
 	Log    Query VNF The GET method queries information about multiple alarms with filters.
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?${invalid_alarm_filter}=${managedObjectId} 
     ${outputResponse}=    Output    response
@@ -313,28 +313,28 @@ GET Alarms Task with invalid filter
 GET Alarms Task with all_fields attribute selector
     Log    Query VNF The GET method queries information about multiple alarms, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 GET Alarms Task with exclude_default attribute selector
     Log    Query VNF The GET method queries information about multiple alarms, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 GET Alarms Task with fields attribute selector
     Log    Query VNF The GET method queries information about multiple alarms, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 GET Alarms Task with exclude_fields attribute selector
     Log    Query VNF The GET method queries information about multiple alarms, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -364,7 +364,7 @@ Check HTTP Response Header Contain Link
 GET Alarms Task with filter "id"
 	Log    Query VNF The GET method queries information about multiple alarms with filters "id".
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?id=${alarmId}
     ${outputResponse}=    Output    response
@@ -376,7 +376,7 @@ Check PostCondition HTTP Response Body alarms Matches the requested attribute-ba
 GET Alarms Task with filter "vnfcInstanceIds"
 	Log    Query VNF The GET method queries information about multiple alarms with filters "vnfcInstanceIds".
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?vnfcInstanceIds=${vnfcInstanceIds}
     ${outputResponse}=    Output    response
@@ -390,7 +390,7 @@ Check PostCondition HTTP Response Body alarms Matches the requested attribute-ba
 GET Alarms Task with filter "rootCauseFaultyResource_faultyResourceType"
 	Log    Query VNF The GET method queries information about multiple alarms with filters "rootCauseFaultyResource.faultyResourceType".
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?rootCauseFaultyResource.faultyResourceType=${faultyResourceType}
     ${outputResponse}=    Output    response
@@ -404,7 +404,7 @@ Check PostCondition HTTP Response Body alarms Matches the requested attribute-ba
 GET Alarms Task with filter "eventType"
 	Log    Query VNF The GET method queries information about multiple alarms with filters "eventType".
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?eventType=${eventType}
     ${outputResponse}=    Output    response
@@ -418,7 +418,7 @@ Check PostCondition HTTP Response Body alarms Matches the requested attribute-ba
 GET Alarms Task with filter "perceivedSeverity"
 	Log    Query VNF The GET method queries information about multiple alarms with filters "perceivedSeverity".
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?perceivedSeverity=${perceivedSeverity}
     ${outputResponse}=    Output    response
@@ -432,7 +432,7 @@ Check PostCondition HTTP Response Body alarms Matches the requested attribute-ba
 GET Alarms Task with filter "probableCause"
 	Log    Query VNF The GET method queries information about multiple alarms with filters "probableCause".
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?probableCause=${probableCause}
     ${outputResponse}=    Output    response
diff --git a/SOL002/VNFFaultManagement-API/ApiVersion.robot b/SOL002/VNFFaultManagement-API/ApiVersion.robot
index 48a593c97..72ae2f9b3 100644
--- a/SOL002/VNFFaultManagement-API/ApiVersion.robot
+++ b/SOL002/VNFFaultManagement-API/ApiVersion.robot
@@ -133,70 +133,70 @@ DELETE API Version with apiMajorVerion - Method not implemented
 *** Keywords ***
 POST API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
diff --git a/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot b/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
index 63f0d49d9..c06950a48 100644
--- a/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
+++ b/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
@@ -69,38 +69,38 @@ DELETE Escalate the perceived severity - Method not implemented
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     Integer    response status    200
 POST escalate severity
     Log    escalate the perceived severity of an alarm with the VNFM
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}/escalate    ${PerceivedSeverity}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 GET escalate severity
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}/escalate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 PUT escalate severity	
 	log    Trying to perform a PUT. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}/escalate    
      ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 PATCH escalate severity
     log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}/escalate  
      ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 DELETE escalate severity        
     log    Trying to perform a DELETE. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}/escalate  
      ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
diff --git a/SOL002/VNFFaultManagement-API/IndividualAlarm.robot b/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
index 97c96dc56..1d9d1e7ab 100644
--- a/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
+++ b/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
@@ -117,14 +117,14 @@ GET information about an individual alarm - Not Found
 POST Alarm Task
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 PUT Alarm Task
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/alarmModifications.json
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}     ${body}
     ${outputResponse}=    Output    response
@@ -134,7 +134,7 @@ PATCH Alarm Task
     Set Headers  {"Accept":"${ACCEPT}"} 
     Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"}
     Set Headers  {"If-Match": "${original_etag[0]}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/alarmModifications.json
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}    ${body}
     ${outputResponse}=    Output    response
@@ -143,7 +143,7 @@ PATCH Alarm Task with wrong precondition
     log    Trying to perform a PATCH. This method modifies an individual alarm resource
     Set Headers  {"Accept":"${ACCEPT}"} 
     Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/alarmModifications.json
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${origOutput}=    Output    response
@@ -154,14 +154,14 @@ PATCH Alarm Task with wrong precondition
 DELETE Alarm Task
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}			
 GET Alarm Task	
 	Log    Query VNF The GET method queries information about individual alarm.
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${etag}    Output    response headers ETag
@@ -171,7 +171,7 @@ GET Alarm Task
 GET Alarm Task with filter
 	Log    Query VNF The GET method queries information about individual alarm with filters.
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?${alarm_filter}=${managedObjectId} 
     ${outputResponse}=    Output    response
@@ -179,7 +179,7 @@ GET Alarm Task with filter
 GET Alarm Task with invalid filter
 	Log    Query VNF The GET method queries information about individual alarm with filters.
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?${invalid_alarm_filter}=${managedObjectId} 
     ${outputResponse}=    Output    response
diff --git a/SOL002/VNFFaultManagement-API/IndividualSubscription.robot b/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
index 6189b4e04..39c594b6f 100644
--- a/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
+++ b/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
@@ -86,41 +86,41 @@ GET Information about an individual subscription - Not Found
 *** Keywords ***
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
     Integer    response status    200
 Post Create individual subscription
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}				
 Get individual subscription
     log    Trying to get information about an individual subscription
     Set Headers    {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Get individual subscription - filter
     Log    Get the list of active individual subscription using a filter
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Get individual subscription - invalid filter  
     Log    Get the list of active individual subscription using an invalid filter
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter_invalid}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 PUT individual subscription
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}        
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
@@ -128,14 +128,14 @@ PATCH individual subscription
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 DELETE individual subscription
     log    Try to delete an individual subscription
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}    	   
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	      
diff --git a/SOL002/VNFFaultManagement-API/NotificationConsumer.robot b/SOL002/VNFFaultManagement-API/NotificationConsumer.robot
index 039fcec98..f03722d4e 100644
--- a/SOL002/VNFFaultManagement-API/NotificationConsumer.robot
+++ b/SOL002/VNFFaultManagement-API/NotificationConsumer.robot
@@ -1,93 +1,93 @@
-*** Settings ***
-Library    String
-Library    OperatingSystem
-Resource    environment/variables.txt 
-Library    JSONLibrary
-Library    JSONSchemaLibrary    schemas/
-Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}       ssl_verify=false 
-Suite Setup    Check resource existence and get CallbackUri
-
-*** Test Cases ***
-VNF Fault Alarm Notification
-    [Documentation]    Test ID: 6.3.4.8.1
-    ...    Test title: VNF Fault Alarm Notification
-    ...    Test objective: The objective is to test that VNF Fault Alarm Notification is delivered with success to the notification consumer
-    ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm notifications is available in the VNFM.
-    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_Notif_Endpoint
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post Alarm Notification
-    Check HTTP Response Status Code Is    204
-    
-VNF Fault Alarm Cleared Notification
-    [Documentation]    Test ID: 6.3.4.8.2
-    ...    Test title: VNF Fault Alarm Cleared Notification
-    ...    Test objective: The objective is to test that VNF Fault Alarm Cleared Notification is delivered with success to the notification consumer
-    ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm cleared notifications is available in the VNFM.
-    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_Notif_Endpoint
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post Alarm Cleared Notification
-    Check HTTP Response Status Code Is    204
-    
-VNF Fault Alarm List Rebuilt Notification
-    [Documentation]    Test ID: 6.3.4.8.3
-    ...    Test title: VNF Fault List Rebuilt Alarm List Rebuilt Notification
-    ...    Test objective: The objective is to test that VNF Fault Alarm List Rebuilt Notification is delivered with success to the notification consumer
-    ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm list rebuilt notifications is available in the VNFM.
-    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_Notif_Endpoint
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post Alarm List Rebuilt Notification
-    Check HTTP Response Status Code Is    204
-
-*** Keywords ***
-Check resource existence and get CallbackUri
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}	
-    Integer    response status    200
-    Validate Json    response body    FmSubscription.schema.json
-    Set Global Variable    ${callbackResp}    response body callbackUri
-    
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings    ${response['status']}    ${expected_status}
-    Log    Status code validated 
-
-Post Alarm Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/AlarmNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}	
-
-Post Alarm Cleared Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/AlarmClearedNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    alarmId=${alarmId}
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}	
-	
-Post Alarm List Rebuilt Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/AlarmListRebuiltNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
+*** Settings ***
+Library    String
+Library    OperatingSystem
+Resource    environment/variables.txt 
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}       ssl_verify=false 
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+VNF Fault Alarm Notification
+    [Documentation]    Test ID: 6.3.4.8.1
+    ...    Test title: VNF Fault Alarm Notification
+    ...    Test objective: The objective is to test that VNF Fault Alarm Notification is delivered with success to the notification consumer
+    ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm notifications is available in the VNFM.
+    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Alarm Notification
+    Check HTTP Response Status Code Is    204
+    
+VNF Fault Alarm Cleared Notification
+    [Documentation]    Test ID: 6.3.4.8.2
+    ...    Test title: VNF Fault Alarm Cleared Notification
+    ...    Test objective: The objective is to test that VNF Fault Alarm Cleared Notification is delivered with success to the notification consumer
+    ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm cleared notifications is available in the VNFM.
+    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Alarm Cleared Notification
+    Check HTTP Response Status Code Is    204
+    
+VNF Fault Alarm List Rebuilt Notification
+    [Documentation]    Test ID: 6.3.4.8.3
+    ...    Test title: VNF Fault List Rebuilt Alarm List Rebuilt Notification
+    ...    Test objective: The objective is to test that VNF Fault Alarm List Rebuilt Notification is delivered with success to the notification consumer
+    ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm list rebuilt notifications is available in the VNFM.
+    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Alarm List Rebuilt Notification
+    Check HTTP Response Status Code Is    204
+
+*** Keywords ***
+Check resource existence and get CallbackUri
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}	
+    Integer    response status    200
+    Validate Json    response body    FmSubscription.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+    
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+
+Post Alarm Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template} =    Get File    jsons/AlarmNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+
+Post Alarm Cleared Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template} =    Get File    jsons/AlarmClearedNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    alarmId=${alarmId}
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+	
+Post Alarm List Rebuilt Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template} =    Get File    jsons/AlarmListRebuiltNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
\ No newline at end of file
diff --git a/SOL002/VNFFaultManagement-API/Subscriptions.robot b/SOL002/VNFFaultManagement-API/Subscriptions.robot
index df7d5d84d..0783ff138 100644
--- a/SOL002/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL002/VNFFaultManagement-API/Subscriptions.robot
@@ -318,7 +318,7 @@ Post Create subscription
     Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
@@ -329,7 +329,7 @@ Post Create subscription
     # Pass Execution If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 0    NVFO is not permitting duplication. Skipping the test
     # Set Headers    {"Accept": "${ACCEPT}"}
     # Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    # Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    # Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     # ${template}=    Get File    jsons/fmSubscriptionRequest.json
     # ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     # Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}		
@@ -340,7 +340,7 @@ Post Create subscription
     # Pass Execution If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 1    VNFM permits duplication. Skipping the test
     # Set Headers    {"Accept": "${ACCEPT}"}
     # Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    # Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    # Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     # ${template}=    Get File    jsons/fmSubscriptionRequest.json
     # ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     # Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
@@ -350,7 +350,7 @@ Get subscriptions
     Log    Get the list of active subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions	
     ${outputResponse}=    Output    response
@@ -358,63 +358,63 @@ Get subscriptions
 Get subscriptions - filter
     Log    Get the list of active subscriptions using a filter
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Get subscriptions - invalid filter  
     Log    Get the list of active subscriptions using an invalid filter
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter_invalid}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Get subscriptions with all_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get subscriptions with exclude_default attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get subscriptions with fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 Get subscriptions with exclude_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 	
 PUT subscriptions
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions       
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 PATCH subscriptions
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions     
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 DELETE subscriptions
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions 	   
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	  
@@ -438,7 +438,7 @@ Check HTTP Response Header Contain Link
 Get subscriptions with filter "id"
     Log    Get the list of active subscriptions using a filter "id"
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?id=${subscription_id}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -449,7 +449,7 @@ Check PostCondition HTTP Response Body Subscription Matches the requested attrib
 Get subscriptions with filter "filter_notificationTypes"
     Log    Get the list of active subscriptions using a filter "filter.notificationTypes"
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.notificationTypes=${notification_type}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -462,7 +462,7 @@ Check PostCondition HTTP Response Body Subscriptions Matches the requested attri
 Get subscriptions with filter "filter_faultyResourceTypes"
     Log    Get the list of active subscriptions using a filter "filter.faultyResourceTypes"
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.faultyResourceTypes=${faultyResourceType}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -475,7 +475,7 @@ Check PostCondition HTTP Response Body Subscriptions Matches the requested attri
 Get subscriptions with filter "filter_perceivedSeverities"
     Log    Get the list of active subscriptions using a filter "filter.perceivedSeverities"
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.perceivedSeverities=${perceivedSeverity}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -488,7 +488,7 @@ Check PostCondition HTTP Response Body Subscriptions Matches the requested attri
 Get subscriptions with filter "filter_eventTypes"
     Log    Get the list of active subscriptions using a filter "filter.eventTypes"
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.eventTypes=${eventType}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -501,7 +501,7 @@ Check PostCondition HTTP Response Body Subscriptions Matches the requested attri
 Get subscriptions with filter "filter_probableCauses"
     Log    Get the list of active subscriptions using a filter "filter.probableCauses"
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.probableCauses=${probableCause}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -513,7 +513,7 @@ Check PostCondition HTTP Response Body Subscriptions Matches the requested attri
     
 Check Postcondition resource exists
     Set Headers    {"Accept":"${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
     Integer    response status    200
 
diff --git a/SOL002/VNFFaultManagement-API/environment/variables.txt b/SOL002/VNFFaultManagement-API/environment/variables.txt
index 7eb09910b..8a8be2d2b 100644
--- a/SOL002/VNFFaultManagement-API/environment/variables.txt
+++ b/SOL002/VNFFaultManagement-API/environment/variables.txt
@@ -2,7 +2,8 @@
 ${VNFM_HOST}      localhost    # Hostname of the VNFM
 ${VNFM_PORT}      8080    # Listening port of the VNFM
 ${VNFM_SCHEMA}    https
-${AUTHORIZATION}    Bearer    QWxhZGRpbjpvcGVuIHNlc2FtZQ==
+${AUTHORIZATION_HEADER}    Authorization
+${AUTHORIZATION_TOKEN}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 ${ACCEPT}         application/json
 ${ACCEPT_JSON}         application/json
 ${AUTH_USAGE}     1
diff --git a/SOL002/VNFIndicator-API/ApiVersion.robot b/SOL002/VNFIndicator-API/ApiVersion.robot
index a89c0b19d..6ba83e5f0 100644
--- a/SOL002/VNFIndicator-API/ApiVersion.robot
+++ b/SOL002/VNFIndicator-API/ApiVersion.robot
@@ -133,70 +133,70 @@ DELETE API Version with apiMajorVerion - Method not implemented
 *** Keywords ***
 POST API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
diff --git a/SOL002/VNFIndicator-API/IndividualSubscription.robot b/SOL002/VNFIndicator-API/IndividualSubscription.robot
index 68e5bb49d..1e6d3f311 100644
--- a/SOL002/VNFIndicator-API/IndividualSubscription.robot
+++ b/SOL002/VNFIndicator-API/IndividualSubscription.robot
@@ -97,7 +97,7 @@ POST Individual VNF Indicator Subscription - Method not implemented
 Get Individual VNF Indicator Subscription
     Log    Trying to get a given subscription identified by subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -105,7 +105,7 @@ Get Individual VNF Indicator Subscription
 GET Individual VNF Indicator Subscription with invalid resource identifier
     Log    Trying to perform a request on a subscriptionID which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -113,7 +113,7 @@ GET Individual VNF Indicator Subscription with invalid resource identifier
 Send Delete Request for Individual VNF Indicator Subscription
     Log    Trying to perform a DELETE on a subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -121,14 +121,14 @@ Send Delete Request for Individual VNF Indicator Subscription
 Send Delete Request for Individual VNF Indicator Subscription with invalid resource identifier
     Log    Trying to perform a DELETE on a subscriptionId which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Send Post Request for Individual VNF Indicator Subscription
     Log    Trying to create a new subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
@@ -136,7 +136,7 @@ Send Post Request for Individual VNF Indicator Subscription
 Send Put Request for Individual VNF Indicator Subscription
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -146,7 +146,7 @@ Send Put Request for Individual VNF Indicator Subscription
 
 Send Patch Request for Individual VNF Indicator Subscription
     Log    Trying to create a new subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
diff --git a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
index 437cb6f3a..206a72b1c 100644
--- a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
+++ b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
@@ -159,7 +159,7 @@ DELETE Individual Performance Indicator - Method not implemented
 Get Individual Indicator for a VNF instance
     Log    This resource represents a VNF indicator related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -167,7 +167,7 @@ Get Individual Indicator for a VNF instance
 Get Individual Indicator for a VNF instance with invalid indicator identifier
     Log    Trying to perform a negative get, using wrong identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${erroneousIndicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -175,7 +175,7 @@ Get Individual Indicator for a VNF instance with invalid indicator identifier
 Send POST Request for individual indicator in VNF instance
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${notAllowedIndicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -183,7 +183,7 @@ Send POST Request for individual indicator in VNF instance
 Send PUT Request for individual indicator in VNF instance
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -191,7 +191,7 @@ Send PUT Request for individual indicator in VNF instance
 Send PATCH Request for individual indicator in VNF instance
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -199,7 +199,7 @@ Send PATCH Request for individual indicator in VNF instance
 Send DELETE Request for individual indicator in VNF instance
     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": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -234,7 +234,7 @@ Check HTTP Response Body Includes Requested VNF Instance ID
 Get Individual Indicator
     Log    This resource represents a VNF indicator related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -242,7 +242,7 @@ Get Individual Indicator
 Get Individual Indicator with invalid indicator identifier
     Log    Trying to perform a negative get, using wrong identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${erroneousIndicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -250,7 +250,7 @@ Get Individual Indicator with invalid indicator identifier
 Send POST Request for individual indicator
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${notAllowedIndicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -258,7 +258,7 @@ Send POST Request for individual indicator
 Send PUT Request for individual indicator
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -266,7 +266,7 @@ Send PUT Request for individual indicator
 Send PATCH Request for individual indicator
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -274,7 +274,7 @@ Send PATCH Request for individual indicator
 Send DELETE Request for individual indicator
     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": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
\ No newline at end of file
diff --git a/SOL002/VNFIndicator-API/NoificationConsumer.robot b/SOL002/VNFIndicator-API/NoificationConsumer.robot
index 1f6b1cb25..cb11aa11e 100644
--- a/SOL002/VNFIndicator-API/NoificationConsumer.robot
+++ b/SOL002/VNFIndicator-API/NoificationConsumer.robot
@@ -1,46 +1,46 @@
-*** Settings ***
-Library    String
-Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt    # Generic Parameters
-Library           OperatingSystem
-Library           REST    ${EM-VNF_SCHEMA}://${EM-VNF_HOST}:${EM-VNF_PORT}    ssl_verify=false
-Suite Setup    Check resource existence and get CallbackUri
-
-*** Test Cases ***
-VNF Indicator Value Change Notification
-    [Documentation]    Test ID: 6.3.2.7.1
-    ...    Test title: VNF Indicator Value Change Notification
-    ...    Test objective: The objective is to test that the POST request triggers VNF Indicator Value Change Notification .
-    ...    Pre-conditions: A VNF is instantiated, and a subscription for indicator value change notifications is available in the VNF.
-    ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNF
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post Value Change Notification
-    Check HTTP Response Status Code Is    204
-
-*** Keywords ***
-Check resource existence and get CallbackUri
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}	
-    Integer    response status    200
-    Validate Json    response body    VnfIndicatorSubscription.schema.json
-    Set Global Variable    ${callbackResp}    response body callbackUri
-    
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings    ${response['status']}    ${expected_status}
-    Log    Status code validated 
-       
-Post Value Change Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/ValueChangeNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    indicatorId=${indicatorId}    vnfInstanceId=${vnfInstanceId}
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
+*** Settings ***
+Library    String
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt    # Generic Parameters
+Library           OperatingSystem
+Library           REST    ${EM-VNF_SCHEMA}://${EM-VNF_HOST}:${EM-VNF_PORT}    ssl_verify=false
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+VNF Indicator Value Change Notification
+    [Documentation]    Test ID: 6.3.2.7.1
+    ...    Test title: VNF Indicator Value Change Notification
+    ...    Test objective: The objective is to test that the POST request triggers VNF Indicator Value Change Notification .
+    ...    Pre-conditions: A VNF is instantiated, and a subscription for indicator value change notifications is available in the VNF.
+    ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_VNF
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Value Change Notification
+    Check HTTP Response Status Code Is    204
+
+*** Keywords ***
+Check resource existence and get CallbackUri
+    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}/subscriptions/${subscriptionId}	
+    Integer    response status    200
+    Validate Json    response body    VnfIndicatorSubscription.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+    
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+       
+Post Value Change Notification
+    log    Trying to perform a POST to get notification
+    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/ValueChangeNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    indicatorId=${indicatorId}    vnfInstanceId=${vnfInstanceId}
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
\ No newline at end of file
diff --git a/SOL002/VNFIndicator-API/Subscriptions.robot b/SOL002/VNFIndicator-API/Subscriptions.robot
index b12f6693f..91fa1f258 100644
--- a/SOL002/VNFIndicator-API/Subscriptions.robot
+++ b/SOL002/VNFIndicator-API/Subscriptions.robot
@@ -185,7 +185,7 @@ Create new VNF indicator Subscription - NO-DUPLICATION
 Get VNF Indicators Subscriptions
     Log    Trying to get the list of subscriptions
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -193,7 +193,7 @@ Get VNF Indicators Subscriptions
 Get VNF Indicators Subscriptions with filter
     Log    Trying to get the list of subscriptions using filters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${POS_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -201,7 +201,7 @@ Get VNF Indicators Subscriptions with filter
 Get VNF Indicators Subscriptions with invalid filter   
     Log    Trying to get the list of subscriptions using filters with wrong attribute name
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${NEG_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
@@ -209,7 +209,7 @@ Get VNF Indicators Subscriptions with invalid filter
 Get VNF Indicators Subscriptions with invalid resource endpoint
     Log    Trying to perform a request on a Uri which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
@@ -220,7 +220,7 @@ Send Post Request for VNF Indicator Subscription
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${template}=    Get File    jsons/subscriptions.json
     ${body}=        Format String    ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}  
@@ -230,7 +230,7 @@ Send Post Request for VNF Indicator Subscription
 Send Put Request for VNF Indicator Subscriptions
     Log    Trying to create a new subscription
     ${body}=    Get File    jsons/subscriptions.json
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -238,7 +238,7 @@ Send Put Request for VNF Indicator Subscriptions
 Send Patch Request for VNF Indicator Subscriptions
     Log    Trying to create a new subscription
     ${body}=    Get File    jsons/subscriptions.json
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -246,7 +246,7 @@ Send Patch Request for VNF Indicator Subscriptions
 Send Delete Request for VNF Indicator Subscriptions
     Log    Trying to create a new subscription
     ${body}=    Get File    jsons/subscriptions.json
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -280,7 +280,7 @@ Check Postcondition VNF Indicator Subscription Is Set
     Log    Check Postcondition subscription exist
     Log    Trying to get the subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -313,7 +313,7 @@ Post Create subscription - DUPLICATION
     Pass Execution If    ${VNFM_CHECKS_NOTIF_ENDPOINT} == 0    VNFM is not permitting duplication. Skipping the test
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/subscriptions.json
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}		
     ${outputResponse}=    Output    response
@@ -324,7 +324,7 @@ Post Create subscription - NO-DUPLICATION
     Pass Execution If    ${VNFM_CHECKS_NOTIF_ENDPOINT} == 1    VNFM permits duplication. Skipping the test
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/subscriptions.json
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
diff --git a/SOL002/VNFIndicator-API/VNFIndicators.robot b/SOL002/VNFIndicator-API/VNFIndicators.robot
index 0addde858..a0db14482 100644
--- a/SOL002/VNFIndicator-API/VNFIndicators.robot
+++ b/SOL002/VNFIndicator-API/VNFIndicators.robot
@@ -177,7 +177,7 @@ Get VNF Indicators - Bad Request Response too Big
 Get all VNF indicators
     Log    The GET method queries multiple VNF indicators
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
@@ -186,7 +186,7 @@ Get all VNF indicators
 Get VNF indicators with filter
     Log    The GET method queries multiple VNF indicators using Attribute-based filtering parameters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators?${POS_FIELDS}
     ${output}=    Output    response
@@ -195,7 +195,7 @@ Get VNF indicators with filter
 Get VNF indicators with invalid filter
     Log    The GET method queries multiple VNF indicators using invalid Attribute-based filtering parameters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators?${NEG_FIELDS}
     ${output}=    Output    response
@@ -205,7 +205,7 @@ Get all VNF indicators with malformed authorization token
     Pass Execution If    ${AUTH_USAGE} == 0    Skipping test as EM/VNF is not supporting authentication
     Log    The GET method queries multiple VNF indicators using invalid token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Set Headers    {"Authorization": "${BAD_AUTHORIZATION}"}
+    Set Headers    {"${AUTHORIZATION_HEADER}": "${BAD_AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
@@ -215,7 +215,7 @@ Get all VNF indicators with expired or revoked authorization token
     Pass Execution If    ${AUTH_USAGE} == 0    Skipping test as EM/VNF is not supporting authentication
     Log    The GET method queries multiple VNF indicators using invalid token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Set Headers    {"Authorization": "${NEG_AUTHORIZATION}"}
+    Set Headers    {"${AUTHORIZATION_HEADER}": "${NEG_AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
@@ -233,7 +233,7 @@ Get all VNF indicators without authorization token
 Get all VNF indicators with invalid resource endpoint
     Log    The GET method queries multiple VNF indicators omitting token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicator
     ${output}=    Output    response
@@ -242,7 +242,7 @@ Get all VNF indicators with invalid resource endpoint
 Send POST Request for all VNF indicators
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -250,7 +250,7 @@ Send POST Request for all VNF indicators
 Send PUT Request for all VNF indicators
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -258,7 +258,7 @@ Send PUT Request for all VNF indicators
 Send PATCH Request for all VNF indicators
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -266,7 +266,7 @@ Send PATCH Request for all VNF indicators
 Send DELETE Request for all VNF indicators
     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":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
index b25da0214..eb01deded 100644
--- a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
+++ b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
@@ -139,7 +139,7 @@ Get Indicators for VNF Instance - Bad Request Response too Big
 Get all indicators for a VNF instance
     Log    This resource represents VNF indicators related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -147,7 +147,7 @@ Get all indicators for a VNF instance
 Get all indicators for a VNF instance with filter  
     Log    This resource represents VNF indicators related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}?${POS_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -155,7 +155,7 @@ Get all indicators for a VNF instance with filter
 Get all indicators for a VNF instance with invalid filter
     Log    This resource represents VNF indicators related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}?${NEG_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -163,7 +163,7 @@ Get all indicators for a VNF instance with invalid filter
 Get all indicators for a VNF instance with invalid resource identifier
     Log    Trying to perform a negative get, using wrong identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${erroneousVnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -171,7 +171,7 @@ Get all indicators for a VNF instance with invalid resource identifier
 Send POST Request for indicators in VNF instance
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -179,7 +179,7 @@ Send POST Request for indicators in VNF instance
 Send PUT Request for indicators in VNF instance
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -187,7 +187,7 @@ Send PUT Request for indicators in VNF instance
 Send PATCH Request for indicators in VNF instance
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -195,7 +195,7 @@ Send PATCH Request for indicators in VNF instance
 Send DELETE Request for indicators in VNF instance
     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": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
diff --git a/SOL002/VNFIndicator-API/environment/variables.txt b/SOL002/VNFIndicator-API/environment/variables.txt
index 3439ee7c8..b3efe3d90 100644
--- a/SOL002/VNFIndicator-API/environment/variables.txt
+++ b/SOL002/VNFIndicator-API/environment/variables.txt
@@ -2,9 +2,10 @@
 ${PRODUCER_HOST}    localhost   
 ${PRODUCER_PORT}    8081    
 ${PRODUCER_SCHEMA}    https
-${AUTHORIZATION}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
-${NEG_AUTHORIZATION}    Bearer negativetoken
-${BAD_AUTHORIZATION}    Bear sometoken
+${AUTHORIZATION_HEADER}    Authorization
+${AUTHORIZATION_TOKEN}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
+${NEG_AUTHORIZATION_TOKEN}    Bearer negativetoken
+${BAD_AUTHORIZATION_TOKEN}    Bear sometoken
 ${CONTENT_TYPE_JSON}    application/json
 ${EM-VNF_HOST}    localhost
 ${EM-VNF_PORT}    8002
diff --git a/SOL002/VNFLifecycleManagement-API/ApiVersion.robot b/SOL002/VNFLifecycleManagement-API/ApiVersion.robot
index 1c1ea5db5..d22684914 100644
--- a/SOL002/VNFLifecycleManagement-API/ApiVersion.robot
+++ b/SOL002/VNFLifecycleManagement-API/ApiVersion.robot
@@ -131,70 +131,70 @@ DELETE API Version with apiMajorVerion - Method not implemented
 *** Keywords ***
 POST API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
diff --git a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
index 60d04f4b8..db8a558e6 100644
--- a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
@@ -100,6 +100,6 @@ DELETE Cancel operation task - Method not implemented
 *** Keywords ***
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot b/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
index f803d37fb..f46fda1db 100644
--- a/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
@@ -86,6 +86,6 @@ POST Change external VNF connectivity Conflict
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot b/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
index bf6278856..37a3a5336 100644
--- a/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
@@ -99,6 +99,6 @@ DELETE Change deployment flavour VNFInstance - Method not implemented
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
index e8298325c..63508cafe 100644
--- a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
@@ -100,6 +100,6 @@ DELETE Heal VNFInstance - Method not implemented
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
index 0bf995edd..2c43ee7a6 100644
--- a/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
@@ -88,6 +88,6 @@ DELETE Instantiate VNFInstance - Method not implemented
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/NotificationConsumer.robot b/SOL002/VNFLifecycleManagement-API/NotificationConsumer.robot
index 2a81c1142..7befae053 100644
--- a/SOL002/VNFLifecycleManagement-API/NotificationConsumer.robot
+++ b/SOL002/VNFLifecycleManagement-API/NotificationConsumer.robot
@@ -1,89 +1,89 @@
-*** Settings ***
-Library    String
-Resource    environment/variables.txt 
-Resource    VnfLcmOperationKeywords.robot
-Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
-Library    OperatingSystem
-Library    JSONLibrary
-Library    JSONSchemaLibrary    schemas/
-Suite Setup    Check resource existence and get CallbackUri
-
-*** Test Cases ***
-VNF LCM Operation Occurrence Notification
-    [Documentation]    Test ID: 6.3.5.21.1
-    ...    Test title: VNF LCM Operation Occurrence Start Notification
-    ...    Test objective:  The objective is to test that VNF LCM Operation Occurrence Notification is delivered with success to the notification consumer
-    ...    Pre-conditions: A subscription for VNF LCM Operation Occurrence notifications is available in the VNFM.
-    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_Notif_Endpoint
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post VNF LCM Operation Occurrence Notification
-    Check HTTP Response Status Code Is    204
-
-VNF Identifier Creation Notification
-    [Documentation]    Test ID: 6.3.5.21.2
-    ...    Test title: VNF Identifier Creation Notification
-    ...    Test objective:  The objective is to test that VNF Identifier Creation Notification is delivered with success to the notification consumer
-    ...    Pre-conditions: A subscription for VNF Identifier Creation Notification is available in the VNFM.
-    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_Notif_Endpoint
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post VNF Identifier Creation Notification
-    Check HTTP Response Status Code Is    204
-    
-VNF Identifier Deletion Notification
-    [Documentation]    Test ID: 6.3.5.21.3
-    ...    Test title: VNF Identifier Deletion Notification
-    ...    Test objective:  The objective is to test that VNF Identifier Deletion Notification is delivered with success to the notification consumer
-    ...    Pre-conditions: A subscription for VNF Identifier Deletion Notification is available in the VNFM.
-    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_Notif_Endpoint
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post VNF Identifier Deletion Notification
-    Check HTTP Response Status Code Is    204
-
-*** Keywords ***
-Check resource existence and get CallbackUri
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
-    Integer    response status    200
-    Validate Json    response body    Subscription.schema.json
-    Set Global Variable    ${callbackResp}    response body callbackUri
-    
-Post VNF LCM Operation Occurrence Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/VnfLcmOperationOccurrenceNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfInstanceId=${vnfInstanceId}    vnfLcmOpOccId=${vnfLcmOpOccId}   
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}	
-	
-Post VNF Identifier Creation Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/VnfIdentifierCreationNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfInstanceId=${vnfInstanceId}  
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}	
-	
-Post VNF Identifier Deletion Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/VnfIdentifierDeletionNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfInstanceId=${vnfInstanceId}  
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
+*** Settings ***
+Library    String
+Resource    environment/variables.txt 
+Resource    VnfLcmOperationKeywords.robot
+Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false
+Library    OperatingSystem
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+VNF LCM Operation Occurrence Notification
+    [Documentation]    Test ID: 6.3.5.21.1
+    ...    Test title: VNF LCM Operation Occurrence Start Notification
+    ...    Test objective:  The objective is to test that VNF LCM Operation Occurrence Notification is delivered with success to the notification consumer
+    ...    Pre-conditions: A subscription for VNF LCM Operation Occurrence notifications is available in the VNFM.
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF LCM Operation Occurrence Notification
+    Check HTTP Response Status Code Is    204
+
+VNF Identifier Creation Notification
+    [Documentation]    Test ID: 6.3.5.21.2
+    ...    Test title: VNF Identifier Creation Notification
+    ...    Test objective:  The objective is to test that VNF Identifier Creation Notification is delivered with success to the notification consumer
+    ...    Pre-conditions: A subscription for VNF Identifier Creation Notification is available in the VNFM.
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF Identifier Creation Notification
+    Check HTTP Response Status Code Is    204
+    
+VNF Identifier Deletion Notification
+    [Documentation]    Test ID: 6.3.5.21.3
+    ...    Test title: VNF Identifier Deletion Notification
+    ...    Test objective:  The objective is to test that VNF Identifier Deletion Notification is delivered with success to the notification consumer
+    ...    Pre-conditions: A subscription for VNF Identifier Deletion Notification is available in the VNFM.
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF Identifier Deletion Notification
+    Check HTTP Response Status Code Is    204
+
+*** Keywords ***
+Check resource existence and get CallbackUri
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    Integer    response status    200
+    Validate Json    response body    Subscription.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+    
+Post VNF LCM Operation Occurrence Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template} =    Get File    jsons/VnfLcmOperationOccurrenceNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfInstanceId=${vnfInstanceId}    vnfLcmOpOccId=${vnfLcmOpOccId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+	
+Post VNF Identifier Creation Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template} =    Get File    jsons/VnfIdentifierCreationNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfInstanceId=${vnfInstanceId}  
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+	
+Post VNF Identifier Deletion Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template} =    Get File    jsons/VnfIdentifierDeletionNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfInstanceId=${vnfInstanceId}  
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
index 40448b7c6..ccaea1ae5 100644
--- a/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
@@ -99,6 +99,6 @@ DELETE Operate VNFInstance - Method not implemented
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot b/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
index 8e7a7fd2a..638712080 100644
--- a/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
@@ -98,6 +98,6 @@ DELETE Retry operation task - Method not implemented
 *** Keywords ***
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot b/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
index 1ed4064c5..382bd0069 100644
--- a/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
@@ -99,6 +99,6 @@ DELETE Rollback operation task - Method not implemented
 *** Keywords ***
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
index e545c237d..9e2a10702 100644
--- a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
@@ -99,6 +99,6 @@ DELETE Scale VNFInstance - Method not implemented
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
index de97db01a..1afc0bd1a 100644
--- a/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
@@ -98,6 +98,6 @@ DELETE Scale to level VNFInstance - Method not implemented
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
index 0656a1724..56ef35f64 100644
--- a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
@@ -86,6 +86,6 @@ DELETE Terminate VNFInstance - Method not implemented
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index e7b58946b..f4cf32f3e 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -19,7 +19,7 @@ Get Vnf Instance
     [Arguments]    ${vnfInstanceId}
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}
     ${body}=    Output    response body
     [Return]    ${body}
@@ -53,7 +53,7 @@ Check VNF Instance
     [Arguments]    ${vnfId}
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${response}=    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfId}
 
 Check VNF Status
@@ -62,12 +62,12 @@ Check VNF Status
     Log    VNF Status in the correct status
 
 Check operation resource state is FAILED_TEMP
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body instantiationState    FAILED_TEMP   
 
 Check operation resource state is FINALLY_FAILED      
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body instantiationState    FINALLY_FAILED  
      
@@ -80,7 +80,7 @@ POST Create a new vnfInstance
     Log    Create VNF instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File
     ${template} =    Get File    jsons/createVnfRequest.json
     ${body}=        Format String   ${template}     vnfdId=${Descriptor_ID}
@@ -92,7 +92,7 @@ GET multiple vnfInstances
      Log    Query VNF The GET method queries information about multiple VNF instances.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 		
@@ -101,7 +101,7 @@ GET multiple vnfInstances with bad attribute
     Log    Query VNF The GET method queries information about multiple VNF instances.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Set Headers    {"Authorization":"${AUTHORIZATION}"} 
+    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"} 
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?attribute_not_exist=some_value
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
@@ -110,42 +110,42 @@ GET multiple vnfInstances with bad filter
     Log    Query VNF The GET method queries information about multiple VNF instances.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"} 
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?fields=wrong_field
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 GET multiple vnfInstances with all_fields attribute selector
     Log    Query status information about multiple VNF instances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 GET multiple vnfInstances with exclude_default attribute selector
     Log    Query status information about multiple VNF instances using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 GET multiple vnfInstances with fields attribute selector
     Log    Query status information about multiple VNF instances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	    
 GET multiple vnfInstances with exclude_default and fields attribute selector
     Log    Query status information about multiple VNF instances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?fields=${fields}&exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 GET multiple vnfInstances with exclude_fields attribute selector
     Log    Query status information about multiple VNF instances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 	
@@ -153,7 +153,7 @@ PUT multiple vnfInstances
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances   	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -167,7 +167,7 @@ PATCH multiple vnfInstances
 	
 DELETE multiple vnfInstances
     Log    Trying to perform a DELETE. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfLcmOpOccId} 	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}   
@@ -176,7 +176,7 @@ POST individual vnfInstance
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}    
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}        
@@ -185,7 +185,7 @@ GET individual vnfInstance
     log    Trying to get information about an individual VNF instance
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}      
@@ -194,7 +194,7 @@ PUT individual vnfInstance
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}	  	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -204,7 +204,7 @@ PATCH individual vnfInstance
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE_PATCH}"}
     Set Headers    {"If-Match": "${original_etag}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     #Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Instance
     ${body}=    Get File    jsons/patchBodyRequest.json
     #${body}=        Format String   ${template}     vnfdId=${descriptor_id}
@@ -213,7 +213,7 @@ PATCH individual vnfInstance
 	Set Global Variable    ${response}    ${outputResponse} 
 DELETE individual vnfInstance
     log    Trying to delete an individual VNF instance
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -222,7 +222,7 @@ POST instantiate individual vnfInstance
     Log    Trying to Instantiate a vnf Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/instantiateVnfRequest.json
     ${body}=        Format String   ${template}     flavourId=${flavourId} 
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/instantiate    ${body}	
@@ -231,28 +231,28 @@ POST instantiate individual vnfInstance
 	
 GET instantiate individual vnfInstance
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/instantiate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 
 PUT instantiate individual vnfInstance
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/instantiate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 
 PATCH instantiate individual vnfInstance
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/instantiate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 
 DELETE instantiate individual vnfInstance
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/instantiate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
@@ -268,7 +268,7 @@ POST Scale vnfInstance
     Log    Trying to Instantiate a vnf Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/scaleVnfRequest.json
     Run Keyword If    ${vnf_state} == 0    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${instantiatedVnfInstanceId}/scale    ${body}
     Run Keyword If    ${vnf_state} == 1    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notInstantiatedVnfInstanceId}/scale    ${body}
@@ -283,7 +283,7 @@ POST Scale vnfInstance
     # Log    Trying to Instantiate a vnf Instance
     # Set Headers  {"Accept":"${ACCEPT}"}  
     # Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    # Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    # Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     # ${template}=    Get File    jsons/scaleVnfRequest.json
     # ${body}=        Format String   ${template}     scaleVnfRequesttype=${scaleVnfRequesttype}    scaleVnfRequestAspect=${scaleVnfRequestAspect} 
     # Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
@@ -293,7 +293,7 @@ GET Scale vnfInstance
     Log    Trying to get a scale a vnf Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/scaleVnfRequest.json
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    
     ${outputResponse}=    Output    response
@@ -302,7 +302,7 @@ PUT Scale vnfInstance
     Log    Trying to modify a scale vnf Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/scaleVnfRequest.json
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale   
     ${outputResponse}=    Output    response
@@ -311,7 +311,7 @@ PATCH Scale vnfInstance
     Log    Trying to modify a scale vnf Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/scaleVnfRequest.json
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale   
     ${outputResponse}=    Output    response
@@ -320,7 +320,7 @@ DELETE Scale vnfInstance
     Log    Trying to modify a scale vnf Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/scaleVnfRequest.json
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale   
     ${outputResponse}=    Output    response
@@ -330,7 +330,7 @@ POST Scale vnfInstance to level
     Log    Trying to scale a vnf Instance to level
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/scaleVnfToLevelRequest.json
     ${body}=        Format String   ${template}     newFlavourId=${newFlavourId} 
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
@@ -338,28 +338,28 @@ POST Scale vnfInstance to level
 	Set Global Variable    ${response}    ${outputResponse} 
 GET Scale vnfInstance to level
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PUT Scale vnfInstance to level
     log    Trying to perform a PUT. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PATCH Scale vnfInstance to level
     log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 	
 DELETE Scale vnfInstance to level
     log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
@@ -368,7 +368,7 @@ POST Change VNF deployment flavour
     Log    Trying to change the deployment flavour of a VNF instance.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/changeVnfFlavourRequest.json
     ${body}=        Format String   ${template}     newFlavourId=${newFlavourId} 
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_flavour    ${body} 
@@ -376,14 +376,14 @@ POST Change VNF deployment flavour
 	Set Global Variable    ${response}    ${outputResponse}  	 
 GET Change VNF deployment flavour
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_flavour 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PUT Change VNF deployment flavour
     log    Trying to perform a PUT. This method should not be implemented 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_flavour 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -397,7 +397,7 @@ PATCH Change VNF deployment flavour
 	
 DELETE Change VNF deployment flavour
     Log    Trying to perform a DELETE. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_flavour   	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -406,7 +406,7 @@ POST Terminate VNF
     Log    Trying to terminate a VNF instance.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/terminateVnfRequest.json
     ${body}=        Format String   ${template}     terminationType=${terminationType} 
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/terminate    ${body}	
@@ -415,28 +415,28 @@ POST Terminate VNF
 
 GET Terminate VNF
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/terminate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PUT Terminate VNF
     log    Trying to perform a PUT. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/terminate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PATCH Terminate VNF
     log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/terminate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 	
 DELETE Terminate VNF
     log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/terminate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
@@ -445,7 +445,7 @@ POST Heal VNF
     Log    Trying to heal a VNF instance.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/healVnfRequest.json
     ${body}=        Format String   ${template}     healingCause=${healingCause} 
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/heal    ${body}		
@@ -454,28 +454,28 @@ POST Heal VNF
 
 GET Heal VNF
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/heal  
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PUT Heal VNF
     log    Trying to perform a PUT. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/heal 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PATCH Heal VNF
     log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/heal 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 	
 DELETE Heal VNF
     log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/heal 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}			
@@ -484,7 +484,7 @@ POST Change External VNF Connectivity
     Log    Trying to change the external connectivity of a VNF instance.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/changeExtVnfConnectivityRequest.json
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn    ${body}
     ${outputResponse}=    Output    response
@@ -492,14 +492,14 @@ POST Change External VNF Connectivity
 
 GET Change External VNF Connectivity
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PUT Change External VNF Connectivity
     log    Trying to perform a PUT. This method should not be implemented 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn  		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -513,7 +513,7 @@ PATCH Change External VNF Connectivity
 	
 DELETE Change External VNF Connectivity
     Log    Trying to perform a DELETE. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn  	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -522,7 +522,7 @@ POST Operate VNF
     Log    Trying to operate a VNF instance.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/operateVnfRequest.json
     ${body}=        Format String   ${template}     changeStateTo=${changeStateTo} 
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/operate    ${body}
@@ -531,28 +531,28 @@ POST Operate VNF
 
 GET Operate VNF
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/operate  
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PUT Operate VNF
     log    Trying to perform a PUT. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/operate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PATCH Operate VNF
     log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/operate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 	
 DELETE Operate VNF
     log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/operate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
@@ -560,14 +560,14 @@ DELETE Operate VNF
 Post VNF LCM OP occurrences
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs  	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 GET VNF LCM OP occurrences
     Log    Query status information about multiple VNF lifecycle management operation occurrences.
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs
     ${outputResponse}=    Output    response
@@ -575,76 +575,76 @@ GET VNF LCM OP occurrences
 GET VNF LCM OP occurrences invalid attribute
     Log    Query status information about multiple VNF lifecycle management operation occurrences.
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"} 
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?attribute_not_exist=some_value	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 GET VNF LCM OP occurrences invalid filter
     Log    Query status information about multiple VNF lifecycle management operation occurrences.
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"} 
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?fields=wrong_field	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 PUT VNF LCM OP occurrences	
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 PATCH VNF LCM OP occurrences	
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}			
 DELETE VNF LCM OP occurrences	
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Post Individual VNF LCM OP occurrences
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Get Individual VNF LCM OP occurrences
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Put Individual VNF LCM OP occurrences
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 Patch Individual VNF LCM OP occurrences
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch   ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 Delete Individual VNF LCM OP occurrences
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}			
 Post Retry operation
     Log    Retry a VNF lifecycle operation if that operation has experienced a temporary failure
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
     ${outputResponse}=    Output    response
@@ -652,7 +652,7 @@ Post Retry operation
 Get Retry operation	
     Log    Trying to perform a GET. This method should not be implemented.
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
     ${outputResponse}=    Output    response
@@ -660,27 +660,27 @@ Get Retry operation
 Put Retry operation	
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Patch Retry operation	
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Delete Retry operation    
 	log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Post Rollback operation
     Log    Rollback a VNF lifecycle operation if that operation has experienced a temporary failure
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback
     ${outputResponse}=    Output    response
@@ -688,7 +688,7 @@ Post Rollback operation
 Get Rollback operation	
     Log    Trying to perform a GET. This method should not be implemented.
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback	
     ${outputResponse}=    Output    response
@@ -696,27 +696,27 @@ Get Rollback operation
 Put Rollback operation	
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Patch Rollback operation	
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Delete Rollback operation    
 	log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Post Fail operation
     Log    mark as Failed a VNF lifecycle operation if that operation has experienced a failure
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
     ${outputResponse}=    Output    response
@@ -724,7 +724,7 @@ Post Fail operation
 Get Fail operation	
     Log    Trying to perform a GET. This method should not be implemented.
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
     ${outputResponse}=    Output    response
@@ -732,28 +732,28 @@ Get Fail operation
 Put Fail operation	
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Patch Fail operation	
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Delete Fail operation    
 	log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 
 POST Cancel operation task
     Log    Cancel an ongoing VNF lifecycle operation
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Cancel a VNF lifecycle operation
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel    ${CancelMode}
     Log    Validate Status code
@@ -762,14 +762,14 @@ POST Cancel operation task
     
 GET Cancel operation task
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PUT Cancel operation task
     log    Trying to perform a PUT. This method should not be implemented 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel  		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -783,7 +783,7 @@ PATCH Cancel operation task
 	
 DELETE Cancel operation task
     Log    Trying to perform a DELETE. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel  	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}        
@@ -792,7 +792,7 @@ Post Create subscription
     Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
     ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
@@ -803,7 +803,7 @@ Post Create subscription - DUPLICATION
     Pass Execution If    ${VNFM_DUPLICATION} == 0    VNFM is not permitting duplication. Skipping the test
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
     ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}		
@@ -814,7 +814,7 @@ Post Create subscription - NO-DUPLICATION
     Pass Execution If    ${VNFM_DUPLICATION} == 1    VNFM permits duplication. Skipping the test
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
     ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
@@ -824,7 +824,7 @@ Get subscriptions
     Log    Get the list of active subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions	
     ${outputResponse}=    Output    response
@@ -833,42 +833,42 @@ Get subscriptions - filter
     Log    Get the list of active subscriptions using a filter
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Get subscriptions - invalid filter  
     Log    Get the list of active subscriptions using an invalid filter
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter_invalid}   
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Get subscriptions with all_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get subscriptions with exclude_default attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get subscriptions with fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 Get subscriptions with exclude_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
@@ -876,7 +876,7 @@ PUT subscriptions
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions  	   
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
@@ -884,7 +884,7 @@ PATCH subscriptions
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions  	   
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
@@ -892,7 +892,7 @@ DELETE subscriptions
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions  	   
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
@@ -900,14 +900,14 @@ Post Create Individual subscription
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Get Individual subscription	
     log    Trying to get information about an individual subscription
     Set Headers    {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
@@ -915,7 +915,7 @@ Put Individual subscription
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
@@ -923,14 +923,14 @@ Patch Individual subscription
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	    
 Delete Individual subscription
     log    Try to delete an individual subscription
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -1000,13 +1000,13 @@ GET test endpoint
 Check Subscription resource exist
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     Integer    response status    200
 
 Get VNF LCM Operation occurrences with all_fields attribute selector
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?all_fields
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1014,28 +1014,28 @@ Get VNF LCM Operation occurrences with all_fields attribute selector
 
 Get VNF LCM Operation occurrences with exclude_default attribute selector
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Get VNF LCM Operation occurrences with fields attribute selector
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Get VNF LCM Operation occurrences with exclude_default and fields attribute selector
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?fields=${fields}&exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Get VNF LCM Operation occurrences with exclude_fields attribute selector
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 	
diff --git a/SOL002/VNFLifecycleManagement-API/environment/variables.txt b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
index 9bc19c287..7a8e8c363 100644
--- a/SOL002/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
@@ -5,7 +5,8 @@ ${NFVO_HOST}      localhost    # Hostname of the NFVO
 ${NFVO_PORT}      8081    # Listening port of the NFVO
 ${VNFM_SCHEMA}    https
 ${NFVO_SCHEMA}    https
-${AUTHORIZATION}    Bearer    QWxhZGRpbjpvcGVuIHNlc2FtZQ==
+${AUTHORIZATION_HEADER}    Authorization
+${AUTHORIZATION_TOKEN}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 ${CONTENT_TYPE}    application/json
 ${CONTENT_TYPE_PATCH}    application/merge-patch+json
 ${ACCEPT}         application/json
diff --git a/SOL002/VNFPerformanceManagement-API/ApiVersion.robot b/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
index 0e98a8396..7a7e70086 100644
--- a/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
+++ b/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
@@ -131,70 +131,70 @@ DELETE API Version with apiMajorVerion - Method not implemented
 *** Keywords ***
 POST API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
index b95e714b4..ca839fbe2 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
@@ -115,7 +115,7 @@ PATCH Individual VNF Performance Job - Precondition failed
 GET individual VNF Performance Job
     Log    Trying to get a Pm Job present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -123,7 +123,7 @@ GET individual VNF Performance Job
 GET individual VNF Performance Job with invalid resource identifier  
     Log    Trying to perform a negative get, using erroneous PM Job identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${erroneousPmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -131,7 +131,7 @@ GET individual VNF Performance Job with invalid resource identifier
 Send Delete request for individual VNF Performance Job
     Log    Trying to delete an existing PM Job
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -139,7 +139,7 @@ Send Delete request for individual VNF Performance Job
 Send Delete request for individual VNF Performance Job with invalid resource identifier
     Log    Trying to perform a negative delete, using erroneous PM Job identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${erroneousPmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -147,7 +147,7 @@ Send Delete request for individual VNF Performance Job with invalid resource ide
 Send Post request for individual VNF Performance Job    
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${newPmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -155,7 +155,7 @@ Send Post request for individual VNF Performance Job
 Send Put request for individual VNF Performance Job    
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -166,7 +166,7 @@ Send Put request for individual VNF Performance Job
 Send Patch request for individual VNF Performance Job    
     Set Headers  {"Accept":"${ACCEPT_JSON}"} 
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/PMJobModification.json
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}     ${body}
     ${output}=    Output    response
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
index 9f038e8bb..38845b3bd 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
@@ -83,7 +83,7 @@ DELETE Individual Performance Report - Method not implemented
 Get Individual Performance Report
     Log    Trying to get a performance report present in the VNFM
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -91,21 +91,21 @@ Get Individual Performance Report
 Get Individual Performance Report with invalid resource endpoint
     Log    Trying to get a performance report with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${erroneousReportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for Individual Performance Report
     Log    Trying to create new performance report
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for Individual Performance Report
     Log    Trying to update performance report
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -115,7 +115,7 @@ Send Put request for Individual Performance Report
     
 Send Patch request for Individual Performance Report
     Log    Trying to update performance report
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -125,7 +125,7 @@ Send Patch request for Individual Performance Report
 
 Send Delete request for Individual Performance Report
     Log    Trying to delete performance report   
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -137,7 +137,7 @@ Check Postcondition VNF Individual Performance Report Exists
 Check Postcondition VNF Individual Performance Report is not Created
     Log    Trying to get a new report
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
index d0e7bc390..cab48da3d 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -114,7 +114,7 @@ PATCH Individual Threshold - Precondition failed
 GET Individual VNF Performance Threshold
     Log    Trying to get a Threhsold present in the VNFM
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -122,28 +122,28 @@ GET Individual VNF Performance Threshold
 GET individual VNF Performance Threshold with invalid resource identifier
     Log    Trying to get a Threhsold with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${erroneousThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual VNF Performance Threshold
     Log    Trying to delete a Threhsold in the VNFM
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual VNF Performance Threshold with invalid resource identifier
     Log    Trying to delete a Threhsold in the VNFM with invalid id
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${erroneousThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual VNF Performance Threshold
     Log    Trying to create new threshold
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${newThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -151,7 +151,7 @@ Send Post request for individual VNF Performance Threshold
 Send Put request for individual VNF Performance Threshold
     Log    Trying to PUT threshold
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -162,7 +162,7 @@ Send Put request for individual VNF Performance Threshold
 Send Patch request for individual VNF Performance Threshold
     Log    Trying to PUT threshold
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
diff --git a/SOL002/VNFPerformanceManagement-API/NotificationConsumer.robot b/SOL002/VNFPerformanceManagement-API/NotificationConsumer.robot
index ed697e43e..2d557051e 100644
--- a/SOL002/VNFPerformanceManagement-API/NotificationConsumer.robot
+++ b/SOL002/VNFPerformanceManagement-API/NotificationConsumer.robot
@@ -1,71 +1,71 @@
-*** Settings ***
-Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt
-Library           JSONLibrary
-Library           OperatingSystem
-Library           String
-Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
-Suite Setup    Check resource existence and get CallbackUri
-
-*** Test Cases ***
-VNF Performance Information Availability Notification
-    [Documentation]    Test ID: 6.3.3.10.1
-    ...    Test title: VNF Performance Information Availability Notification
-    ...    Test objective: The objective is to test that VNF Performance Information Availability Notification is delivered with success to the notification consumer
-    ...    Pre-conditions: A VNF performance job is created, and a subscription for information availability notifications is available in the VNFM.
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_Notif_Endpoint
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post VNF Performance Information Availability Notification
-    Check HTTP Response Status Code Is    204
-    
-VNF Threshold Crossed Notification
-    [Documentation]    Test ID: 6.3.3.10.2
-    ...    Test title: VNF Threshold Crossed Notification
-    ...    Test objective: The objective is to test that VNF Threshold Crossed Notification is delivered with success to the notification consumer
-    ...    Pre-conditions: A VNF performance job is created, and a subscription for Threshold Crossed Notification is available in the VNFM.
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_Notif_Endpoint
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post VNF Threshold Crossed Notification
-    Check HTTP Response Status Code Is    204
-    
-*** Keywords ***
-Check resource existence and get CallbackUri
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}	
-    Integer    response status    200
-    Validate Json    response body    PmJob.schema.json
-    Set Global Variable    ${callbackResp}    response body callbackUri
-    
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}
-    ${status}=    Convert To Integer    ${expected_status}    
-    Should Be Equal    ${response['status']}    ${status} 
-    Log    Status code validated
-    
-Post VNF Performance Information Availability Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/PerformanceInformationAvaliableNotification.json
-    ${body}=        Format String   ${template}    objectInstanceId=${objectInstanceId} 
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}	
-
-Post VNF Threshold Crossed Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/ThresholdCrossedNotification.json
-    ${body}=        Format String   ${template}    thresholdId=${thresholdId}    objectInstanceId=${objectInstanceId} 
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}	
+*** Settings ***
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt
+Library           JSONLibrary
+Library           OperatingSystem
+Library           String
+Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+VNF Performance Information Availability Notification
+    [Documentation]    Test ID: 6.3.3.10.1
+    ...    Test title: VNF Performance Information Availability Notification
+    ...    Test objective: The objective is to test that VNF Performance Information Availability Notification is delivered with success to the notification consumer
+    ...    Pre-conditions: A VNF performance job is created, and a subscription for information availability notifications is available in the VNFM.
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF Performance Information Availability Notification
+    Check HTTP Response Status Code Is    204
+    
+VNF Threshold Crossed Notification
+    [Documentation]    Test ID: 6.3.3.10.2
+    ...    Test title: VNF Threshold Crossed Notification
+    ...    Test objective: The objective is to test that VNF Threshold Crossed Notification is delivered with success to the notification consumer
+    ...    Pre-conditions: A VNF performance job is created, and a subscription for Threshold Crossed Notification is available in the VNFM.
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF Threshold Crossed Notification
+    Check HTTP Response Status Code Is    204
+    
+*** Keywords ***
+Check resource existence and get CallbackUri
+    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}/pm_jobs/${pmJobId}	
+    Integer    response status    200
+    Validate Json    response body    PmJob.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+    
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}
+    ${status}=    Convert To Integer    ${expected_status}    
+    Should Be Equal    ${response['status']}    ${status} 
+    Log    Status code validated
+    
+Post VNF Performance Information Availability Notification
+    log    Trying to perform a POST to get notification
+    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/PerformanceInformationAvaliableNotification.json
+    ${body}=        Format String   ${template}    objectInstanceId=${objectInstanceId} 
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+
+Post VNF Threshold Crossed Notification
+    log    Trying to perform a POST to get notification
+    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/ThresholdCrossedNotification.json
+    ${body}=        Format String   ${template}    thresholdId=${thresholdId}    objectInstanceId=${objectInstanceId} 
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
diff --git a/SOL002/VNFPerformanceManagement-API/PMJobs.robot b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
index 1c7dc8e97..8da793e3a 100644
--- a/SOL002/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
@@ -208,7 +208,7 @@ GET all VNF Performance Monitoring Jobs with exclude_default and fields attribut
 GET all VNF Performance Monitoring Jobs
     Log    Trying to get all PM Jobs present in the VNFM
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -216,7 +216,7 @@ GET all VNF Performance Monitoring Jobs
 GET VNF Performance Monitoring Jobs with attribute-based filter
     Log    Trying to get all PM Jobs present in the VNFM, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?${POS_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -224,7 +224,7 @@ GET VNF Performance Monitoring Jobs with attribute-based filter
 GET VNF Performance Monitoring Jobs with all_fields attribute selector
     Log    Trying to get all PM Jobs present in the VNFM, using 'all_fields' filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?all_fields
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -232,7 +232,7 @@ GET VNF Performance Monitoring Jobs with all_fields attribute selector
 GET VNF Performance Monitoring Jobs with exclude_default attribute selector
     Log    Trying to get all VNF Packages present in the VNFM, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -241,7 +241,7 @@ GET VNF Performance Monitoring Jobs with fields attribute selector
     Log    Trying to get all VNF Packages present in the VNFM, using filter params
     Pass Execution If    ${FIELD_USAGE} == 0    Skipping test as VNFM is not supporting 'fields'
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -249,7 +249,7 @@ GET VNF Performance Monitoring Jobs with fields attribute selector
 GET VNF Performance Monitoring Jobs with exclude_default and fields attribute selector
     Log    Trying to get all VNF Packages present in the VNFM, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?fields=${fields}&exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -258,7 +258,7 @@ GET VNF Performance Monitoring Jobs with exclude_fields attribute selector
     Log    Trying to get all VNF Packages present in the VNFM, using filter params
     Pass Execution If    ${FIELD_USAGE} == 0    Skipping test as VNFM is not supporting 'fields'
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -266,7 +266,7 @@ GET VNF Performance Monitoring Jobs with exclude_fields attribute selector
 GET VNF Performance Monitoring Jobs with invalid attribute-based filter
     Log    Trying to get all PM Jobs present in the VNFM, using an erroneous filter param
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?${NEG_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -274,7 +274,7 @@ GET VNF Performance Monitoring Jobs with invalid attribute-based filter
 GET VNF Performance Monitoring Jobs with invalid resource endpoint    
     Log    Trying to perform a GET on a erroneous URI
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_job    # wrong URI /pm_job instead of /pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -283,7 +283,7 @@ Send Post Request Create new VNF Performance Monitoring Job
     Log    Creating a new PM Job
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/CreatePmJobRequest.json
     ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}    callback_uri=${callback_uri}:${callback_port}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs    ${body}
@@ -293,7 +293,7 @@ Send Post Request Create new VNF Performance Monitoring Job
 Send PUT Request for all VNF Performance Monitoring Jobs 
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -301,7 +301,7 @@ Send PUT Request for all VNF Performance Monitoring Jobs
 Send PATCH Request for all VNF Performance Monitoring Jobs 
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -309,7 +309,7 @@ Send PATCH Request for all VNF Performance Monitoring Jobs
 Send DELETE Request for all VNF Performance Monitoring Jobs 
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -317,7 +317,7 @@ Send DELETE Request for all VNF Performance Monitoring Jobs
 Check Postcondition PmJob Exists
     Log    Checking that Pm Job exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL002/VNFPerformanceManagement-API/Thresholds.robot b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
index 7505e15f2..d02e7c625 100644
--- a/SOL002/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
@@ -141,7 +141,7 @@ GET Performance Thresholds for Bad Request Response too big
 GET all Performance Thresholds
     Log    Trying to get all thresholds present in the VNFM    
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -149,7 +149,7 @@ GET all Performance Thresholds
 GET Performance Thresholds with attribute-based filter
     Log    Trying to get thresholds present in the VNFM with filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds?${FILTER_OK}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -157,7 +157,7 @@ GET Performance Thresholds with attribute-based filter
 GET Performance Thresholds with invalid attribute-based filter
     Log    Trying to get thresholds present in the VNFM with invalid filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds?${FILTER_KO}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -165,14 +165,14 @@ GET Performance Thresholds with invalid attribute-based filter
 GET VNF Performance Thresholds with invalid resource endpoint
     Log    Trying to get thresholds present in the VNFM with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/threshold
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post Request Create new Performance Threshold
     Log    Creating a new THreshold
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${template}=    Get File    jsons/CreateThresholdRequest.json
@@ -183,7 +183,7 @@ Send Post Request Create new Performance Threshold
 
 Send PUT Request for all Performance Thresholds
     Log    PUT THresholds
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
@@ -192,7 +192,7 @@ Send PUT Request for all Performance Thresholds
     
 Send PATCH Request for all Performance Thresholds
     Log    PUT THresholds
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
@@ -201,7 +201,7 @@ Send PATCH Request for all Performance Thresholds
 
 Send DELETE Request for all Performance Thresholds
     Log    DELETE THresholds
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -209,7 +209,7 @@ Send DELETE Request for all Performance Thresholds
 Check Postcondition Threshold Exists
     Log    Checking that Threshold exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
index f7468404c..a5e14818d 100644
--- a/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
+++ b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
@@ -20,7 +20,7 @@ Get all VNF Performance Subscriptions
     ...    request and response data structures, and response codes.
     Set headers    {"Accept": "application/json"}
     Set headers    {"Content-Type": "application/json"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -39,7 +39,7 @@ Get all VNF Performance Subscriptions
     ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
     ...    request and response data structures, and response codes.
     Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ok}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -59,7 +59,7 @@ Get VNF Performance Subscriptions with invalid attribute-based filters
     ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
     ...    request and response data structures, and response codes.
     Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ko}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -78,7 +78,7 @@ Get VNF Performance Subscriptions with invalid resource endpoint
     ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
     ...    request and response data structures, and response codes.
     Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -104,7 +104,7 @@ Send Post Request for VNF Performance Subscription
     ...    the existing subscription resource with the same filter and callbackUri).
     Set headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body_request}=    Get File    jsons/subscriptions.json
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body_request}
     ${output}=    Output    response
@@ -135,7 +135,7 @@ Send Post Request for Duplicated VNF Performance Subscription
     ...    the existing subscription resource with the same filter and callbackUri).
     Set headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body_request}=    Get File    jsons/subscriptions.json
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body_request}
     ${output}=    Output    response
@@ -156,7 +156,7 @@ Send Post Request for Duplicated VNF Performance Subscription
 Send Put Request for VNF Performance Subscriptions
     [Documentation]    This method is not supported. When this method is requested on this resource, the VNFM shall return a "405 Method
     ...    Not Allowed" response as defined in Clause 4.3.5.4.
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -166,7 +166,7 @@ Send Put Request for VNF Performance Subscriptions
 Send Patch Request for VNF Performance Subscriptions
     [Documentation]    This method is not supported. When this method is requested on this resource, the VNFM shall return a "405 Method
     ...    Not Allowed" response as defined in Clause 4.3.5.4.
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -176,7 +176,7 @@ Send Patch Request for VNF Performance Subscriptions
 Send Delete Request for VNF Performance Subscriptions
     [Documentation]    This method is not supported. When this method is requested on this resource, the VNFM shall return a "405 Method
     ...    Not Allowed" response as defined in Clause 4.3.5.4.
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -185,40 +185,40 @@ Send Delete Request for VNF Performance Subscriptions
 
 Get Individual VNF Performance Subscription
     Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 GET individual VNF Performance Subscription with invalid resource identifier
     Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual VNF Performance Subscription
     Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual VNF Performance Subscription with invalid resource identifier
     Log    Trying to delete a subscription in the VNFM with invalid id
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual VNF Performance Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for individual VNF Performance Threshold
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -227,7 +227,7 @@ Send Put request for individual VNF Performance Threshold
     Set Suite Variable    ${response}    ${output}
     
 Send Patch request for individual VNF Performance Threshold
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -246,7 +246,7 @@ Check Postcondition VNF Performance Subscription is Unmodified (Implicit)
 Check Postcondition VNF Performance Subscription is not Created
     Log    Trying to get a new subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL002/VNFPerformanceManagement-API/environment/variables.txt b/SOL002/VNFPerformanceManagement-API/environment/variables.txt
index b3453720a..f06af76c5 100644
--- a/SOL002/VNFPerformanceManagement-API/environment/variables.txt
+++ b/SOL002/VNFPerformanceManagement-API/environment/variables.txt
@@ -12,7 +12,8 @@ ${CONTENT_TYPE_JSON}    application/json
 ${ACCEPT_JSON}    application/json
 ${NEG_AUTHORIZATION}    Bearer negativetoken
 ${FIELD_USAGE}    1
-${AUTHORIZATION}    Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9
+${AUTHORIZATION_HEADER}    Authorization
+${AUTHORIZATION_TOKEN}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 ${AUTH_USAGE}    1
 ${VNFM_DUPLICATION}    1
 ${VNFM_CHECKS_NOTIF_ENDPOINT}    1
-- 
GitLab


From 3289ba78fa29a6c814f7c44c3bb1b259d8ac8d46 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Fri, 12 Feb 2021 10:54:52 +0100
Subject: [PATCH 285/322] updated authorization header and token use in SOL003
 v2.7.1

---
 .../VNFFaultManagement-API/ApiVersion.robot   |  20 +-
 .../FaultManagement-APIKeyword.robot          |  94 +--
 .../NotificationConsumer.robot                | 186 ++---
 .../environment/variables.txt                 |   3 +-
 SOL003/VNFIndicator-API/ApiVersion.robot      |  20 +-
 .../NotificationConsumer.robot                |  92 +--
 .../VNFIndicatorsKeywords.robot               |  82 +-
 .../environment/variables.txt                 |   7 +-
 .../ApiVersion.robot                          |  20 +-
 .../CancelOperationWorkflow.robot             |   6 +-
 .../FailOperationWorkflow.robot               |   2 +-
 .../IndividualVNFInstance.robot               |   2 +-
 .../InstantiateVNFTaskWorkflow.robot          |   2 +-
 .../NotificationConsumer.robot                | 182 ++--
 .../OperateVNFTask.robot                      |   2 +-
 .../RetryOperationTask.robot                  |   2 +-
 .../RetryOperationWorkflow.robot              |   4 +-
 .../RollBackOperationWorkflow.robot           |   4 +-
 .../RollbackOperationTask.robot               |   2 +-
 .../ScaleVNFTask.robot                        |   2 +-
 .../SubscriptionKeywords.robot                |   2 +-
 .../TerminateVNFTask.robot                    |   2 +-
 .../VnfLcmMntOperationKeywords.robot          | 300 +++----
 .../environment/variables.txt                 |   3 +-
 .../ApiVersion.robot                          |  20 +-
 .../Grants.robot                              |  16 +-
 .../IndividualGrant.robot                     |  12 +-
 .../environment/variables.txt                 |   3 +-
 .../VNFPackageManagement-API/ApiVersion.robot |  20 +-
 .../ManifestInIndividualVNFPackage.robot      | 414 +++++-----
 .../NotificationConsumer.robot                | 138 ++--
 .../VNFPackageArtifacts.robot                 | 776 +++++++++---------
 .../VNFPackageManagementKeywords.robot        | 326 ++++----
 .../environment/variables.txt                 |   3 +-
 .../ApiVersion.robot                          |  20 +-
 .../IndividualPmJob.robot                     |  16 +-
 .../IndividualReport.robot                    |  12 +-
 .../IndividualThreshold.robot                 |  14 +-
 .../NotificationConsumer.robot                | 136 +--
 .../VNFPerformanceManagement-API/PMJobs.robot |  28 +-
 .../Thresholds.robot                          |  18 +-
 .../environment/variables.txt                 |   3 +-
 .../ApiVersion.robot                          |  20 +-
 .../NotificationConsumer.robot                |  92 +--
 .../VRQANOperationKeywords.robot              |  30 +-
 .../environment/variables.txt                 |   3 +-
 46 files changed, 1584 insertions(+), 1577 deletions(-)

diff --git a/SOL003/VNFFaultManagement-API/ApiVersion.robot b/SOL003/VNFFaultManagement-API/ApiVersion.robot
index b265a9a56..6c7d8bddf 100644
--- a/SOL003/VNFFaultManagement-API/ApiVersion.robot
+++ b/SOL003/VNFFaultManagement-API/ApiVersion.robot
@@ -133,70 +133,70 @@ DELETE API Version with apiMajorVerion - Method not implemented
 *** Keywords ***
 POST API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
diff --git a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
index b833c9354..9c1f50f5a 100644
--- a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
+++ b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
@@ -15,7 +15,7 @@ ${original_etag}    1234
 *** Keywords ***
 Check created Subscription existence
     Set Headers    {"Accept":"${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
     Integer    response status    200  
 Check Postcondition FaultManagement Subscription Is Set
@@ -37,13 +37,13 @@ Check Precondition VNF fault management individual alarm Exists
       
 Check Individual Subscription existence
     Set Headers    {"Accept":"${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
     Integer    response status    200
     
 Check Individual Subscription deleted
     Set Headers    {"Accept":"${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
     Integer    response status    404
     
@@ -72,7 +72,7 @@ Check HTTP Response Header ContentType is
     
 Check Postcondition Subscription Resource Returned in Location Header Is Available
     Log    Going to check postcondition
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${response['headers']['Location']}
     Integer    response status    200
     Log    Received a 200 OK as expected
@@ -85,7 +85,7 @@ Check Postcondition Subscription Resource Returned in Location Header Is Availab
 Send POST request for fault management Alarms
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
@@ -93,7 +93,7 @@ Send POST request for fault management Alarms
 PATCH Fault management Alarms
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse} =    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
@@ -101,7 +101,7 @@ PATCH Fault management Alarms
 PUT Fault management Alarms
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
@@ -109,7 +109,7 @@ PUT Fault management Alarms
 DELETE Fault management Alarms
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -117,7 +117,7 @@ DELETE Fault management Alarms
 GET Fault Management Alarms
     Log    Query NFVO The GET method queries information about multiple alarms.
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response
@@ -126,7 +126,7 @@ GET Fault Management Alarms
 GET Fault Management Alarms With Filters
 	Log    Query NFVO The GET method queries information about multiple alarms with filters.
 	Set Headers  {"Accept":"${ACCEPT}"}  
-	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
 	Log    Execute Query
 	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?${alarm_filter}=${nsInstanceId}
 	${outputResponse}=    Output    response
@@ -135,7 +135,7 @@ GET Fault Management Alarms With Filters
 GET Fault Management Alarms With Invalid Filters
 	Log    Query NFVO The GET method queries information about multiple alarms with filters.
 	Set Headers  {"Accept":"${ACCEPT}"}  
-	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
 	Log    Execute Query
 	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?${invalid_alarm_filter}=${nsInstanceId}
 	${outputResponse}=    Output    response
@@ -144,7 +144,7 @@ GET Alarms Task with all_fields attribute selector
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using fields
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -152,7 +152,7 @@ GET Alarms Task with exclude_default attribute selector
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using fields
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -160,7 +160,7 @@ GET Alarms Task with fields attribute selector
     Log    Trying to get all alarms present in the NFVO Catalogue, using fields
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
@@ -168,14 +168,14 @@ GET Alarms Task with exclude_fields attribute selector
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using fields
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 	
 Send POST request for fault management Individual Alarm
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
@@ -183,7 +183,7 @@ Send POST request for fault management Individual Alarm
 DELETE Fault Management Individual Alarm
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -191,7 +191,7 @@ DELETE Fault Management Individual Alarm
 PUT Fault Management Individual Alarm
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -200,7 +200,7 @@ GET Fault Management Individual Alarm
     Log    Query VNF The GET method queries information about an alarm.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${etag}    Output    response headers ETag
@@ -212,7 +212,7 @@ GET Fault Management Individual Alarm with invalid id
     Log    Query NFVO The GET method queries information about an invalid alarm. Should return does not exist
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query 
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${invalidAlarmId}
     ${outputResponse}=    Output    response
@@ -222,7 +222,7 @@ PATCH Fault Management Individual Alarm
     log    Trying to perform a PATCH. This method modifies an individual alarm resource
     Set Headers  {"Accept":"${ACCEPT}"} 
     Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/alarmModifications.json
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}    ${body}
     ${outputResponse}=    Output    response
@@ -233,7 +233,7 @@ PATCH Fault Management Individual Alarm - precondition failed
     Set Headers  {"Accept":"${ACCEPT}"} 
     Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
     Set Headers    {"If-Match": "${original_etag[0]}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/alarmModifications.json
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}    ${body}
     ${outputResponse}=    Output    response
@@ -244,7 +244,7 @@ PATCH Fault Management Individual Alarm Conflict
     Set Headers  {"Accept":"${ACCEPT}"} 
     Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
     Set Headers    {"If-Match": "${Etag}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/alarmModifications.json
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}    ${body}
     ${outputResponse}=    Output    response
@@ -254,7 +254,7 @@ POST Subscription
     Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
     ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}      callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
@@ -266,7 +266,7 @@ Send POST Request for duplicated subscription
     Pass Execution If    ${VNFM_DUPLICATION} == 0    NVFO is not permitting duplication. Skipping the test
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
     ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
@@ -278,7 +278,7 @@ Send POST Request for duplicated subscription not permitted
     Pass Execution If    ${VNFM_DUPLICATION} == 1    NVFO is not permitting duplication. Skipping the test
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
     ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
@@ -288,7 +288,7 @@ Send POST Request for duplicated subscription not permitted
 GET Subscriptions
     Log    Get the list of active subscriptions
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -296,7 +296,7 @@ GET Subscriptions
 GET Subscriptions with filter
     Log    Get the list of active subscriptions using a filter
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}    
@@ -304,42 +304,42 @@ GET Subscriptions with filter
 GET Subscriptions with Invalid filter   
     Log    Get the list of active subscriptions using an invalid filter
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter_invalid}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
 Get subscriptions with all_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get subscriptions with exclude_default attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get subscriptions with fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 Get subscriptions with exclude_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}     
 PUT Subscriptions
     log    Trying to perform a PUT Subscriptions. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -347,7 +347,7 @@ PUT Subscriptions
 PATCH Subscriptions
     log    Trying to perform a PATCH Subscriptions. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -355,7 +355,7 @@ PATCH Subscriptions
 DELETE Subscriptions
     log    Trying to perform a DELETE Subscriptions. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -363,7 +363,7 @@ DELETE Subscriptions
 POST Individual Subscription
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -371,7 +371,7 @@ POST Individual Subscription
 GET Individual Subscription
     log    Trying to get information about an individual subscription
     Set Headers    {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}   
@@ -379,7 +379,7 @@ GET Individual Subscription
 PUT Individual Subscription
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -387,7 +387,7 @@ PUT Individual Subscription
 PATCH Individual Subscription
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -395,7 +395,7 @@ PATCH Individual Subscription
 DELETE Individual Subscription
     log    Trying to perform a DELETE.
     Set Headers  {"Accept":"${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -407,7 +407,7 @@ Check HTTP Response Header Contain Link
 Get subscriptions with filter "id"
     Log    Get the list of active subscriptions using a filter "id"
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?id=${subscription_id}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -418,7 +418,7 @@ Check PostCondition HTTP Response Body Subscription Matches the requested attrib
 Get subscriptions with filter "filter_notificationTypes"
     Log    Get the list of active subscriptions using a filter "filter.notificationTypes"
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.notificationTypes=${notification_type}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -431,7 +431,7 @@ Check PostCondition HTTP Response Body Subscriptions Matches the requested attri
 Get subscriptions with filter "filter_faultyResourceTypes"
     Log    Get the list of active subscriptions using a filter "filter.faultyResourceTypes"
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.faultyResourceTypes=${faultyResourceType}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -444,7 +444,7 @@ Check PostCondition HTTP Response Body Subscriptions Matches the requested attri
 Get subscriptions with filter "filter_perceivedSeverities"
     Log    Get the list of active subscriptions using a filter "filter.perceivedSeverities"
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.perceivedSeverities=${perceivedSeverity}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -457,7 +457,7 @@ Check PostCondition HTTP Response Body Subscriptions Matches the requested attri
 Get subscriptions with filter "filter_eventTypes"
     Log    Get the list of active subscriptions using a filter "filter.eventTypes"
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.eventTypes=${eventType}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -470,7 +470,7 @@ Check PostCondition HTTP Response Body Subscriptions Matches the requested attri
 Get subscriptions with filter "filter_probableCauses"
     Log    Get the list of active subscriptions using a filter "filter.probableCauses"
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.probableCauses=${probableCause}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
diff --git a/SOL003/VNFFaultManagement-API/NotificationConsumer.robot b/SOL003/VNFFaultManagement-API/NotificationConsumer.robot
index b8cb18b90..17ea2227b 100644
--- a/SOL003/VNFFaultManagement-API/NotificationConsumer.robot
+++ b/SOL003/VNFFaultManagement-API/NotificationConsumer.robot
@@ -1,94 +1,94 @@
-*** Settings ***
-Library    String
-Library    OperatingSystem
-Resource    environment/variables.txt
-Library    JSONLibrary
-Library    JSONSchemaLibrary    schemas/
-Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}        ssl_verify=false
-Suite Setup    Check resource existence and get CallbackUri
-
-*** Test Cases ***
-VNF Fault Alarm Notification
-    [Documentation]    Test ID: 7.3.5.7.1
-    ...    Test title: VNF Fault Alarm Notification
-    ...    Test objective: The objective is to test that the POST request triggers VNF Fault Alarm Notification.
-    ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm notifications is available in the VNFM.
-    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post Alarm Notification
-    Check HTTP Response Status Code Is    204
-    
-VNF Fault Alarm Cleared Notification
-    [Documentation]    Test ID: 7.3.5.7.2
-    ...    Test title: VNF Fault Alarm Cleared Notification
-    ...    Test objective: The objective is to test that the POST request triggers VNF Fault Alarm Cleared Notification.
-    ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm cleared notifications is available in the VNFM.
-    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post Alarm Cleared Notification
-    Check HTTP Response Status Code Is    204
-    
-VNF Fault Alarm List Reulit Notification
-    [Documentation]    Test ID: 7.3.5.7.3
-    ...    Test title: VNF Fault Alarm List Rebuilt Notification
-    ...    Test objective: The objective is to test that the POST request triggers VNF Fault Alarm List Rebuilt Notification.
-    ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm list rebuilt notifications is available in the VNFM.
-    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post Alarm List Rebuilt Notification
-    Check HTTP Response Status Code Is    204
-    
-*** Keywords ***
-Check resource existence and get CallbackUri
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
-    Integer    response status    200
-    Validate Json    response body    FmSubscriptions.schema.json
-    Set Global Variable    ${callbackResp}    response body callbackUri
-
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}
-    Log    Validate Status code    
-    Should Be Equal As Strings    ${response['status']}    ${expected_status}
-    Log    Status code validated
-    
-Post Alarm Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/AlarmNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}      
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}	
-
-Post Alarm Cleared Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/AlarmClearedNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}   alarmId=${alarmId}   
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}
-	
-Post Alarm List Rebuilt Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/AlarmListRebuiltNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}   
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
+*** Settings ***
+Library    String
+Library    OperatingSystem
+Resource    environment/variables.txt
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}        ssl_verify=false
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+VNF Fault Alarm Notification
+    [Documentation]    Test ID: 7.3.5.7.1
+    ...    Test title: VNF Fault Alarm Notification
+    ...    Test objective: The objective is to test that the POST request triggers VNF Fault Alarm Notification.
+    ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm notifications is available in the VNFM.
+    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Alarm Notification
+    Check HTTP Response Status Code Is    204
+    
+VNF Fault Alarm Cleared Notification
+    [Documentation]    Test ID: 7.3.5.7.2
+    ...    Test title: VNF Fault Alarm Cleared Notification
+    ...    Test objective: The objective is to test that the POST request triggers VNF Fault Alarm Cleared Notification.
+    ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm cleared notifications is available in the VNFM.
+    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Alarm Cleared Notification
+    Check HTTP Response Status Code Is    204
+    
+VNF Fault Alarm List Reulit Notification
+    [Documentation]    Test ID: 7.3.5.7.3
+    ...    Test title: VNF Fault Alarm List Rebuilt Notification
+    ...    Test objective: The objective is to test that the POST request triggers VNF Fault Alarm List Rebuilt Notification.
+    ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm list rebuilt notifications is available in the VNFM.
+    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Alarm List Rebuilt Notification
+    Check HTTP Response Status Code Is    204
+    
+*** Keywords ***
+Check resource existence and get CallbackUri
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    Integer    response status    200
+    Validate Json    response body    FmSubscriptions.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}
+    Log    Validate Status code    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated
+    
+Post Alarm Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template} =    Get File    jsons/AlarmNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}      
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+
+Post Alarm Cleared Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template} =    Get File    jsons/AlarmClearedNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}   alarmId=${alarmId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	
+Post Alarm List Rebuilt Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template} =    Get File    jsons/AlarmListRebuiltNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
\ No newline at end of file
diff --git a/SOL003/VNFFaultManagement-API/environment/variables.txt b/SOL003/VNFFaultManagement-API/environment/variables.txt
index 8f264481e..44740b77a 100644
--- a/SOL003/VNFFaultManagement-API/environment/variables.txt
+++ b/SOL003/VNFFaultManagement-API/environment/variables.txt
@@ -2,7 +2,8 @@
 ${VNFM_HOST}      localhost    # Hostname of the VNFM
 ${VNFM_PORT}      8080    # Listening port of the VNFM
 ${VNFM_SCHEMA}    https
-${AUTHORIZATION}    Bearer    QWxhZGRpbjpvcGVuIHNlc2FtZQ==
+${AUTHORIZATION_HEADER}    Authorization
+${AUTHORIZATION_TOKEN}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 ${CONTENT_TYPE}    application/json
 ${ACCEPT}         application/json
 ${ACCEPT_JSON}         application/json
diff --git a/SOL003/VNFIndicator-API/ApiVersion.robot b/SOL003/VNFIndicator-API/ApiVersion.robot
index 4c8aa20c1..819592ceb 100644
--- a/SOL003/VNFIndicator-API/ApiVersion.robot
+++ b/SOL003/VNFIndicator-API/ApiVersion.robot
@@ -133,70 +133,70 @@ DELETE API Version with apiMajorVerion - Method not implemented
 *** Keywords ***
 POST API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
diff --git a/SOL003/VNFIndicator-API/NotificationConsumer.robot b/SOL003/VNFIndicator-API/NotificationConsumer.robot
index 3fccae93e..cf3822562 100644
--- a/SOL003/VNFIndicator-API/NotificationConsumer.robot
+++ b/SOL003/VNFIndicator-API/NotificationConsumer.robot
@@ -1,46 +1,46 @@
-*** Settings ***
-Library    String
-Library    JSONSchemaLibrary    schemas/
-Resource   environment/variables.txt
-Library    OperatingSystem
-Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
-Suite Setup    Check resource existence and get CallbackUri
-
-*** Test Cases ***
-VNF Indicator Value Change Notification
-    [Documentation]    Test ID: 7.3.6.7.1
-    ...    Test title: VNF Indicator Value Change Notification
-    ...    Test objective: The objective is to test that the POST request triggers VNF Indicator Value Change Notification.
-    ...    Pre-conditions: A VNF is instantiated, and a subscription for indicator value change notifications is available in the VNFM.
-    ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post VNF Indicator Value Change Notification
-    Check HTTP Response Status Code Is    204
-    
-*** Keywords ***
-Check resource existence and get CallbackUri
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
-    Integer    response status    200
-    Validate Json    response body    VnfIndicatorSubscription.schema.json
-    Set Global Variable    ${callbackResp}    response body callbackUri
-
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings    ${response['status']}    ${expected_status}
-    Log    Status code validated 
-    
-Post VNF Indicator Value Change Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/VnfIndicatorValueChangeNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    indicatorId=${indicatorId}    vnfInstanceId=${vnfInstanceId}   
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}	
+*** Settings ***
+Library    String
+Library    JSONSchemaLibrary    schemas/
+Resource   environment/variables.txt
+Library    OperatingSystem
+Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+VNF Indicator Value Change Notification
+    [Documentation]    Test ID: 7.3.6.7.1
+    ...    Test title: VNF Indicator Value Change Notification
+    ...    Test objective: The objective is to test that the POST request triggers VNF Indicator Value Change Notification.
+    ...    Pre-conditions: A VNF is instantiated, and a subscription for indicator value change notifications is available in the VNFM.
+    ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF Indicator Value Change Notification
+    Check HTTP Response Status Code Is    204
+    
+*** Keywords ***
+Check resource existence and get CallbackUri
+    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}/subscriptions/${subscriptionId}
+    Integer    response status    200
+    Validate Json    response body    VnfIndicatorSubscription.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+    
+Post VNF Indicator Value Change Notification
+    log    Trying to perform a POST to get notification
+    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/VnfIndicatorValueChangeNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    indicatorId=${indicatorId}    vnfInstanceId=${vnfInstanceId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
diff --git a/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot b/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
index 1623f460c..2ad8b478e 100644
--- a/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
+++ b/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
@@ -14,7 +14,7 @@ Library    String
 Get All VNF Indicators Subscriptions
     Log    Trying to get the list of subscriptions
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -30,7 +30,7 @@ Get All VNF Indicators Subscriptions
 Get VNF Indicators Subscriptions with filter
     Log    Trying to get the list of subscriptions using filters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ok}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -46,7 +46,7 @@ Get VNF Indicators Subscriptions with filter
 Get VNF Indicators Subscriptions with invalid filter
     Log    Trying to get the list of subscriptions using filters with wrong attribute name
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ko}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -63,7 +63,7 @@ Get VNF Indicators Subscriptions with invalid filter
 Get VNF Indicators Subscriptions with invalid resource endpoint
     Log    Trying to perform a request on a Uri which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -100,7 +100,7 @@ Send Post Request for VNF Indicator Subscription
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${template}=    Get File    jsons/subscriptions.json
     ${body}=        Format String   ${template}     callback=${callback}    {callback_subscribe}=${callback_subscribe}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -123,7 +123,7 @@ Send Post Request for Duplicated VNF indicator Subscription
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
      ${template}=    Get File    jsons/subscriptions.json
     ${body}=        Format String   ${template}     callback=${callback}    {callback_subscribe}=${callback_subscribe}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -140,7 +140,7 @@ Send Post Request for Duplicated VNF indicator Subscription
 Send Put Request for VNF Indicator Subscriptions
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -149,7 +149,7 @@ Send Put Request for VNF Indicator Subscriptions
 Send Patch Request for VNF Indicator Subscriptions
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -158,7 +158,7 @@ Send Patch Request for VNF Indicator Subscriptions
 Send Delete Request for VNF Indicator Subscriptions
     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": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -195,7 +195,7 @@ Check Postcondition VNF Indicator Subscription Is Set
     Log    Check Postcondition subscription exist
     Log    Trying to get the subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Run Keyword If    Should Not Be Equal As Strings    ${location}    Location   GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
     Run Keyword If    Should Be Equal As Strings    ${location}    Location   GET    ${response['headers']['Location']}  
     ${output}=    Output    response
@@ -225,7 +225,7 @@ Check HTTP Response Header Contains
 Get all VNF indicators
     Log    The GET method queries multiple VNF indicators
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
@@ -235,7 +235,7 @@ Get all VNF indicators
 Get VNF indicators with filter
     Log    The GET method queries multiple VNF indicators using Attribute-based filtering parameters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators?${POS_FIELDS}
     ${output}=    Output    response
@@ -244,7 +244,7 @@ Get VNF indicators with filter
 Get VNF indicators with invalid filter
     Log    The GET method queries multiple VNF indicators using invalid Attribute-based filtering parameters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators?${NEG_FIELDS}
     ${output}=    Output    response
@@ -254,7 +254,7 @@ Get all VNF indicators with malformed authorization token
     Pass Execution If    ${AUTH_USAGE} == 0    Skipping test as EM/VNF is not supporting authentication
     Log    The GET method queries multiple VNF indicators using invalid token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Set Headers    {"Authorization": "${BAD_AUTHORIZATION}"}
+    Set Headers    {"${AUTHORIZATION_HEADER}": "${BAD_AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
@@ -264,7 +264,7 @@ Get all VNF indicators with expired or revoked authorization token
     Pass Execution If    ${AUTH_USAGE} == 0    Skipping test as EM/VNF is not supporting authentication
     Log    The GET method queries multiple VNF indicators using invalid token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Set Headers    {"Authorization": "${NEG_AUTHORIZATION}"}
+    Set Headers    {"${AUTHORIZATION_HEADER}": "${NEG_AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
@@ -282,7 +282,7 @@ Get all VNF indicators without authorization token
 Get all VNF indicators with invalid resource endpoint
     Log    The GET method queries multiple VNF indicators omitting token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
@@ -291,7 +291,7 @@ Get all VNF indicators with invalid resource endpoint
 Send POST Request for all VNF indicators
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -299,7 +299,7 @@ Send POST Request for all VNF indicators
 Send PUT Request for all VNF indicators
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -307,7 +307,7 @@ Send PUT Request for all VNF indicators
 Send PATCH Request for all VNF indicators
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -315,7 +315,7 @@ Send PATCH Request for all VNF indicators
 Send DELETE Request for all VNF indicators
     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":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -335,7 +335,7 @@ Check HTTP Response Body vnfIndicators Matches the requested attribute-based fil
 Get all indicators for a VNF instance
     Log    This resource represents VNF indicators related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -343,7 +343,7 @@ Get all indicators for a VNF instance
 Get all indicators for a VNF instance with filter  
     Log    This resource represents VNF indicators related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}?${POS_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -351,7 +351,7 @@ Get all indicators for a VNF instance with filter
 Get all indicators for a VNF instance with invalid filter
     Log    This resource represents VNF indicators related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}?${NEG_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -359,7 +359,7 @@ Get all indicators for a VNF instance with invalid filter
 Get all indicators for a VNF instance with invalid resource identifier
     Log    Trying to perform a negative get, using wrong identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${erroneousVnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -367,7 +367,7 @@ Get all indicators for a VNF instance with invalid resource identifier
 Send POST Request for indicators in VNF instance
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -375,7 +375,7 @@ Send POST Request for indicators in VNF instance
 Send PUT Request for indicators in VNF instance
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -383,7 +383,7 @@ Send PUT Request for indicators in VNF instance
 Send PATCH Request for indicators in VNF instance
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -391,7 +391,7 @@ Send PATCH Request for indicators in VNF instance
 Send DELETE Request for indicators in VNF instance
     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": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -403,7 +403,7 @@ Check HTTP Response Body Includes Requested VNF Instances ID
 Get Individual Indicator for a VNF instance
     Log    This resource represents a VNF indicator related to a VNF instance.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -411,7 +411,7 @@ Get Individual Indicator for a VNF instance
 Get Individual Indicator for a VNF instance with invalid indicator identifier
     Log    Trying to perform a negative get, using wrong identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${erroneousIndicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -419,7 +419,7 @@ Get Individual Indicator for a VNF instance with invalid indicator identifier
 Send POST Request for individual indicator in VNF instance
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${notAllowedIndicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -427,7 +427,7 @@ Send POST Request for individual indicator in VNF instance
 Send PUT Request for individual indicator in VNF instance
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -435,7 +435,7 @@ Send PUT Request for individual indicator in VNF instance
 Send PATCH Request for individual indicator in VNF instance
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -443,7 +443,7 @@ Send PATCH Request for individual indicator in VNF instance
 Send DELETE Request for individual indicator in VNF instance
     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": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -465,7 +465,7 @@ Check Postcondition Indicator for VNF instance Exist
 GET Individual VNF Indicator Subscription
     Log    Trying to get a given subscription identified by subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -473,7 +473,7 @@ GET Individual VNF Indicator Subscription
 GET Individual VNF Indicator Subscription with invalid resource identifier
     Log    Trying to perform a request on a subscriptionID which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -481,7 +481,7 @@ GET Individual VNF Indicator Subscription with invalid resource identifier
 Send Delete Request for Individual VNF Indicator Subscription
     Log    Trying to perform a DELETE on a subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -489,14 +489,14 @@ Send Delete Request for Individual VNF Indicator Subscription
 Send Delete Request for Individual VNF Indicator Subscription with invalid resource identifier
     Log    Trying to perform a DELETE on a subscriptionId which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Send Post Request for Individual VNF Indicator Subscription
     Log    Trying to create a new subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
@@ -504,7 +504,7 @@ Send Post Request for Individual VNF Indicator Subscription
 Send Put Request for Individual VNF Indicator Subscription
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -514,7 +514,7 @@ Send Put Request for Individual VNF Indicator Subscription
 
 Send Patch Request for Individual VNF Indicator Subscription
     Log    Trying to create a new subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
diff --git a/SOL003/VNFIndicator-API/environment/variables.txt b/SOL003/VNFIndicator-API/environment/variables.txt
index 5d4253fc2..a3d6321d4 100644
--- a/SOL003/VNFIndicator-API/environment/variables.txt
+++ b/SOL003/VNFIndicator-API/environment/variables.txt
@@ -3,9 +3,10 @@ ${VNFM_HOST}      localhost    # Hostname of the VNFM
 ${VNFM_PORT}      8080    # Listening port of the VNFM
 ${VNFM_SCHEMA}    https
 
-${AUTHORIZATION}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
-${NEG_AUTHORIZATION}    Bearer negativetoken
-${BAD_AUTHORIZATION}    Bear sometoken
+${AUTHORIZATION_HEADER}    Authorization
+${AUTHORIZATION_TOKEN}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
+${NEG_AUTHORIZATION_TOKEN}    Bearer negativetoken
+${BAD_AUTHORIZATION_TOKEN}    Bear sometoken
 ${ACCEPT_JSON}    application/json
 ${AUTH_USAGE}     1
 ${CONTENT_TYPE_JSON}    application/json
diff --git a/SOL003/VNFLifecycleManagement-API/ApiVersion.robot b/SOL003/VNFLifecycleManagement-API/ApiVersion.robot
index e19b65ac9..5c35bdd70 100644
--- a/SOL003/VNFLifecycleManagement-API/ApiVersion.robot
+++ b/SOL003/VNFLifecycleManagement-API/ApiVersion.robot
@@ -131,70 +131,70 @@ DELETE API Version with apiMajorVerion - Method not implemented
 *** Keywords ***
 POST API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
diff --git a/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot
index 9cdf4abd8..28738b8e5 100644
--- a/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot
@@ -52,17 +52,17 @@ Initialize System
     Create Sessions
     
 Precondition Checks - STARTING
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body operationState    STARTING
 
 Check Postcondition VNF Cancel - STARTING
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body operationState    ROLLED_BACK
 
 Check Postcondition VNF Cancel - PROCESSING - ROLLING_BACK
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body operationState    FAILED_TEMP
  
diff --git a/SOL003/VNFLifecycleManagement-API/FailOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/FailOperationWorkflow.robot
index 1eff9a23f..e7bdd1e74 100644
--- a/SOL003/VNFLifecycleManagement-API/FailOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/FailOperationWorkflow.robot
@@ -31,7 +31,7 @@ Initialize System
     Create Sessions
 
 Check Postcondition VNF Fail
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body operationState    FAILED
  
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index 8a36e6327..b87e388ba 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
@@ -131,6 +131,6 @@ Get Information about an individual VNF Instance - Not Found
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200    
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot
index f9e48ae38..3b2377c2d 100644
--- a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWorkflow.robot
@@ -38,7 +38,7 @@ Send VNF Instantiation Request
     Log    Instantiate a VNF Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/instantiateVnfRequest.json
     ${response}=    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/instantiate    ${body}
     
diff --git a/SOL003/VNFLifecycleManagement-API/NotificationConsumer.robot b/SOL003/VNFLifecycleManagement-API/NotificationConsumer.robot
index 9e27f5bc7..8310ce197 100644
--- a/SOL003/VNFLifecycleManagement-API/NotificationConsumer.robot
+++ b/SOL003/VNFLifecycleManagement-API/NotificationConsumer.robot
@@ -1,92 +1,92 @@
-*** Settings ***
-Library    String
-Library    OperatingSystem
-Resource    environment/variables.txt
-Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}        ssl_verify=false
-Library    JSONLibrary
-Library    JSONSchemaLibrary    schemas/
-Suite Setup    Check resource existence and get CallbackUri
-
-*** Test Cases ***
-VNF LCM Operation Occurrence Notification
-    [Documentation]    Test ID: 7.3.1.36.1
-    ...    Test title: VNF LCM Operation Occurrence Notification
-    ...    Test objective: The objective is to test that the POST request triggers VNF LCM Operation Occurrence Notification.
-    ...    Pre-conditions: A subscription for VNF LCM Operation Occurrence notifications is available in the VNFM.
-    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post VNF LCM Operation Occurrence Notification
-    Check HTTP Response Status Code Is    204
-    
-VNF Identifier Creation Notification
-    [Documentation]    Test ID: 7.3.1.36.2
-    ...    Test title: VNF Identifier Creation Notification
-    ...    Test objective: The objective is to test that the POST request triggers VNF Identifier Creation Notification.
-    ...    Pre-conditions: A subscription for VNF identifier creation cotification is available in the VNFM.
-    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post VNF Identifier Creation Notification
-    Check HTTP Response Status Code Is    204
-
-VNF Identifier Deletion Notification
-    [Documentation]    Test ID: 7.3.1.36.3
-    ...    Test title: VNF Identifier Deletion Notification
-    ...    Test objective: The objective is to test that the POST request triggers VNF Identifier Deletion Notification.
-    ...    Pre-conditions: A subscription for VNF identifier deletion notifications is available in the VNFM.
-    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post VNF LCM Operation Occurrence Notification
-    Check HTTP Response Status Code Is    204
-*** Keywords ***
-Check resource existence and get CallbackUri
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}	
-    Integer    response status    200
-    Validate Json    response body    Subscription.schema.json
-    Set Global Variable    ${callbackResp}    response body callbackUri
-    
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings    ${response['status']}    ${expected_status}
-    Log    Status code validated 
-
-Post VNF LCM Operation Occurrence Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/VnfLcmOperationOccurrenceNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfInstanceId=${vnfInstanceId}    vnfLcmOpOccId=${vnfLcmOpOccId}   
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}	
-	
-Post VNF Identifier Creation Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/VnfIdentifierCreationNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfInstanceId=${vnfInstanceId}  
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}	
-	
-Post VNF Identifier Deletion Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/VnfIdentifierDeletionNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfInstanceId=${vnfInstanceId}  
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
+*** Settings ***
+Library    String
+Library    OperatingSystem
+Resource    environment/variables.txt
+Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}        ssl_verify=false
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+VNF LCM Operation Occurrence Notification
+    [Documentation]    Test ID: 7.3.1.36.1
+    ...    Test title: VNF LCM Operation Occurrence Notification
+    ...    Test objective: The objective is to test that the POST request triggers VNF LCM Operation Occurrence Notification.
+    ...    Pre-conditions: A subscription for VNF LCM Operation Occurrence notifications is available in the VNFM.
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF LCM Operation Occurrence Notification
+    Check HTTP Response Status Code Is    204
+    
+VNF Identifier Creation Notification
+    [Documentation]    Test ID: 7.3.1.36.2
+    ...    Test title: VNF Identifier Creation Notification
+    ...    Test objective: The objective is to test that the POST request triggers VNF Identifier Creation Notification.
+    ...    Pre-conditions: A subscription for VNF identifier creation cotification is available in the VNFM.
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF Identifier Creation Notification
+    Check HTTP Response Status Code Is    204
+
+VNF Identifier Deletion Notification
+    [Documentation]    Test ID: 7.3.1.36.3
+    ...    Test title: VNF Identifier Deletion Notification
+    ...    Test objective: The objective is to test that the POST request triggers VNF Identifier Deletion Notification.
+    ...    Pre-conditions: A subscription for VNF identifier deletion notifications is available in the VNFM.
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF LCM Operation Occurrence Notification
+    Check HTTP Response Status Code Is    204
+*** Keywords ***
+Check resource existence and get CallbackUri
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}	
+    Integer    response status    200
+    Validate Json    response body    Subscription.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+    
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+
+Post VNF LCM Operation Occurrence Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template} =    Get File    jsons/VnfLcmOperationOccurrenceNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfInstanceId=${vnfInstanceId}    vnfLcmOpOccId=${vnfLcmOpOccId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+	
+Post VNF Identifier Creation Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template} =    Get File    jsons/VnfIdentifierCreationNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfInstanceId=${vnfInstanceId}  
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+	
+Post VNF Identifier Deletion Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template} =    Get File    jsons/VnfIdentifierDeletionNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfInstanceId=${vnfInstanceId}  
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
index 2f11f363e..f0d227b3e 100644
--- a/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
@@ -100,6 +100,6 @@ DELETE Operate VNFInstance - Method not implemented
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
diff --git a/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot b/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
index 31848724f..8f52055f4 100644
--- a/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
@@ -100,6 +100,6 @@ DELETE Retry operation task - Method not implemented
 *** Keywords ***
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     Integer    response status    200
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
index bf4db381d..c512576c8 100644
--- a/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
@@ -42,12 +42,12 @@ Retry VNF LCM Operation - Unsuccessful
 
 *** Keywords ***
 Check Postcondition VNF Retry Successful
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body operationState    COMPLETED
 
 Check Postcondition VNF Retry Unsuccessful
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body operationState    FAILED_TEMP
     
diff --git a/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
index 3e42be057..d3787aeca 100644
--- a/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
@@ -48,12 +48,12 @@ Initialize System
     Create Sessions
 
 Check Postcondition VNF Roll Back Successful
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body operationState    ROLLED_BACK
 
 Check Postcondition VNF Roll Back Unsuccessful
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body operationState    FAILED_TEMP
     
diff --git a/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot b/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
index 11038da13..34443682d 100644
--- a/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
@@ -99,6 +99,6 @@ DELETE Rollback operation task - Method not implemented
 *** Keywords ***
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     Integer    response status    200
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
index 1ce92b0b1..5d6da78ee 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
@@ -99,6 +99,6 @@ DELETE Scale VNFInstance - Method not implemented
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/SubscriptionKeywords.robot b/SOL003/VNFLifecycleManagement-API/SubscriptionKeywords.robot
index 6c858da67..835aa876c 100644
--- a/SOL003/VNFLifecycleManagement-API/SubscriptionKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/SubscriptionKeywords.robot
@@ -13,7 +13,7 @@ Library    MockServerLibrary
 Check subscriptions about one VNFInstance and operation type
     [Arguments]    ${vnfInstanceId}    ${notificationType}    ${operationType}=""    ${operationState}=""
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Run Keyword If    ${notificationType}=="VnfIdentifierCreationNotification" or ${notificationType}=="VnfIdentifierDeletionNotification"    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?vnfInstanceIds=${vnfInstanceId}&notificationTypes=${notificationType} 
     ...    ELSE    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?vnfInstanceIds=${vnfInstanceId}&notificationTypes=${notificationType}&operationTypes=${operationType}&operationStates=${operationState}
     Integer    response status    200
diff --git a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
index 98018e193..fd8544442 100644
--- a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
@@ -87,6 +87,6 @@ DELETE Terminate VNFInstance - Method not implemented
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 
     Integer    response status    200
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index 3323c1132..018d6dea5 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -16,7 +16,7 @@ Get Vnf Instance
     [Arguments]    ${vnfInstanceId}
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}
     ${body}=    Output    response body
     [Return]    ${body}
@@ -54,7 +54,7 @@ Check VNF Instance
     [Arguments]    ${vnfId}
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${response}=    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfId}
 
 Check VNF Status
@@ -63,12 +63,12 @@ Check VNF Status
     Log    VNF Status in the correct status
 
 Check operation resource state is FAILED_TEMP
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body instantiationState    FAILED_TEMP     
     
 Check operation resource state is FINALLY_FAILED
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId} 
     String    response body instantiationState    FINALLY_FAILED      
 Get Vnf Scale Info
@@ -103,7 +103,7 @@ Send VNF Scale Out Request
     Log    Trying to scale a vnf Instance
     Set Headers    {"Accept":"${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/scaleVnfOutRequest.json
     ${json}=    evaluate    json.loads('''${body}''')    json
     ${aspectId}=    Set Variable    ${json.aspectId}  
@@ -114,7 +114,7 @@ Send VNF Scale To Level Request
     Log    Trying to Instantiate a vnf Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/scaleVnfToLevelRequest.json
     ${json}=    evaluate    json.loads('''${body}''')    json
     ${aspectId}=    Set Variable    ${json.aspectId}  
@@ -124,7 +124,7 @@ Send VNF Instance Resource Create Request
     Log    Create VNF instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File
     ${template}=    Get File    jsons/createVnfRequest.json
     ${body}=        Format String   ${template}     vnfdId=${Descriptor_ID}    vnfProvider=${Provider}    vnfProductName=${Product_Name}    vnfSoftwareVersion=${Software_Version}    vnfdVersion= ${Descriptor_Version}    flavourId=${Flavour_ID}
@@ -132,14 +132,14 @@ Send VNF Instance Resource Create Request
 
 Send VNF Instance Resource Delete Request
     log    Delete an individual VNF instance
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${response}=    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}
 
 Send Change VNF Flavour Request
     Log    Trying to change the deployment flavour of a VNF instance.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/changeVnfFlavourRequest.json
     ${response}=    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_flavour    ${body}
 
@@ -147,7 +147,7 @@ Send Change VNF Operational State Request
     Log    Trying to change the operational state of a VNF instance.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/operateVnfRequest.json
     ${response}=    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/operate    ${body}
 
@@ -155,7 +155,7 @@ Send Heal VNF Request
     Log    Trying to heal a VNF instance.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/healVnfRequest.json
     ${response}=    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/heal    ${body}
 
@@ -163,7 +163,7 @@ Send Change Ext Connectivity Request
     Log    Trying to change the external connectivity of a VNF instance.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/changeExtVnfConnectivityRequest.json
     ${response}=    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn    ${body}
 
@@ -171,7 +171,7 @@ Send Terminate VNF Request
     Log    Trying to terminate a VNF instance.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/terminateVnfRequest.json
     ${response}=    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/terminate    ${body}
 
@@ -179,28 +179,28 @@ Send Info Modification Request
     Log    Trying to update information of a VNF instance.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/patchBodyRequest.json
     ${response}=    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}    ${body}
 
 Send Retry Operation Request
     Log    Retry a VNF lifecycle operation if that operation has experienced a temporary failure
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${response}=    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry
 
 Send Roll back Operation Request
     Log    Rollback a VNF lifecycle operation if that operation has experienced a temporary failure
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${response}=    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback
 
 Send Fail Operation Request
     Log    Fail a VNF lifecycle operation if that operation has experienced a temporary failure
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${response}=    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
 
 Send Cancel Operation Request
     Log    Cancel an ongoing VNF lifecycle operation
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${response}=    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel     ${CancelMode}
 
 Create a new Grant - Synchronous mode
@@ -209,7 +209,7 @@ Create a new Grant - Synchronous mode
     Pass Execution If    ${SYNC_MODE} == 0    The Granting process is asynchronous mode. Skipping the test
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/grantRequest.json
     ${json_body}=    evaluate    json.loads('''${body}''')    json
     Set To Dictionary     ${json_body}    vnfInstanceId=${vnfInstanceId}    vnfLcmOpOccId=${vnfLcmOpOccId}    operation=${operation}  
@@ -231,7 +231,7 @@ Create a new Grant - Asynchronous mode
     Pass Execution If    ${SYNC_MODE} == 1    The Granting process is synchronous mode. Skipping the test
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/grantRequest.json
     ${json_body}=    evaluate    json.loads('''${body}''')    json
     Set To Dictionary     ${json_body}    vnfInstanceId=${vnfInstanceId}    vnfLcmOpOccId=${vnfLcmOpOccId}    operation=${operation}    
@@ -248,7 +248,7 @@ Create a new Grant - Asynchronous mode
 
 POST Cancel operation task
     Log    Cancel an ongoing VNF lifecycle operation
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Cancel a VNF lifecycle operation
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel    ${CancelMode}
     Log    Validate Status code
@@ -257,7 +257,7 @@ POST Cancel operation task
 	
 POST Cancel operation task with conflict
     Log    Cancel an ongoing VNF lifecycle operation
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Cancel a VNF lifecycle operation
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccIdNotStartingProcessingRollingback}/cancel    ${CancelMode}
     Log    Validate Status code
@@ -266,7 +266,7 @@ POST Cancel operation task with conflict
 	
 POST Cancel operation task not existing
     Log    Cancel an ongoing VNF lifecycle operation
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Cancel a VNF lifecycle operation
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${notExistingVnfLcmOpOccId}/cancel    ${CancelMode}
     Log    Validate Status code
@@ -275,14 +275,14 @@ POST Cancel operation task not existing
     
 GET Cancel operation task
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PUT Cancel operation task
     log    Trying to perform a PUT. This method should not be implemented 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel  		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -296,7 +296,7 @@ PATCH Cancel operation task
 	
 DELETE Cancel operation task
     Log    Trying to perform a DELETE. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel  	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}        
@@ -305,7 +305,7 @@ POST Change External VNF Connectivity
     Log    Trying to change the external connectivity of a VNF instance.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/changeExtVnfConnectivityRequest.json
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn    ${body}
     ${outputResponse}=    Output    response
@@ -313,14 +313,14 @@ POST Change External VNF Connectivity
 
 GET Change External VNF Connectivity
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PUT Change External VNF Connectivity
     log    Trying to perform a PUT. This method should not be implemented 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn  		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -334,7 +334,7 @@ PATCH Change External VNF Connectivity
 	
 DELETE Change External VNF Connectivity
     Log    Trying to perform a DELETE. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn  	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}  
@@ -343,7 +343,7 @@ POST Change VNF deployment flavour
     Log    Trying to change the deployment flavour of a VNF instance.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File
     ${template}=    Get File    jsons/changeVnfFlavourRequest.json
     ${body}=        Format String   ${template}     newFlavourId=${Flavour_ID}
@@ -355,7 +355,7 @@ POST Change VNF deployment flavour of NOT-INSTANTIATED VNF
     Log    Trying to change the deployment flavour of a VNF instance.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/changeVnfFlavourRequest.json
     ${body}=        Format String   ${template}     newFlavourId=${newFlavourId}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notInstantiatedVnfInstanceId}/change_flavour    ${body} 
@@ -366,7 +366,7 @@ POST Change VNF deployment flavour of not existing VNF
     Log    Trying to change the deployment flavour of a VNF instance.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/changeVnfFlavourRequest.json
     ${body}=        Format String   ${template}     newFlavourId=${newFlavourId}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notExistingVnfInstanceId}/change_flavour    ${body} 
@@ -375,14 +375,14 @@ POST Change VNF deployment flavour of not existing VNF
 
 GET Change VNF deployment flavour
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_flavour 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 	
 PUT Change VNF deployment flavour
     log    Trying to perform a PUT. This method should not be implemented 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_flavour 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -396,7 +396,7 @@ PATCH Change VNF deployment flavour
 	
 DELETE Change VNF deployment flavour
     Log    Trying to perform a DELETE. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_flavour   	 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -405,7 +405,7 @@ POST Create a new vnfInstance
     Log    Create VNF instance by POST to /vnf_instances
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File
     ${template}=    Get File    jsons/createVnfRequest.json
     ${body}=        Format String   ${template}     vnfdId=${Descriptor_ID}    vnfProvider=${Provider}    vnfProductName=${Product_Name}    vnfSoftwareVersion=${Software_Version}    vnfdVersion= ${Descriptor_Version} 
@@ -417,7 +417,7 @@ GET multiple vnfInstances
     Log    Query VNF The GET method queries information about multiple VNF instances.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances    
     ${outputResponse}=    Output    response
@@ -427,7 +427,7 @@ GET multiple vnfInstances with bad attribute
     Log    Query VNF The GET method queries information about multiple VNF instances.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?attribute_not_exist=some_value  
     ${outputResponse}=    Output    response
@@ -437,7 +437,7 @@ GET multiple vnfInstances with bad filter
     Log    Query VNF The GET method queries information about multiple VNF instances.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?attribute_not_exist=some_value  
     ${outputResponse}=    Output    response
@@ -446,35 +446,35 @@ GET multiple vnfInstances with bad filter
 GET multiple vnfInstances with all_fields attribute selector
     Log    Query status information about multiple VNF instances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 GET multiple vnfInstances with exclude_default attribute selector
     Log    Query status information about multiple VNF instances using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 GET multiple vnfInstances with fields attribute selector
     Log    Query status information about multiple VNF instances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 GET multiple vnfInstances with exclude_default and fields attribute selector
     Log    Query status information about multiple VNF instances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?fields=${fields}&exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 GET multiple vnfInstances with exclude_fields attribute selector
     Log    Query status information about multiple VNF instances, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 	
@@ -483,7 +483,7 @@ PUT VNFInstances
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances   
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 		     	
@@ -492,7 +492,7 @@ PATCH VNFInstances
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances   
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 		
@@ -501,7 +501,7 @@ DELETE VNFInstances
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances   
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 		  
@@ -510,7 +510,7 @@ POST individual vnfInstance
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}    
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}        
@@ -519,7 +519,7 @@ GET individual vnfInstance
     log    Trying to get information about an individual VNF instance
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} 		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}      
@@ -528,7 +528,7 @@ PUT individual vnfInstance
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}	  	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -537,7 +537,7 @@ PATCH individual vnfInstance
     log    Trying to modify an individual VNF instance
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE_PATCH}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File
     ${template}=    Get File    jsons/patchBodyRequest.json
     ${body}=        Format String   ${template}     vnfdId=${Descriptor_ID}    vnfdVersion= ${Descriptor_Version}
@@ -547,13 +547,13 @@ PATCH individual vnfInstance
 	
 DELETE individual vnfInstance
     log    Trying to delete an individual VNF instance
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 DELETE individual vnfInstance in INSTANTIATED state
     log    Trying to delete an individual VNF instance
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${instantiatedVnfInstanceId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -561,7 +561,7 @@ POST instantiate individual vnfInstance
     Log    Trying to Instantiate a vnf Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/instantiateVnfRequest.json
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/instantiate    ${body}	
     ${outputResponse}=    Output    response
@@ -571,7 +571,7 @@ POST instantiate individual vnfInstance with conflict
     Log    Trying to Instantiate a vnf Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/instantiateVnfRequest.json
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${instantiatedVnfInstanceId}/instantiate    ${body}	
     ${outputResponse}=    Output    response
@@ -579,28 +579,28 @@ POST instantiate individual vnfInstance with conflict
 	
 GET instantiate individual vnfInstance
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/instantiate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 
 PUT instantiate individual vnfInstance
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/instantiate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 
 PATCH instantiate individual vnfInstance
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/instantiate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 
 DELETE instantiate individual vnfInstance
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/instantiate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
@@ -608,7 +608,7 @@ POST Scale vnfInstance
     Log    Trying to Instantiate a vnf Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/scaleVnfRequest.json
     ${body}=        Format String   ${template}     scaletype=${scaletype}    scaleAspectId=${scaleAspectId}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
@@ -618,7 +618,7 @@ POST Scale vnfInstance with VNF NOT-INSTANTIATED
     Log    Trying to Instantiate a vnf Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/scaleVnfRequest.json
     ${body}=        Format String   ${template}     scaletype=${scaletype}    scaleAspectId=${scaleAspectId}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notInstantiatedVnfInstanceId}/scale    ${body}
@@ -628,7 +628,7 @@ POST Scale vnfInstance with not existing VNF
     Log    Trying to Instantiate a vnf Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/scaleVnfRequest.json
     ${body}=        Format String   ${template}     scaletype=${scaletype}    scaleAspectId=${scaleAspectId}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notExistingVnfInstanceId}/scale    ${body}
@@ -638,7 +638,7 @@ GET Scale vnfInstance
     Log    Trying to get a scale a vnf Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/scaleVnfRequest.json
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    
     ${outputResponse}=    Output    response
@@ -647,7 +647,7 @@ PUT Scale vnfInstance
     Log    Trying to modify a scale vnf Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/scaleVnfRequest.json
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale   
     ${outputResponse}=    Output    response
@@ -656,7 +656,7 @@ PATCH Scale vnfInstance
     Log    Trying to modify a scale vnf Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/scaleVnfRequest.json
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale   
     ${outputResponse}=    Output    response
@@ -665,7 +665,7 @@ DELETE Scale vnfInstance
     Log    Trying to modify a scale vnf Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/scaleVnfRequest.json
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale   
     ${outputResponse}=    Output    response
@@ -674,7 +674,7 @@ POST Scale vnfInstance to level
     Log    Trying to scale a vnf Instance to level
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/scaleVnfToLevelRequest.json
     ${body}=        Format String   ${template}     instantiationLevelId=${instantiationLevelId}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
@@ -684,7 +684,7 @@ POST Scale vnfInstance to level with VNF NOT-INSTANTIATED
     Log    Trying to scale a vnf Instance to level
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/scaleVnfToLevelRequest.json
     ${body}=        Format String   ${template}     instantiationLevelId=${instantiationLevelId}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notInstantiatedVnfInstanceId}/scale_to_level    ${body}
@@ -694,7 +694,7 @@ POST Scale vnfInstance to level with not existing VNF
     Log    Trying to scale a vnf Instance to level
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/scaleVnfToLevelRequest.json
     ${body}=        Format String   ${template}     instantiationLevelId=${instantiationLevelId}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notExistingVnfInstanceId}/scale_to_level    ${body}
@@ -702,28 +702,28 @@ POST Scale vnfInstance to level with not existing VNF
 	Set Global Variable    ${response}    ${outputResponse} 
 GET Scale vnfInstance to level
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PUT Scale vnfInstance to level
     log    Trying to perform a PUT. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PATCH Scale vnfInstance to level
     log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 	
 DELETE Scale vnfInstance to level
     log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
@@ -732,7 +732,7 @@ POST Terminate VNF
     Log    Trying to terminate a VNF instance.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/terminateVnfRequest.json
     ${body}=        Format String   ${template}     terminationType=${terminationType}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/terminate    ${body}	
@@ -743,7 +743,7 @@ POST Terminate VNF in NOT-INSTANTIATED state
     Log    Trying to terminate a VNF instance.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/terminateVnfRequest.json
     ${body}=        Format String   ${template}     terminationType=${terminationType}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notInstantiatedVnfInstanceId}/terminate    ${body}	
@@ -752,28 +752,28 @@ POST Terminate VNF in NOT-INSTANTIATED state
 
 GET Terminate VNF
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/terminate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PUT Terminate VNF
     log    Trying to perform a PUT. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/terminate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PATCH Terminate VNF
     log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/terminate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 	
 DELETE Terminate VNF
     log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/terminate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
@@ -782,7 +782,7 @@ POST Heal VNF
     Log    Trying to heal a VNF instance.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/healVnfRequest.json
     ${body}=        Format String   ${template}     healingCause=${healingCause}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/heal    ${body}		
@@ -793,7 +793,7 @@ POST Heal VNF Not Instantiated
     Log    Trying to heal a VNF instance.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/healVnfRequest.json
     ${body}=        Format String   ${template}     healingCause=${healingCause}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notInstantiatedVnfInstanceId}/heal    ${body}		
@@ -804,7 +804,7 @@ POST Heal VNF Not Existing
     Log    Trying to heal a VNF instance.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/healVnfRequest.json
     ${body}=        Format String   ${template}     healingCause=${healingCause}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notExistingVnfInstanceId}/heal    ${body}		
@@ -813,28 +813,28 @@ POST Heal VNF Not Existing
 
 GET Heal VNF
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/heal  
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PUT Heal VNF
     log    Trying to perform a PUT. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/heal 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PATCH Heal VNF
     log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/heal 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 	
 DELETE Heal VNF
     log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/heal 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
@@ -843,7 +843,7 @@ POST Operate VNF
     Log    Trying to operate a VNF instance.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/operateVnfRequest.json
     ${body}=        Format String   ${template}     changeStateTo=${changeStateTo}    stopType=${stopType}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/operate    ${body}
@@ -854,7 +854,7 @@ POST Operate VNF with conflict
     Log    Trying to operate a VNF instance.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/operateVnfRequest.json
     ${body}=        Format String   ${template}     changeStateTo=${changeStateTo}    stopType=${stopType}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notInstantiatedVnfInstanceId}/operate    ${body}
@@ -865,7 +865,7 @@ POST Operate VNF not existing
     Log    Trying to operate a VNF instance.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/operateVnfRequest.json
     ${body}=        Format String   ${template}     changeStateTo=${changeStateTo}    stopType=${stopType}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notExistingVnfInstanceId}/operate    ${body}
@@ -874,28 +874,28 @@ POST Operate VNF not existing
 
 GET Operate VNF
     log    Trying to perform a GET. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/operate  
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PUT Operate VNF
     log    Trying to perform a PUT. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/operate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 
 PATCH Operate VNF
     log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/operate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 	
 DELETE Operate VNF
     log    Trying to perform a PATCH. This method should not be implemented
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/operate 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
@@ -903,14 +903,14 @@ DELETE Operate VNF
 Post VNF LCM Operation occurrences
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs  	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 GET VNF LCM Operation occurrences
     Log    Query status information about multiple VNF lifecycle management operation occurrences.
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs
     ${outputResponse}=    Output    response
@@ -918,84 +918,84 @@ GET VNF LCM Operation occurrences
 GET VNF LCM Operation occurrences invalid attribute
     Log    Query status information about multiple VNF lifecycle management operation occurrences.
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"} 
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?attribute_not_exist=some_value	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 GET VNF LCM Operation occurrences invalid filter
     Log    Query status information about multiple VNF lifecycle management operation occurrences.
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"} 
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?fields=wrong_field	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Get VNF LCM Operation occurrences with all_fields attribute selector
     Log    Query status information about multiple VNF lifecycle management operation occurrences, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get VNF LCM Operation occurrences with exclude_default and fields attribute selector
     Log    Query status information about multiple VNF lifecycle management operation occurrences, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?fields=${fields}&exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get VNF LCM Operation occurrences with exclude_default attribute selector
     Log    Query status information about multiple VNF lifecycle management operation occurrences using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get VNF LCM Operation occurrences with fields attribute selector
     Log    Query status information about multiple VNF lifecycle management operation occurrences, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 Get VNF LCM Operation occurrences with exclude_fields attribute selector
     Log    Query status information about multiple VNF lifecycle management operation occurrences, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 	
 PUT VNF LCM Operation occurrences	
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 PATCH VNF LCM Operation occurrences	
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}			
 DELETE VNF LCM Operation occurrences	
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Post Individual VNF LCM Operation occurrences 
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Get Individual VNF LCM Operation occurrences
     Log    Query status information about multiple VNF lifecycle management operation occurrences.
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     ${outputResponse}=    Output    response
@@ -1003,41 +1003,41 @@ Get Individual VNF LCM Operation occurrences
 Put multiple VNF instances	
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Patch multiple VNF instances	
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Delete multiple VNF instances    
 	log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Post Retry operation
     Log    Retry a VNF lifecycle operation if that operation has experienced a temporary failure
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	 
 Post Retry operation with conflict
     Log    Retry a VNF lifecycle operation if that operation has experienced a temporary failure
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccIdNotFailedTemp}/retry	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Post Retry operation not existing
     Log    Retry a VNF lifecycle operation if that operation has experienced a temporary failure
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${notExistingVnfLcmOpOccId}/retry	
     ${outputResponse}=    Output    response
@@ -1045,7 +1045,7 @@ Post Retry operation not existing
 Get Retry operation	
     Log    Trying to perform a GET. This method should not be implemented.
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
     ${outputResponse}=    Output    response
@@ -1053,41 +1053,41 @@ Get Retry operation
 Put Retry operation	
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Patch Retry operation	
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Delete Retry operation    
 	log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Post Rollback operation
     Log    Rollback a VNF lifecycle operation if that operation has experienced a temporary failure
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Post Rollback operation with conflict
     Log    Rollback a VNF lifecycle operation if that operation has experienced a temporary failure
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccIdNotFailedTemp}/rollback
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 Post Rollback operation not existing
     Log    Rollback a VNF lifecycle operation if that operation has experienced a temporary failure
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${notExistingVnfLcmOpOccId}/rollback
     ${outputResponse}=    Output    response
@@ -1095,7 +1095,7 @@ Post Rollback operation not existing
 Get Rollback operation	
     Log    Trying to perform a GET. This method should not be implemented.
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback	
     ${outputResponse}=    Output    response
@@ -1103,27 +1103,27 @@ Get Rollback operation
 Put Rollback operation	
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Patch Rollback operation	
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Delete Rollback operation    
 	log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Post Fail operation
     Log    mark as Failed a VNF lifecycle operation if that operation has experienced a temporary failure
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
     ${outputResponse}=    Output    response
@@ -1131,7 +1131,7 @@ Post Fail operation
 	
 Post Fail operation with conflict
     Log    mark as Failed a VNF lifecycle operation if that operation has experienced a temporary failure
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccIdNotFailedTemp}/fail
     ${outputResponse}=    Output    response
@@ -1139,7 +1139,7 @@ Post Fail operation with conflict
 	
 Post Fail operation not existing
     Log    mark as Failed a VNF lifecycle operation if that operation has experienced a temporary failure
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${notExistingvnfLcmOpOccId}/fail
     ${outputResponse}=    Output    response
@@ -1148,7 +1148,7 @@ Post Fail operation not existing
 Get Fail operation	
     Log    Trying to perform a GET. This method should not be implemented.
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
     ${outputResponse}=    Output    response
@@ -1156,21 +1156,21 @@ Get Fail operation
 Put Fail operation	
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Patch Fail operation	
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Delete Fail operation    
 	log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
@@ -1178,7 +1178,7 @@ Post Create subscription
     Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_notification=${callback_notification}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
@@ -1189,7 +1189,7 @@ Post Create subscription - DUPLICATION
     Pass Execution If    ${VNFM_DUPLICATION} == 0    VNFM is not permitting duplication. Skipping the test
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_notification=${callback_notification}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}		
@@ -1200,7 +1200,7 @@ Post Create subscription - NO-DUPLICATION
     Pass Execution If    ${VNFM_DUPLICATION} == 1    VNFM permits duplication. Skipping the test
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_notification=${callback_notification}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
@@ -1210,7 +1210,7 @@ Get subscriptions
     Log    Get the list of active subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions	
     ${outputResponse}=    Output    response
@@ -1219,42 +1219,42 @@ Get subscriptions - filter
     Log    Get the list of active subscriptions using a filter
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Get subscriptions - invalid filter  
     Log    Get the list of active subscriptions using an invalid filter
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter_invalid}   
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 Get subscriptions with all_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get subscriptions with exclude_default attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 Get subscriptions with fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	
 Get subscriptions with exclude_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}     		
@@ -1262,7 +1262,7 @@ PUT subscriptions
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions  	   
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
@@ -1270,7 +1270,7 @@ PATCH subscriptions
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions  	   
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
@@ -1278,7 +1278,7 @@ DELETE subscriptions
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions  	   
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
@@ -1286,14 +1286,14 @@ Post Create Individual subscription
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
 Get Individual subscription	
     log    Trying to get information about an individual subscription
     Set Headers    {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
@@ -1301,7 +1301,7 @@ Put Individual subscription
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
@@ -1309,14 +1309,14 @@ Patch Individual subscription
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	    
 Delete Individual subscription
     log    Try to delete an individual subscription
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
diff --git a/SOL003/VNFLifecycleManagement-API/environment/variables.txt b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
index 51e5bc7c9..116c942ab 100644
--- a/SOL003/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
@@ -5,7 +5,8 @@ ${VNFM_SCHEMA}    https
 ${ACCEPT}         application/json
 ${ACCEPT_JSON}         application/json
 ${CONTENT_TYPE}    application/json
-${AUTHORIZATION}    Bearer    QWxhZGRpbjpvcGVuIHNlc2FtZQ==
+${AUTHORIZATION_HEADER}    Authorization
+${AUTHORIZATION_TOKEN}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 ${AUTH_USAGE}     1
 ${CONTENT_TYPE_PATCH}    application/merge-patch+json
 
diff --git a/SOL003/VNFLifecycleOperationGranting-API/ApiVersion.robot b/SOL003/VNFLifecycleOperationGranting-API/ApiVersion.robot
index b9291d316..37846692b 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/ApiVersion.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/ApiVersion.robot
@@ -133,70 +133,70 @@ DELETE API Version with apiMajorVerion - Method not implemented
 *** Keywords ***
 POST API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
diff --git a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
index c377d7001..f4c920df2 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
@@ -116,7 +116,7 @@ Send Request Grant Request in Synchronous mode
     Pass Execution If    ${SYNC_MODE} == 0    The Granting process is asynchronous mode. Skipping the test
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to Grant Request
     ${template}=    Get File    jsons/grantRequest.json
     ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${Descriptor_ID}    flavourId=${Flavour_ID}
@@ -129,7 +129,7 @@ Send Request Grant Request in Asynchronous mode
     Pass Execution If    ${SYNC_MODE} == 1    The Granting process is synchronous mode. Skipping the test
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to Grant Request
     ${template}=    Get File    jsons/grantRequest.json
     ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${Descriptor_ID}    flavourId=${Flavour_ID}
@@ -142,7 +142,7 @@ Send Request for a new Grant Forbiden Operation
     Log    The grant request should be rejected
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to Grant Request
     ${template}=    Get File    jsons/grantRejectedRequest.json
     ${body}=        Format String   ${template}    vnfInstanceId=${vnfInstanceId}   vnfLcmOpOccId=${vnfLcmOpOccId}    vnfdId=${Descriptor_ID}    flavourId=${Flavour_ID}
@@ -172,7 +172,7 @@ Check HTTP Response Body Json Schema Is
 Get an individual grant - Successful
     log    Trying to read an individual grant
     Set Headers    {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${response['headers']['Location']}
     Log    Validate Status code
     Integer    response status    200
@@ -180,7 +180,7 @@ Get an individual grant - Successful
 Get Grants
     Log    Trying to perform a GET. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/grants
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
@@ -188,7 +188,7 @@ Get Grants
 Put Grants
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/grants
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
@@ -196,7 +196,7 @@ Put Grants
 Patch Grants
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/grants
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body} 
@@ -204,7 +204,7 @@ Patch Grants
 Delete Grants
     Log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/grants
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
diff --git a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
index 554ce5a39..a52f60300 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
@@ -106,14 +106,14 @@ DELETE an individual grant - Method not implemented
 Get individual grant
     log    Trying to read an individual grant
     Set Headers    {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/grants/${grantId}
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
     
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
     Integer    response status    200
     
@@ -121,7 +121,7 @@ Post individual Grant
     log    Trying to read an individual grant
     Pass Execution If    ${SYNC_MODE} == 1   Skipping. Synchronous mode is supported    
     Set Headers    {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/grants/${grantId}
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
@@ -129,7 +129,7 @@ Post individual Grant
 Put individual Grant
     Log    Trying to perform a GET. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/grants/${grantId}
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
@@ -137,7 +137,7 @@ Put individual Grant
 Patch individual Grant
     Log    Trying to perform a GET. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/grants/${grantId}
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
@@ -145,7 +145,7 @@ Patch individual Grant
 Delete individual Grant
     Log    Trying to perform a GET. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/grants/${grantId}
     ${body}=    Output    response
     Set Suite Variable    ${response}    ${body}
diff --git a/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt b/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
index c9405aec8..dbbedb4bf 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
+++ b/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
@@ -2,7 +2,8 @@
 ${NFVO_HOST}      localhost    # Hostname of the NFVO
 ${NFVO_PORT}      8081    # Listening port of the NFVO
 ${NFVO_SCHEMA}    https
-${AUTHORIZATION}    Bearer    QWxhZGRpbjpvcGVuIHNlc2FtZQ==
+${AUTHORIZATION_HEADER}    Authorization
+${AUTHORIZATION_TOKEN}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 ${CONTENT_TYPE}    application/json
 ${ACCEPT}         application/json
 ${AUTH_USAGE}     1
diff --git a/SOL003/VNFPackageManagement-API/ApiVersion.robot b/SOL003/VNFPackageManagement-API/ApiVersion.robot
index 41eeca71b..2f7e5495d 100644
--- a/SOL003/VNFPackageManagement-API/ApiVersion.robot
+++ b/SOL003/VNFPackageManagement-API/ApiVersion.robot
@@ -133,70 +133,70 @@ DELETE API Version with apiMajorVerion - Method not implemented
 *** Keywords ***
 POST API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
diff --git a/SOL003/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot b/SOL003/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot
index 29e2aeb8b..2635c198a 100644
--- a/SOL003/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot
+++ b/SOL003/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot
@@ -1,208 +1,208 @@
-*** Settings ***
-Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt
-Resource          VNFPackageManagementKeywords.robot 
-Library           JSONLibrary
-Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
-
-*** Test Cases ***
-Get Manifest in Individual VNF Package
-    [Documentation]    Test ID: 7.3.3.10.1
-    ...    Test title: Get Manifest in Individual VNF Package
-    ...    Test objective: The objective is to test that the Get request read the content of manifest within a NVF Package and perform a validation that returned content is in plain text format
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Manifest in Individual VNF Package
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    text/plain
-    
-Get Manifest in Individual VNF Package with security information
-    [Documentation]    Test ID: 7.3.3.10.2
-    ...    Test title: Get Manifest in Individual VNF Package with security information
-    ...    Test objective: The objective is to test the retrieval of manifest for an individual VNF package shall also security certificates when requested with "include_signature" parameter, and perform a validation that returned content is in Zip format
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Manifest in Individual VNF Package with security information
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
-    
-Get Manifest in Individual VNF Package - Not acceptable
-    [Documentation]    Test ID: 7.3.3.10.3
-    ...    Test title: Get Manifest in Individual VNF Package - Not acceptable
-    ...    Test objective: The objective is to test that retriveal of the of manifest for an individual VNF package fails when request contained an "Accept" header not compatible with the Content type "application/zip" but the "include_signatures" flag was provided, and perform a validation of the JSON schema validation of the failed operation HTTP response
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Manifest in Individual VNF Package
-    Check HTTP Response Status Code Is    406
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-
-Get Manifest in Individual VNF Package - Conflict
-    [Documentation]    Test ID: 7.3.3.10.4
-    ...    Test title: Get Manifest in Individual VNF Package - Conflict
-    ...    Test objective: The objective is to test that the retrieval of the manifest for an individual VNF package fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
-    ...    Pre-conditions: The onboarding state of the VNF package for which the VNFD is requested is different from ONBOARDED.
-    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Get Manifest in Individual VNF Package with conflict due to onboarding state
-    Check HTTP Response Status Code Is    409
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-    
-POST Manifest in Individual VNF Package - Method not implemented
-    [Documentation]    Test ID: 7.3.3.10.5
-    ...    Test title: POST Manifest in Individual VNF Package - Method not implemented
-    ...    Test objective: The objective is to test that POST method is not allowed to create new resource
-    ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4a.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send POST Request for Manifest in individual VNF Package
-    Check HTTP Response Status Code Is    405
-
-PUT Manifest in Individual VNF Package - Method not implemented
-    [Documentation]    Test ID: 7.3.3.10.6
-    ...    Test title: PUT Manifest in Individual VNF Package - Method not implemented
-    ...    Test objective: The objective is to test that PUT method is not allowed to modify resource
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4a.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send PUT Request for Manifest in individual VNF Package
-    Check HTTP Response Status Code Is    405
-
-PATCH Manifest in Individual VNF Package - Method not implemented
-    [Documentation]    Test ID: 7.3.3.10.7
-    ...    Test title: PATCH Manifest in Individual VNF Package - Method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to update resource
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4a.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send PATCH Request for Manifest in individual VNF Package
-    Check HTTP Response Status Code Is    405
-
-DELETE Manifest in Individual VNF Package - Method not implemented
-    [Documentation]    Test ID: 7.3.3.10.8
-    ...    Test title: DELETE Manifest in Individual VNF Package - Method not implemented
-    ...    Test objective: The objective is to test that DELETE  method is not allowed to delete resource
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4a.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: Resource is not deleted by the failed operation
-    Send DELETE Request for Manifest in individual VNF Package
-    Check HTTP Response Status Code Is    405
-    
-
-Get Manifest in Individual OnBoarded VNF Package
-    [Documentation]    Test ID: 7.3.3.10.9
-    ...    Test title: Get Manifest in Individual OnBoarded VNF Package
-    ...    Test objective: The objective is to test that the Get request read the content of manifest within a OnBoarded NVF Package and perform a validation that returned content is in plain text format
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Manifest in Individual OnBoarded VNF Package
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    text/plain
-    
-Get Manifest in Individual OnBoarded VNF Package with security information
-    [Documentation]    Test ID: 7.3.3.10.10
-    ...    Test title: Get Manifest in Individual OnBoarded VNF Package with security information
-    ...    Test objective: The objective is to test the retrieval of manifest for an individual OnBoarded VNF package shall also security certificates when requested with "include_signature" parameter, and perform a validation that returned content is in Zip format
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Manifest in Individual OnBoarded VNF Package with security information
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
-    
-Get Manifest in Individual OnBoarded VNF Package - Not acceptable
-    [Documentation]    Test ID: 7.3.3.10.11
-    ...    Test title: Get Manifest in Individual OnBoarded VNF Package - Not acceptable
-    ...    Test objective: The objective is to test that retriveal of the of manifest for an individual OnBoarded VNF package fails when request contained an "Accept" header not compatible with the Content type "application/zip" but the "include_signatures" flag was provided, and perform a validation of the JSON schema validation of the failed operation HTTP response
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Manifest in Individual OnBoarded VNF Package
-    Check HTTP Response Status Code Is    406
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-
-Get Manifest in Individual OnBoarded VNF Package - Conflict
-    [Documentation]    Test ID: 7.3.3.10.12
-    ...    Test title: Get Manifest in Individual OnBoarded VNF Package - Conflict
-    ...    Test objective: The objective is to test that the retrieval of the manifest for an individual OnBoarded VNF package fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
-    ...    Pre-conditions: The onboarding state of the VNF package for which the VNFD is requested is different from ONBOARDED.
-    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Get Manifest in Individual OnBoarded VNF Package with conflict due to onboarding state
-    Check HTTP Response Status Code Is    409
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-    
-POST Manifest in Individual OnBoarded VNF Package - Method not implemented
-    [Documentation]    Test ID: 7.3.3.10.13
-    ...    Test title: POST Manifest in Individual OnBoarded VNF Package - Method not implemented
-    ...    Test objective: The objective is to test that POST method is not allowed to create new resource
-    ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4a.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send POST Request for Manifest in individual OnBoarded VNF Package
-    Check HTTP Response Status Code Is    405
-
-PUT Manifest in Individual OnBoarded VNF Package - Method not implemented
-    [Documentation]    Test ID: 7.3.3.10.14
-    ...    Test title: PUT Manifest in Individual OnBoarded VNF Package - Method not implemented
-    ...    Test objective: The objective is to test that PUT method is not allowed to modify resource
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4a.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send PUT Request for Manifest in individual OnBoarded VNF Package
-    Check HTTP Response Status Code Is    405
-
-PATCH Manifest in Individual OnBoarded VNF Package - Method not implemented
-    [Documentation]    Test ID: 7.3.3.10.15
-    ...    Test title: PATCH Manifest in Individual OnBoarded VNF Package - Method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to update resource
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4a.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send PATCH Request for Manifest in individual OnBoarded VNF Package
-    Check HTTP Response Status Code Is    405
-
-DELETE Manifest in Individual OnBoarded VNF Package - Method not implemented
-    [Documentation]    Test ID: 7.3.3.10.16
-    ...    Test title: DELETE Manifest in Individual OnBoarded VNF Package - Method not implemented
-    ...    Test objective: The objective is to test that DELETE  method is not allowed to delete resource
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.4a.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: Resource is not deleted by the failed operation
-    Send DELETE Request for Manifest in individual OnBoarded VNF Package
+*** Settings ***
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt
+Resource          VNFPackageManagementKeywords.robot 
+Library           JSONLibrary
+Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+
+*** Test Cases ***
+Get Manifest in Individual VNF Package
+    [Documentation]    Test ID: 7.3.3.10.1
+    ...    Test title: Get Manifest in Individual VNF Package
+    ...    Test objective: The objective is to test that the Get request read the content of manifest within a NVF Package and perform a validation that returned content is in plain text format
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Manifest in Individual VNF Package
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    text/plain
+    
+Get Manifest in Individual VNF Package with security information
+    [Documentation]    Test ID: 7.3.3.10.2
+    ...    Test title: Get Manifest in Individual VNF Package with security information
+    ...    Test objective: The objective is to test the retrieval of manifest for an individual VNF package shall also security certificates when requested with "include_signature" parameter, and perform a validation that returned content is in Zip format
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Manifest in Individual VNF Package with security information
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get Manifest in Individual VNF Package - Not acceptable
+    [Documentation]    Test ID: 7.3.3.10.3
+    ...    Test title: Get Manifest in Individual VNF Package - Not acceptable
+    ...    Test objective: The objective is to test that retriveal of the of manifest for an individual VNF package fails when request contained an "Accept" header not compatible with the Content type "application/zip" but the "include_signatures" flag was provided, and perform a validation of the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Manifest in Individual VNF Package
+    Check HTTP Response Status Code Is    406
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+
+Get Manifest in Individual VNF Package - Conflict
+    [Documentation]    Test ID: 7.3.3.10.4
+    ...    Test title: Get Manifest in Individual VNF Package - Conflict
+    ...    Test objective: The objective is to test that the retrieval of the manifest for an individual VNF package fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: The onboarding state of the VNF package for which the VNFD is requested is different from ONBOARDED.
+    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Get Manifest in Individual VNF Package with conflict due to onboarding state
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+POST Manifest in Individual VNF Package - Method not implemented
+    [Documentation]    Test ID: 7.3.3.10.5
+    ...    Test title: POST Manifest in Individual VNF Package - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not allowed to create new resource
+    ...    Pre-conditions: none
+    ...    Reference: Clause 10.4.4a.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send POST Request for Manifest in individual VNF Package
+    Check HTTP Response Status Code Is    405
+
+PUT Manifest in Individual VNF Package - Method not implemented
+    [Documentation]    Test ID: 7.3.3.10.6
+    ...    Test title: PUT Manifest in Individual VNF Package - Method not implemented
+    ...    Test objective: The objective is to test that PUT method is not allowed to modify resource
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.4a.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PUT Request for Manifest in individual VNF Package
+    Check HTTP Response Status Code Is    405
+
+PATCH Manifest in Individual VNF Package - Method not implemented
+    [Documentation]    Test ID: 7.3.3.10.7
+    ...    Test title: PATCH Manifest in Individual VNF Package - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to update resource
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.4a.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PATCH Request for Manifest in individual VNF Package
+    Check HTTP Response Status Code Is    405
+
+DELETE Manifest in Individual VNF Package - Method not implemented
+    [Documentation]    Test ID: 7.3.3.10.8
+    ...    Test title: DELETE Manifest in Individual VNF Package - Method not implemented
+    ...    Test objective: The objective is to test that DELETE  method is not allowed to delete resource
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.4a.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: Resource is not deleted by the failed operation
+    Send DELETE Request for Manifest in individual VNF Package
+    Check HTTP Response Status Code Is    405
+    
+
+Get Manifest in Individual OnBoarded VNF Package
+    [Documentation]    Test ID: 7.3.3.10.9
+    ...    Test title: Get Manifest in Individual OnBoarded VNF Package
+    ...    Test objective: The objective is to test that the Get request read the content of manifest within a OnBoarded NVF Package and perform a validation that returned content is in plain text format
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Manifest in Individual OnBoarded VNF Package
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    text/plain
+    
+Get Manifest in Individual OnBoarded VNF Package with security information
+    [Documentation]    Test ID: 7.3.3.10.10
+    ...    Test title: Get Manifest in Individual OnBoarded VNF Package with security information
+    ...    Test objective: The objective is to test the retrieval of manifest for an individual OnBoarded VNF package shall also security certificates when requested with "include_signature" parameter, and perform a validation that returned content is in Zip format
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Manifest in Individual OnBoarded VNF Package with security information
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get Manifest in Individual OnBoarded VNF Package - Not acceptable
+    [Documentation]    Test ID: 7.3.3.10.11
+    ...    Test title: Get Manifest in Individual OnBoarded VNF Package - Not acceptable
+    ...    Test objective: The objective is to test that retriveal of the of manifest for an individual OnBoarded VNF package fails when request contained an "Accept" header not compatible with the Content type "application/zip" but the "include_signatures" flag was provided, and perform a validation of the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Manifest in Individual OnBoarded VNF Package
+    Check HTTP Response Status Code Is    406
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+
+Get Manifest in Individual OnBoarded VNF Package - Conflict
+    [Documentation]    Test ID: 7.3.3.10.12
+    ...    Test title: Get Manifest in Individual OnBoarded VNF Package - Conflict
+    ...    Test objective: The objective is to test that the retrieval of the manifest for an individual OnBoarded VNF package fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: The onboarding state of the VNF package for which the VNFD is requested is different from ONBOARDED.
+    ...    Reference: Clause 10.4.4a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Get Manifest in Individual OnBoarded VNF Package with conflict due to onboarding state
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+POST Manifest in Individual OnBoarded VNF Package - Method not implemented
+    [Documentation]    Test ID: 7.3.3.10.13
+    ...    Test title: POST Manifest in Individual OnBoarded VNF Package - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not allowed to create new resource
+    ...    Pre-conditions: none
+    ...    Reference: Clause 10.4.4a.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send POST Request for Manifest in individual OnBoarded VNF Package
+    Check HTTP Response Status Code Is    405
+
+PUT Manifest in Individual OnBoarded VNF Package - Method not implemented
+    [Documentation]    Test ID: 7.3.3.10.14
+    ...    Test title: PUT Manifest in Individual OnBoarded VNF Package - Method not implemented
+    ...    Test objective: The objective is to test that PUT method is not allowed to modify resource
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.4a.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PUT Request for Manifest in individual OnBoarded VNF Package
+    Check HTTP Response Status Code Is    405
+
+PATCH Manifest in Individual OnBoarded VNF Package - Method not implemented
+    [Documentation]    Test ID: 7.3.3.10.15
+    ...    Test title: PATCH Manifest in Individual OnBoarded VNF Package - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to update resource
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.4a.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PATCH Request for Manifest in individual OnBoarded VNF Package
+    Check HTTP Response Status Code Is    405
+
+DELETE Manifest in Individual OnBoarded VNF Package - Method not implemented
+    [Documentation]    Test ID: 7.3.3.10.16
+    ...    Test title: DELETE Manifest in Individual OnBoarded VNF Package - Method not implemented
+    ...    Test objective: The objective is to test that DELETE  method is not allowed to delete resource
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.4a.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: Resource is not deleted by the failed operation
+    Send DELETE Request for Manifest in individual OnBoarded VNF Package
     Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/NotificationConsumer.robot b/SOL003/VNFPackageManagement-API/NotificationConsumer.robot
index b61fe1315..0cc88c3de 100644
--- a/SOL003/VNFPackageManagement-API/NotificationConsumer.robot
+++ b/SOL003/VNFPackageManagement-API/NotificationConsumer.robot
@@ -1,70 +1,70 @@
-*** Settings ***
-Library    String
-Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt
-Library           OperatingSystem
-Library           JSONLibrary
-Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
-Suite Setup    Check resource existence and get CallbackUri
-
-*** Test Cases ***
-VNF Package Onboarding Notification
-    [Documentation]    Test ID: 7.3.3.12.1
-    ...    Test title: VNF Package Onboarding Notification
-    ...    Test objective: The objective is to test that the POST request triggers VNF Package Onboarding notification.
-    ...    Pre-conditions: A VNF package subscription for onboarding notifications is available in the NFVO.
-    ...    Reference: Clause 10.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post VNF Package Onboarding Notification
-    Check HTTP Response Status Code Is    204
-    
-VNF Package Change Notification
-    [Documentation]    Test ID: 7.3.3.12.2
-    ...    Test title: VNF Package Change Notification
-    ...    Test objective: The objective is to test that the POST request triggers VNF Package Change notification.
-    ...    Pre-conditions: A VNF package subscription for change notifications is available in the NFVO.
-    ...    Reference: Clause 10.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post VNF Package Change Notification
-    Check HTTP Response Status Code Is    204
-    
-*** Keywords ***
-Check resource existence and get CallbackUri
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
-    Integer    response status    200
-    Validate Json    response body    PkgmSubscription.schema.json
-    Set Global Variable    ${callbackResp}    response body callbackUri
-
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings    ${response['status']}    ${expected_status}
-    Log    Status code validated 
-    
-Post VNF Package Onboarding Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/VnfPackageOnboardingNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPackageId=${vnfPackageId}   vndId=${vndId}   
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}	
-	
-Post VNF Package Change Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/VnfPackageChangeNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPackageId=${vnfPackageId}   vndId=${vndId}   
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
+*** Settings ***
+Library    String
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt
+Library           OperatingSystem
+Library           JSONLibrary
+Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+VNF Package Onboarding Notification
+    [Documentation]    Test ID: 7.3.3.12.1
+    ...    Test title: VNF Package Onboarding Notification
+    ...    Test objective: The objective is to test that the POST request triggers VNF Package Onboarding notification.
+    ...    Pre-conditions: A VNF package subscription for onboarding notifications is available in the NFVO.
+    ...    Reference: Clause 10.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF Package Onboarding Notification
+    Check HTTP Response Status Code Is    204
+    
+VNF Package Change Notification
+    [Documentation]    Test ID: 7.3.3.12.2
+    ...    Test title: VNF Package Change Notification
+    ...    Test objective: The objective is to test that the POST request triggers VNF Package Change notification.
+    ...    Pre-conditions: A VNF package subscription for change notifications is available in the NFVO.
+    ...    Reference: Clause 10.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF Package Change Notification
+    Check HTTP Response Status Code Is    204
+    
+*** Keywords ***
+Check resource existence and get CallbackUri
+    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}/subscriptions/${subscriptionId}
+    Integer    response status    200
+    Validate Json    response body    PkgmSubscription.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+    
+Post VNF Package Onboarding Notification
+    log    Trying to perform a POST to get notification
+    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/VnfPackageOnboardingNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPackageId=${vnfPackageId}   vndId=${vndId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+	
+Post VNF Package Change Notification
+    log    Trying to perform a POST to get notification
+    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/VnfPackageChangeNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPackageId=${vnfPackageId}   vndId=${vndId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot b/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot
index 35a1ad73a..4fe69be41 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot
@@ -1,389 +1,389 @@
-*** Settings ***
-Library           JSONSchemaLibrary    schemas/
-Resource          environment/variables.txt
-Resource          VNFPackageManagementKeywords.robot 
-Library           JSONLibrary
-Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
-
-*** Test Cases ***
-Get VNF Package Artifact
-    [Documentation]    Test ID: 7.3.3.11.1
-    ...    Test title: Get VNF Package Artifact
-    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully, and perform a validation that returned content is in Zip format
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Artifact in VNF Package
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
-    
-Get VNF Package Artifact with "exclude_all_mano_artifacts" parameter
-    [Documentation]    Test ID: 7.3.3.11.2
-    ...    Test title: Get VNF Package Artifact with "exclude_all_mano_artifacts" parameter
-    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and it doesnot contain additional MANO artifacts  when requested with "exclude_all_mano_artifacts" parameter
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Artifact in VNF Package with exclude_all_mano_artifacts parameter
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
-    
-Get VNF Package Artifact with "exclude_all_non_mano_artifacts" parameter
-    [Documentation]    Test ID: 7.3.3.11.3
-    ...    Test title: Get VNF Package Artifact with "exclude_all_non_mano_artifacts" parameter
-    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and it doesnot contain non-MANO Artifacts when requested with "exclude_all_non_mano_artifacts" parameter
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Artifact in VNF Package with exclude_all_non_mano_artifacts parameter
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
-    
-Get VNF Package Artifact with "select_non_mano_artifact_sets" parameter
-    [Documentation]    Test ID: 7.3.3.11.4
-    ...    Test title: Get VNF Package Artifact with "select_non_mano_artifact_sets" parameter
-    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and also contain non_MANO artifacts set when requested with "select_non_mano_artifact_sets" parameter
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Artifact in VNF Package with select_non_mano_artifact_sets parameter
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
-    
-Get VNF Package Artifact with "include_signatures" parameter
-    [Documentation]    Test ID: 7.3.3.11.5
-    ...    Test title: Get VNF Package Artifact with "include_signatures" parameter
-    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and also contain security certificates when requested with "include_signature" parameter, and perform a validation that returned content is in Zip format
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Artifact in VNF Package with include_signatures parameter
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
-    
-Get VNF Package Artifact with Range Request and NFVO supporting Range Requests
-    [Documentation]    Test ID: 7.3.3.11.6
-    ...    Test title: Get VNF Package Artifact with Range Request and NFVO supporting Range Requests
-    ...    Test objective: The objective is to test the GET request read the whole content of the archive containing the artifact files successfully when using a range request to return single range of bytes from the file, with the NFVO supporting it. The test also perform a validation that returned content matches the issued range
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
-    ...    Post-Conditions: none
-    Get Artifact in VNF Package with Range Request
-    Check HTTP Response Status Code Is    206
-    Check HTTP Response Header Content-Range Is Present and Matches the requested range
-    Check HTTP Response Header Content-Length Is Present and Matches the requested range length
-    
-Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "select_non_mano_artifact_sets"
-    [Documentation]    Test ID: 7.3.3.11.7
-    ...    Test title: Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "select_non_mano_artifact_sets"
-    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when both "exclude_all_non_mano_artifacts" and "select_non_mano_artifact_sets" are present in request
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Artifact in VNF Package with exclude_all_non_mano_artifacts and select_non_mano_artifact_sets
-    Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-    
-Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "exclude_all_mano_artifacts"
-    [Documentation]    Test ID: 7.3.3.11.8
-    ...    Test title: Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "exclude_all_mano_artifactss"
-    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when both "exclude_all_non_mano_artifacts" and "exclude_all_mano_artifacts" are present in request
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Artifact in VNF Package with exclude_all_non_mano_artifacts and exclude_all_mano_artifacts
-    Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-    
-Get VNF Package Artifact with invalid URI parameters undifend select_non_mano_artifact_sets
-    [Documentation]    Test ID: 7.3.3.11.9
-    ...    Test title: Get VNF Package Artifact with invalid URI parameters undefined select_non_mano_artifact_sets
-    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when one or more value provided in "select_non_mano_artifact_sets" are not provided in Manifest.
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Artifact in VNF Package with select_non_mano_artifact_sets parameter
-    Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-
-Get VNF Package Artifact with conflict due to onboarding state
-    [Documentation]    Test ID: 7.3.3.11.10
-    ...    Test title: Get VNF Package Artifact with conflict due to onboarding state
-    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
-    ...    Pre-conditions: The onboarding state of the VNF package for which the content is requested is different from ONBOARDED.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none   
-    GET Artifact of VNF Package in onboarding state different from ONBOARDED
-    Check HTTP Response Status Code Is    409
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-    
-GET VNF Package Artifact with invalid Range Request
-    [Documentation]    Test ID: 7.3.3.11.11
-    ...    Test title: GET VNF Package Artifact with invalid Range Request
-    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when using a range request that does not match any available byte range in the file.
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
-    ...    Post-Conditions: none      
-    GET VNF Package Artifact with invalid Range Request
-    Check HTTP Response Status Code Is    416
-    
-POST VNF Package Artifact - Method not implemented
-    [Documentation]    Test ID: 7.3.3.11.12
-    ...    Test title: POST VNF Package Artifact - Method not implemented
-    ...    Test objective: The objective is to test that POST method is not allowed to create new VNF Package artifact
-    ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.5a.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send POST Request for VNF Package Artifact
-    Check HTTP Response Status Code Is    405
-
-PUT VNF Package Artifact - Method not implemented
-    [Documentation]    Test ID: 7.3.3.11.13
-    ...    Test title: PUT VNF Package Artifact - Method not implemented
-    ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNF Package artifact
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send PUT Request for VNF Package Artifact
-    Check HTTP Response Status Code Is    405
-
-PATCH VNF Package Artifact - Method not implemented
-    [Documentation]    Test ID: 7.3.3.11.14
-    ...    Test title: PATCH VNF Package Artifact - Method not implemented
-    ...    Test objective: The objective is to test that PATCH  method is not allowed to update a VNF Package artifact
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send PATCH Request for VNF Package Artifact
-    Check HTTP Response Status Code Is    405
-
-DELETE VNF Package Artifact - Method not implemented
-    [Documentation]    Test ID: 7.3.3.11.15
-    ...    Test title: DELETE VNF Package Artifact - Method not implemented
-    ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNF Package artifact
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send DELETE Request for VNF Package Artifact
-    Check HTTP Response Status Code Is    405
-    
-Get OnBoarded VNF Package Artifact
-    [Documentation]    Test ID: 7.3.3.11.16
-    ...    Test title: Get OnBoarded VNF Package Artifact
-    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the OnBoarded VNF Package Artifact files successfully, and perform a validation that returned content is in Zip format
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Artifact in OnBoarded VNF Package
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
-    
-Get OnBoarded VNF Package Artifact with "exclude_all_mano_artifacts" parameter
-    [Documentation]    Test ID: 7.3.3.11.17
-    ...    Test title: Get OnBoarded VNF Package Artifact with "exclude_all_mano_artifacts" parameter
-    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the OnBoarded VNF Package Artifact files successfully and it doesnot contain additional MANO artifacts  when requested with "exclude_all_mano_artifacts" parameter
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Artifact in OnBoarded VNF Package with exclude_all_mano_artifacts parameter
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
-    
-Get OnBoarded VNF Package Artifact with "exclude_all_non_mano_artifacts" parameter
-    [Documentation]    Test ID: 7.3.3.11.18
-    ...    Test title: Get OnBoarded VNF Package Artifact with "exclude_all_non_mano_artifacts" parameter
-    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the OnBoarded VNF Package artifact files successfully and it doesnot contain non-MANO Artifacts when requested with "exclude_all_non_mano_artifacts" parameter
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Artifact in OnBoarded VNF Package with exclude_all_non_mano_artifacts parameter
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
-    
-Get OnBoarded VNF Package Artifact with "select_non_mano_artifact_sets" parameter
-    [Documentation]    Test ID: 7.3.3.11.19
-    ...    Test title: Get OnBoarded VNF Package Artifact with "select_non_mano_artifact_sets" parameter
-    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the OnBoarded VNF Package artifact files successfully and also contain non_MANO artifacts set when requested with "select_non_mano_artifact_sets" parameter
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Artifact in OnBoarded VNF Package with select_non_mano_artifact_sets parameter
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
-    
-Get OnBoarded VNF Package Artifact with "include_signatures" parameter
-    [Documentation]    Test ID: 7.3.3.11.20
-    ...    Test title: Get OnBoarded VNF Package Artifact with "include_signatures" parameter
-    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the OnBoarded VNF Package artifact files successfully and also contain security certificates when requested with "include_signature" parameter, and perform a validation that returned content is in Zip format
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Artifact in OnBoarded VNF Package with include_signatures parameter
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
-    
-Get OnBoarded VNF Package Artifact with Range Request and NFVO supporting Range Requests
-    [Documentation]    Test ID: 7.3.3.11.21
-    ...    Test title: Get OnBoarded VNF Package Artifact with Range Request and NFVO supporting Range Requests
-    ...    Test objective: The objective is to test the GET request read the whole content of the archive containing the OnBoarded VNF Package artifact files successfully when using a range request to return single range of bytes from the file, with the NFVO supporting it. The test also perform a validation that returned content matches the issued range
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
-    ...    Post-Conditions: none
-    Get Artifact in OnBoarded VNF Package with Range Request
-    Check HTTP Response Status Code Is    206
-    Check HTTP Response Header Content-Range Is Present and Matches the requested range
-    Check HTTP Response Header Content-Length Is Present and Matches the requested range length
-    
-Get OnBoarded VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "select_non_mano_artifact_sets"
-    [Documentation]    Test ID: 7.3.3.11.22
-    ...    Test title: Get OnBoarded VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "select_non_mano_artifact_sets"
-    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the OnBoarded VNF Package artifact files fails when both "exclude_all_non_mano_artifacts" and "select_non_mano_artifact_sets" are present in request
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Artifact in OnBoarded VNF Package with exclude_all_non_mano_artifacts and select_non_mano_artifact_sets
-    Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-    
-Get OnBoarded VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "exclude_all_mano_artifacts"
-    [Documentation]    Test ID: 7.3.3.11.23
-    ...    Test title: Get OnBoarded VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "exclude_all_mano_artifactss"
-    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the OnBoarded VNF Package artifact files fails when both "exclude_all_non_mano_artifacts" and "exclude_all_mano_artifacts" are present in request
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Artifact in OnBoarded VNF Package with exclude_all_non_mano_artifacts and exclude_all_mano_artifacts
-    Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-    
-Get OnBoarded VNF Package Artifact with invalid URI parameters undifend select_non_mano_artifact_sets
-    [Documentation]    Test ID: 7.3.3.11.24
-    ...    Test title: Get OnBoarded VNF Package Artifact with invalid URI parameters undefined select_non_mano_artifact_sets
-    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the OnBoarded VNF Package artifact files fails when one or more value provided in "select_non_mano_artifact_sets" are not provided in Manifest.
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Get Artifact in OnBoarded VNF Package with select_non_mano_artifact_sets parameter
-    Check HTTP Response Status Code Is    400
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-
-Get OnBoarded VNF Package Artifact with conflict due to onboarding state
-    [Documentation]    Test ID: 7.3.3.11.25
-    ...    Test title: Get OnBoarded VNF Package Artifact with conflict due to onboarding state
-    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the OnBoarded VNF Package artifact files fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
-    ...    Pre-conditions: The onboarding state of the VNF package for which the content is requested is different from ONBOARDED.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none   
-    GET Artifact of OnBoarded VNF Package in onboarding state different from ONBOARDED
-    Check HTTP Response Status Code Is    409
-    Check HTTP Response Body Json Schema Is   ProblemDetails
-    
-GET OnBoarded VNF Package Artifact with invalid Range Request
-    [Documentation]    Test ID: 7.3.3.11.26
-    ...    Test title: GET OnBoarded VNF Package Artifact with invalid Range Request
-    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the OnBoarded VNF Package artifact files fails when using a range request that does not match any available byte range in the file.
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
-    ...    Post-Conditions: none      
-    GET OnBoarded VNF Package Artifact with invalid Range Request
-    Check HTTP Response Status Code Is    416
-    
-POST OnBoarded VNF Package Artifact - Method not implemented
-    [Documentation]    Test ID: 7.3.3.11.27
-    ...    Test title: POST OnBoarded VNF Package Artifact - Method not implemented
-    ...    Test objective: The objective is to test that POST method is not allowed to create new VNF Package artifact
-    ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.5a.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send POST Request for OnBoarded VNF Package Artifact
-    Check HTTP Response Status Code Is    405
-
-PUT OnBoarded VNF Package Artifact - Method not implemented
-    [Documentation]    Test ID: 7.3.3.11.28
-    ...    Test title: PUT OnBoarded VNF Package Artifact - Method not implemented
-    ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNF Package artifact
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send PUT Request for OnBoarded VNF Package Artifact
-    Check HTTP Response Status Code Is    405
-
-PATCH OnBoarded VNF Package Artifact - Method not implemented
-    [Documentation]    Test ID: 7.3.3.11.29
-    ...    Test title: PATCH OnBoarded VNF Package Artifact - Method not implemented
-    ...    Test objective: The objective is to test that PATCH  method is not allowed to update a VNF Package artifact
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.5a.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send PATCH Request for OnBoarded VNF Package Artifact
-    Check HTTP Response Status Code Is    405
-
-DELETE OnBoarded VNF Package Artifact - Method not implemented
-    [Documentation]    Test ID: 7.3.3.11.30
-    ...    Test title: DELETE OnBoarded VNF Package Artifact - Method not implemented
-    ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNF Package artifact
-    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: none
-    ...    Post-Conditions: none
-    Send DELETE Request for OnBoarded VNF Package Artifact
+*** Settings ***
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt
+Resource          VNFPackageManagementKeywords.robot 
+Library           JSONLibrary
+Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+
+*** Test Cases ***
+Get VNF Package Artifact
+    [Documentation]    Test ID: 7.3.3.11.1
+    ...    Test title: Get VNF Package Artifact
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully, and perform a validation that returned content is in Zip format
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get VNF Package Artifact with "exclude_all_mano_artifacts" parameter
+    [Documentation]    Test ID: 7.3.3.11.2
+    ...    Test title: Get VNF Package Artifact with "exclude_all_mano_artifacts" parameter
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and it doesnot contain additional MANO artifacts  when requested with "exclude_all_mano_artifacts" parameter
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with exclude_all_mano_artifacts parameter
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get VNF Package Artifact with "exclude_all_non_mano_artifacts" parameter
+    [Documentation]    Test ID: 7.3.3.11.3
+    ...    Test title: Get VNF Package Artifact with "exclude_all_non_mano_artifacts" parameter
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and it doesnot contain non-MANO Artifacts when requested with "exclude_all_non_mano_artifacts" parameter
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with exclude_all_non_mano_artifacts parameter
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get VNF Package Artifact with "select_non_mano_artifact_sets" parameter
+    [Documentation]    Test ID: 7.3.3.11.4
+    ...    Test title: Get VNF Package Artifact with "select_non_mano_artifact_sets" parameter
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and also contain non_MANO artifacts set when requested with "select_non_mano_artifact_sets" parameter
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with select_non_mano_artifact_sets parameter
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get VNF Package Artifact with "include_signatures" parameter
+    [Documentation]    Test ID: 7.3.3.11.5
+    ...    Test title: Get VNF Package Artifact with "include_signatures" parameter
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and also contain security certificates when requested with "include_signature" parameter, and perform a validation that returned content is in Zip format
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with include_signatures parameter
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get VNF Package Artifact with Range Request and NFVO supporting Range Requests
+    [Documentation]    Test ID: 7.3.3.11.6
+    ...    Test title: Get VNF Package Artifact with Range Request and NFVO supporting Range Requests
+    ...    Test objective: The objective is to test the GET request read the whole content of the archive containing the artifact files successfully when using a range request to return single range of bytes from the file, with the NFVO supporting it. The test also perform a validation that returned content matches the issued range
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with Range Request
+    Check HTTP Response Status Code Is    206
+    Check HTTP Response Header Content-Range Is Present and Matches the requested range
+    Check HTTP Response Header Content-Length Is Present and Matches the requested range length
+    
+Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "select_non_mano_artifact_sets"
+    [Documentation]    Test ID: 7.3.3.11.7
+    ...    Test title: Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "select_non_mano_artifact_sets"
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when both "exclude_all_non_mano_artifacts" and "select_non_mano_artifact_sets" are present in request
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with exclude_all_non_mano_artifacts and select_non_mano_artifact_sets
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "exclude_all_mano_artifacts"
+    [Documentation]    Test ID: 7.3.3.11.8
+    ...    Test title: Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "exclude_all_mano_artifactss"
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when both "exclude_all_non_mano_artifacts" and "exclude_all_mano_artifacts" are present in request
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with exclude_all_non_mano_artifacts and exclude_all_mano_artifacts
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+Get VNF Package Artifact with invalid URI parameters undifend select_non_mano_artifact_sets
+    [Documentation]    Test ID: 7.3.3.11.9
+    ...    Test title: Get VNF Package Artifact with invalid URI parameters undefined select_non_mano_artifact_sets
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when one or more value provided in "select_non_mano_artifact_sets" are not provided in Manifest.
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in VNF Package with select_non_mano_artifact_sets parameter
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+
+Get VNF Package Artifact with conflict due to onboarding state
+    [Documentation]    Test ID: 7.3.3.11.10
+    ...    Test title: Get VNF Package Artifact with conflict due to onboarding state
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: The onboarding state of the VNF package for which the content is requested is different from ONBOARDED.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none   
+    GET Artifact of VNF Package in onboarding state different from ONBOARDED
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+GET VNF Package Artifact with invalid Range Request
+    [Documentation]    Test ID: 7.3.3.11.11
+    ...    Test title: GET VNF Package Artifact with invalid Range Request
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when using a range request that does not match any available byte range in the file.
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
+    ...    Post-Conditions: none      
+    GET VNF Package Artifact with invalid Range Request
+    Check HTTP Response Status Code Is    416
+    
+POST VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 7.3.3.11.12
+    ...    Test title: POST VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not allowed to create new VNF Package artifact
+    ...    Pre-conditions: none
+    ...    Reference: Clause 10.4.5a.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send POST Request for VNF Package Artifact
+    Check HTTP Response Status Code Is    405
+
+PUT VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 7.3.3.11.13
+    ...    Test title: PUT VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNF Package artifact
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PUT Request for VNF Package Artifact
+    Check HTTP Response Status Code Is    405
+
+PATCH VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 7.3.3.11.14
+    ...    Test title: PATCH VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that PATCH  method is not allowed to update a VNF Package artifact
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PATCH Request for VNF Package Artifact
+    Check HTTP Response Status Code Is    405
+
+DELETE VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 7.3.3.11.15
+    ...    Test title: DELETE VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNF Package artifact
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send DELETE Request for VNF Package Artifact
+    Check HTTP Response Status Code Is    405
+    
+Get OnBoarded VNF Package Artifact
+    [Documentation]    Test ID: 7.3.3.11.16
+    ...    Test title: Get OnBoarded VNF Package Artifact
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the OnBoarded VNF Package Artifact files successfully, and perform a validation that returned content is in Zip format
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in OnBoarded VNF Package
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get OnBoarded VNF Package Artifact with "exclude_all_mano_artifacts" parameter
+    [Documentation]    Test ID: 7.3.3.11.17
+    ...    Test title: Get OnBoarded VNF Package Artifact with "exclude_all_mano_artifacts" parameter
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the OnBoarded VNF Package Artifact files successfully and it doesnot contain additional MANO artifacts  when requested with "exclude_all_mano_artifacts" parameter
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in OnBoarded VNF Package with exclude_all_mano_artifacts parameter
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get OnBoarded VNF Package Artifact with "exclude_all_non_mano_artifacts" parameter
+    [Documentation]    Test ID: 7.3.3.11.18
+    ...    Test title: Get OnBoarded VNF Package Artifact with "exclude_all_non_mano_artifacts" parameter
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the OnBoarded VNF Package artifact files successfully and it doesnot contain non-MANO Artifacts when requested with "exclude_all_non_mano_artifacts" parameter
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in OnBoarded VNF Package with exclude_all_non_mano_artifacts parameter
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get OnBoarded VNF Package Artifact with "select_non_mano_artifact_sets" parameter
+    [Documentation]    Test ID: 7.3.3.11.19
+    ...    Test title: Get OnBoarded VNF Package Artifact with "select_non_mano_artifact_sets" parameter
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the OnBoarded VNF Package artifact files successfully and also contain non_MANO artifacts set when requested with "select_non_mano_artifact_sets" parameter
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in OnBoarded VNF Package with select_non_mano_artifact_sets parameter
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get OnBoarded VNF Package Artifact with "include_signatures" parameter
+    [Documentation]    Test ID: 7.3.3.11.20
+    ...    Test title: Get OnBoarded VNF Package Artifact with "include_signatures" parameter
+    ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the OnBoarded VNF Package artifact files successfully and also contain security certificates when requested with "include_signature" parameter, and perform a validation that returned content is in Zip format
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in OnBoarded VNF Package with include_signatures parameter
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+Get OnBoarded VNF Package Artifact with Range Request and NFVO supporting Range Requests
+    [Documentation]    Test ID: 7.3.3.11.21
+    ...    Test title: Get OnBoarded VNF Package Artifact with Range Request and NFVO supporting Range Requests
+    ...    Test objective: The objective is to test the GET request read the whole content of the archive containing the OnBoarded VNF Package artifact files successfully when using a range request to return single range of bytes from the file, with the NFVO supporting it. The test also perform a validation that returned content matches the issued range
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
+    ...    Post-Conditions: none
+    Get Artifact in OnBoarded VNF Package with Range Request
+    Check HTTP Response Status Code Is    206
+    Check HTTP Response Header Content-Range Is Present and Matches the requested range
+    Check HTTP Response Header Content-Length Is Present and Matches the requested range length
+    
+Get OnBoarded VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "select_non_mano_artifact_sets"
+    [Documentation]    Test ID: 7.3.3.11.22
+    ...    Test title: Get OnBoarded VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "select_non_mano_artifact_sets"
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the OnBoarded VNF Package artifact files fails when both "exclude_all_non_mano_artifacts" and "select_non_mano_artifact_sets" are present in request
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in OnBoarded VNF Package with exclude_all_non_mano_artifacts and select_non_mano_artifact_sets
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+Get OnBoarded VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "exclude_all_mano_artifacts"
+    [Documentation]    Test ID: 7.3.3.11.23
+    ...    Test title: Get OnBoarded VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "exclude_all_mano_artifactss"
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the OnBoarded VNF Package artifact files fails when both "exclude_all_non_mano_artifacts" and "exclude_all_mano_artifacts" are present in request
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in OnBoarded VNF Package with exclude_all_non_mano_artifacts and exclude_all_mano_artifacts
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+Get OnBoarded VNF Package Artifact with invalid URI parameters undifend select_non_mano_artifact_sets
+    [Documentation]    Test ID: 7.3.3.11.24
+    ...    Test title: Get OnBoarded VNF Package Artifact with invalid URI parameters undefined select_non_mano_artifact_sets
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the OnBoarded VNF Package artifact files fails when one or more value provided in "select_non_mano_artifact_sets" are not provided in Manifest.
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Artifact in OnBoarded VNF Package with select_non_mano_artifact_sets parameter
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+
+Get OnBoarded VNF Package Artifact with conflict due to onboarding state
+    [Documentation]    Test ID: 7.3.3.11.25
+    ...    Test title: Get OnBoarded VNF Package Artifact with conflict due to onboarding state
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the OnBoarded VNF Package artifact files fails due to a conflict when the VNF Package is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
+    ...    Pre-conditions: The onboarding state of the VNF package for which the content is requested is different from ONBOARDED.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none   
+    GET Artifact of OnBoarded VNF Package in onboarding state different from ONBOARDED
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+GET OnBoarded VNF Package Artifact with invalid Range Request
+    [Documentation]    Test ID: 7.3.3.11.26
+    ...    Test title: GET OnBoarded VNF Package Artifact with invalid Range Request
+    ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the OnBoarded VNF Package artifact files fails when using a range request that does not match any available byte range in the file.
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: The NFVO supports range requests to return single range of bytes from the VNF package artifact
+    ...    Post-Conditions: none      
+    GET OnBoarded VNF Package Artifact with invalid Range Request
+    Check HTTP Response Status Code Is    416
+    
+POST OnBoarded VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 7.3.3.11.27
+    ...    Test title: POST OnBoarded VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not allowed to create new VNF Package artifact
+    ...    Pre-conditions: none
+    ...    Reference: Clause 10.4.5a.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send POST Request for OnBoarded VNF Package Artifact
+    Check HTTP Response Status Code Is    405
+
+PUT OnBoarded VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 7.3.3.11.28
+    ...    Test title: PUT OnBoarded VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNF Package artifact
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PUT Request for OnBoarded VNF Package Artifact
+    Check HTTP Response Status Code Is    405
+
+PATCH OnBoarded VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 7.3.3.11.29
+    ...    Test title: PATCH OnBoarded VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that PATCH  method is not allowed to update a VNF Package artifact
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.5a.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send PATCH Request for OnBoarded VNF Package Artifact
+    Check HTTP Response Status Code Is    405
+
+DELETE OnBoarded VNF Package Artifact - Method not implemented
+    [Documentation]    Test ID: 7.3.3.11.30
+    ...    Test title: DELETE OnBoarded VNF Package Artifact - Method not implemented
+    ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNF Package artifact
+    ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
+    ...    Reference: Clause 10.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send DELETE Request for OnBoarded VNF Package Artifact
     Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 162315d2d..523795d9f 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -16,7 +16,7 @@ Variables    descriptors/SOL006/VNFD/vnfd_SOL006.yaml
 Get all VNF Packages
     Log    Trying to get all VNF Packages present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
@@ -42,7 +42,7 @@ Check HTTP Response Body Does Not Contain userDefinedData
 GET VNF Packages with attribute-based filter
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?${POS_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -57,7 +57,7 @@ Check HTTP Response Body VnfPkgsInfo Matches the requested Attribute-Based Filte
 GET VNF Packages with invalid attribute-based filter
     Log    Trying to perform a negative get, filtering by the inexistent filter 'nfvId'
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?${NEG_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -65,7 +65,7 @@ GET VNF Packages with invalid attribute-based filter
 GET VNF Packages with all_fields attribute selector
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?all_fields
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -86,7 +86,7 @@ Check HTTP Response Body VnfPkgsInfo Matches the requested all_fields selector
 GET VNF Packages with exclude_default attribute selector
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using exclude_default filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?exclude_default   
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -105,7 +105,7 @@ GET VNF Packages with fields attribute selector
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using fields
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -124,7 +124,7 @@ GET VNF Packages with fields and exclude_default attribute selector
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using fields
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?fields=${fields}&exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -143,7 +143,7 @@ GET VNF Packages with exclude_fields attribute selector
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using fields
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -161,7 +161,7 @@ Check HTTP Response Body vnfPkgsInfo Matches the requested exclude_fields select
 GET all VNF Packages with invalid resource endpoint
     Log    Trying to perform a GET on a erroneous URI
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_package
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -169,7 +169,7 @@ GET all VNF Packages with invalid resource endpoint
 Send POST Request for all VNF Packages
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -177,7 +177,7 @@ Send POST Request for all VNF Packages
 Send PUT Request for all VNF Packages
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -185,7 +185,7 @@ Send PUT Request for all VNF Packages
 Send PATCH Request for all VNF Packages
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -193,7 +193,7 @@ Send PATCH Request for all VNF Packages
 Send DELETE Request for all VNF Packages
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -201,7 +201,7 @@ Send DELETE Request for all VNF Packages
 GET Individual VNF Package
     Log    Trying to get a VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -214,7 +214,7 @@ Check HTTP Response Body vnfPkgInfo Identifier matches the requested VNF Package
 GET Individual VNF Package with invalid resource identifier
     Log    Trying to perform a negative get, using wrong authorization bearer
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -222,7 +222,7 @@ GET Individual VNF Package with invalid resource identifier
 Send POST Request for individual VNF Package
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -230,7 +230,7 @@ Send POST Request for individual VNF Package
 Send PUT Request for individual VNF Package
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -238,7 +238,7 @@ Send PUT Request for individual VNF Package
 Send PATCH Request for individual VNF Package
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -246,7 +246,7 @@ Send PATCH Request for individual VNF Package
 Send DELETE Request for individual VNF Package
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -254,7 +254,7 @@ Send DELETE Request for individual VNF Package
 GET Individual VNF Package Content  
     Log    Trying to get a VNF Package Content
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -268,7 +268,7 @@ GET Individual VNF Package Content with Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${range}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -277,7 +277,7 @@ GET Individual VNF Package Content with explicit Range Request
     Log    Trying to get a VNF Package Content using RANGE using an NFVO that can handle it
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${range}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -300,7 +300,7 @@ GET Individual VNF Package Content with invalid Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -308,7 +308,7 @@ GET Individual VNF Package Content with invalid Range Request
 GET Individual VNF Package Content with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -316,7 +316,7 @@ GET Individual VNF Package Content with invalid resource identifier
 GET Content for VNF Package in onboarding state different from ONBOARDED
     Log    Trying to get a VNF Package content present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -324,7 +324,7 @@ GET Content for VNF Package in onboarding state different from ONBOARDED
 Send POST Request for individual VNF Package Content
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -332,7 +332,7 @@ Send POST Request for individual VNF Package Content
 Send PUT Request for individual VNF Package Content
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -340,7 +340,7 @@ Send PUT Request for individual VNF Package Content
 Send PATCH Request for individual VNF Package Content
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -348,7 +348,7 @@ Send PATCH Request for individual VNF Package Content
 Send DELETE Request for individual VNF Package Content
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -356,7 +356,7 @@ Send DELETE Request for individual VNF Package Content
 Get all VNF Package Subscriptions
     Log    Trying to get the list of subscriptions
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -364,7 +364,7 @@ Get all VNF Package Subscriptions
 Get VNF Package Subscriptions with attribute-based filters
     Log    Trying to get the list of subscriptions using filters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ok}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}    
@@ -372,7 +372,7 @@ Get VNF Package Subscriptions with attribute-based filters
 Get VNF Package Subscriptions with invalid attribute-based filters
     Log    Trying to get the list of subscriptions using filters with wrong attribute name
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ko}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -380,7 +380,7 @@ Get VNF Package Subscriptions with invalid attribute-based filters
 Get VNF Package Subscriptions with invalid resource endpoint
     Log    Trying to perform a request on a Uri which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -391,7 +391,7 @@ Send Post Request for VNF Package Subscription
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${template}=    Get File    jsons/subscriptions.json
     ${body}=        Format String   ${template}    callbackUri=${callbackUri} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -404,7 +404,7 @@ Send Post Request for Duplicated VNF Package Subscription
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${template}=    Get File    jsons/subscriptions.json
     ${body}=        Format String   ${template}    callbackUri=${callbackUri} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -412,7 +412,7 @@ Send Post Request for Duplicated VNF Package Subscription
 Send Put Request for VNF Package Subscriptions
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -420,7 +420,7 @@ Send Put Request for VNF Package Subscriptions
 Send Patch Request for VNF Package Subscriptions
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -428,7 +428,7 @@ Send Patch Request for VNF Package Subscriptions
 Send Delete Request for VNF Package Subscriptions
     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": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}    
@@ -436,7 +436,7 @@ Send Delete Request for VNF Package Subscriptions
 Get single file VNFD in Individual VNF Package in Plain Format
     Log    Trying to get a VNFD from a given VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgPlainVNFD}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -444,7 +444,7 @@ Get single file VNFD in Individual VNF Package in Plain Format
 Get VNFD in Individual VNF Package in Zip Format
     Log    Trying to get a VNFD from a given VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -453,7 +453,7 @@ Get single file VNFD in Individual VNF Package in Plain or Zip Format
     Log    Trying to get a VNFD from a given VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgPlainVNFD}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -462,7 +462,7 @@ Get multi file VNFD in Individual VNF Package in Plain or Zip Format
     Log    Trying to get a VNFD from a given VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -474,7 +474,7 @@ Check HTTP Response Header Content-Type Is Any of
 Get multi file VNFD in Individual VNF Package in Plain Format
     Log    Trying to get a negative case performing a get on a VNFD from a given VNF Package present in the NFVO Catalogue. Accept will be text/plain but VNFD is composed my multiple files.
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -483,7 +483,7 @@ Get VNFD in Individual VNF Package with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -492,7 +492,7 @@ Get VNFD in Individual VNF Package Content with conflict due to onboarding state
     Log    Trying to get a VNFD from a given VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -500,7 +500,7 @@ Get VNFD in Individual VNF Package Content with conflict due to onboarding state
 Send POST Request for VNFD in individual VNF Package
     Log    Trying to perform a POST. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -508,7 +508,7 @@ Send POST Request for VNFD in individual VNF Package
 Send PUT Request for VNFD in individual VNF Package
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -516,7 +516,7 @@ Send PUT Request for VNFD in individual VNF Package
 Send PATCH Request for VNFD in individual VNF Package
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -524,21 +524,21 @@ Send PATCH Request for VNFD in individual VNF Package
 Send DELETE Request for VNFD in individual VNF Package
     Log    Trying to perform a DELETE. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
 GET Individual VNF Package Artifact
     Log    Trying to get a VNF Package Artifact
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 GET Individual VNF Package Artifact in octet stream format  
     Log    Trying to get a VNF Package Artifact
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageOctetStreamId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -547,7 +547,7 @@ GET Individual VNF Package Artifact with Range Request
     Log    Trying to get an Artifact using RANGE Header and using an NFVO that can handle it
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Range": "${range}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -557,21 +557,21 @@ GET Individual VNF Package Artifact with invalid Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
 GET Individual VNF Package Artifact with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 GET Artifact for VNF Package in onboarding state different from ONBOARDED
     Log    Trying to get a VNF Package artifact present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -579,7 +579,7 @@ GET Artifact for VNF Package in onboarding state different from ONBOARDED
 Send POST Request for individual VNF Package Artifact
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -587,7 +587,7 @@ Send POST Request for individual VNF Package Artifact
 Send PUT Request for individual VNF Package Artifact
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -595,7 +595,7 @@ Send PUT Request for individual VNF Package Artifact
 Send PATCH Request for individual VNF Package Artifact
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -603,7 +603,7 @@ Send PATCH Request for individual VNF Package Artifact
 Send DELETE Request for individual VNF Package Artifact
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -644,7 +644,7 @@ Check Postcondition VNF Package Subscription Is Set
     Log    Check Postcondition subscription exist
     Log    Trying to get the subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Run Keyword If    ${location} == Location
     ...    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
     Run Keyword If    ${location} == Location
@@ -655,7 +655,7 @@ Check Postcondition VNF Package Subscription Is Set
 
 Check Postcondition Subscription Resource Returned in Location Header Is Available
     Log    Going to check postcondition
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${response['headers']['Location']}
     Integer    response status    200
     Log    Received a 200 OK as expected
@@ -672,7 +672,7 @@ Check Postcondition Subscription Resource Returned in Location Header Is Availab
 Get Individual VNF Package Subscription
     Log    Trying to get a single subscription identified by subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -680,7 +680,7 @@ Get Individual VNF Package Subscription
 GET individual VNF Package Subscription with invalid resource identifier
     Log    Trying to perform a request on a subscriptionID which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -688,7 +688,7 @@ GET individual VNF Package Subscription with invalid resource identifier
 Send Delete request for individual VNF Package Subscription
     Log    Trying to perform a DELETE on a subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -696,19 +696,19 @@ Send Delete request for individual VNF Package Subscription
 Send Delete request for individual VNF Package Subscription with invalid resource identifier
     Log    Trying to perform a DELETE on a subscriptionId which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual VNF Package Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for individual VNF Package Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -717,7 +717,7 @@ Send Put request for individual VNF Package Subscription
     Set Suite Variable    ${response}    ${output}
     
 Send Patch request for individual VNF Package Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -755,7 +755,7 @@ Check HTTP Response Header Contain Link
 Get all OnBoarded VNF Packages
     Log    Trying to get all OnBoarded VNF Packages present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -763,7 +763,7 @@ Get all OnBoarded VNF Packages
 GET OnBoarded VNF Packages with attribute-based filter
     Log    Trying to get all OnBoarded VNF Packages present in the NFVO Catalogue, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages?${POS_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -771,7 +771,7 @@ GET OnBoarded VNF Packages with attribute-based filter
 GET OnBoarded VNF Packages with invalid attribute-based filter
     Log    Trying to perform a negative get, filtering by the inexistent filter 'nfvId'
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages?${NEG_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -779,7 +779,7 @@ GET OnBoarded VNF Packages with invalid attribute-based filter
 GET OnBoarded VNF Packages with all_fields attribute selector
     Log    Trying to get all OnBoarded VNF Packages present in the NFVO Catalogue, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages?all_fields
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -787,7 +787,7 @@ GET OnBoarded VNF Packages with all_fields attribute selector
 GET OnBoarded VNF Packages with exclude_default attribute selector
     Log    Trying to get all OnBoarded VNF Packages present in the NFVO Catalogue, using exclude_default filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages?exclude_default   
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -796,7 +796,7 @@ GET OnBoarded VNF Packages with fields attribute selector
     Log    Trying to get all OnBoarded VNF Packages present in the NFVO Catalogue, using fields
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -805,7 +805,7 @@ GET OnBoarded VNF Packages with exclude_fields attribute selector
     Log    Trying to get all OnBoarded VNF Packages present in the NFVO Catalogue, using fields
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -813,7 +813,7 @@ GET OnBoarded VNF Packages with exclude_fields attribute selector
 GET OnBoarded all VNF Packages with invalid resource endpoint
     Log    Trying to perform a GET on a erroneous URI
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_package
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -821,7 +821,7 @@ GET OnBoarded all VNF Packages with invalid resource endpoint
 Send OnBoarded POST Request for all VNF Packages
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -829,7 +829,7 @@ Send OnBoarded POST Request for all VNF Packages
 Send OnBoarded PUT Request for all VNF Packages
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -837,7 +837,7 @@ Send OnBoarded PUT Request for all VNF Packages
 Send OnBoarded PATCH Request for all VNF Packages
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -845,7 +845,7 @@ Send OnBoarded PATCH Request for all VNF Packages
 Send OnBoarded DELETE Request for all VNF Packages
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -853,7 +853,7 @@ Send OnBoarded DELETE Request for all VNF Packages
 GET Individual OnBoarded VNF Package
     Log    Trying to get a OnBoarded VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -861,7 +861,7 @@ GET Individual OnBoarded VNF Package
 GET Individual OnBoarded VNF Package with invalid resource identifier
     Log    Trying to perform a negative get, using wrong authorization bearer
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${erroneousVnfdId} 
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -869,7 +869,7 @@ GET Individual OnBoarded VNF Package with invalid resource identifier
 Send POST Request for individual OnBoarded VNF Package
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -877,7 +877,7 @@ Send POST Request for individual OnBoarded VNF Package
 Send PUT Request for individual OnBoarded VNF Package
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -885,7 +885,7 @@ Send PUT Request for individual OnBoarded VNF Package
 Send PATCH Request for individual OnBoarded VNF Package
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -893,7 +893,7 @@ Send PATCH Request for individual OnBoarded VNF Package
 Send DELETE Request for individual OnBoarded VNF Package
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -901,7 +901,7 @@ Send DELETE Request for individual OnBoarded VNF Package
 Get single file VNFD in Individual OnBoarded VNF Package in Plain Format
     Log    Trying to get a VNFD from a given OnBoarded VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -909,7 +909,7 @@ Get single file VNFD in Individual OnBoarded VNF Package in Plain Format
 Get VNFD in Individual OnBoarded VNF Package in Zip Format
     Log    Trying to get a VNFD from a given OnBoarded VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -918,7 +918,7 @@ Get single file VNFD in Individual OnBoarded VNF Package in Plain or Zip Format
     Log    Trying to get a VNFD from a given OnBoarded VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -927,7 +927,7 @@ Get multi file VNFD in Individual OnBoarded VNF Package in Plain or Zip Format
     Log    Trying to get a VNFD from a given OnBoarded VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -935,7 +935,7 @@ Get multi file VNFD in Individual OnBoarded VNF Package in Plain or Zip Format
 Get multi file VNFD in Individual OnBoarded VNF Package in Plain Format
     Log    Trying to get a negative case performing a get on a VNFD from a given VNF Package present in the NFVO Catalogue. Accept will be text/plain but VNFD is composed my multiple files.
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndIdZipVnfd}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -944,7 +944,7 @@ Get VNFD in Individual OnBoarded VNF Package with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${erroneousVnfdId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -953,7 +953,7 @@ Get VNFD in Individual OnBoarded VNF Package Content with conflict due to onboar
     Log    Trying to get a VNFD from a given OnBoarded VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${onboardingStateVnfdId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -961,7 +961,7 @@ Get VNFD in Individual OnBoarded VNF Package Content with conflict due to onboar
 Send POST Request for VNFD in individual OnBoarded VNF Package
     Log    Trying to perform a POST. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -969,7 +969,7 @@ Send POST Request for VNFD in individual OnBoarded VNF Package
 Send PUT Request for VNFD in individual OnBoarded VNF Package
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -977,7 +977,7 @@ Send PUT Request for VNFD in individual OnBoarded VNF Package
 Send PATCH Request for VNFD in individual OnBoarded VNF Package
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -985,7 +985,7 @@ Send PATCH Request for VNFD in individual OnBoarded VNF Package
 Send DELETE Request for VNFD in individual OnBoarded VNF Package
     Log    Trying to perform a DELETE. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndIdZipVnfd}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -993,7 +993,7 @@ Send DELETE Request for VNFD in individual OnBoarded VNF Package
 GET Individual OnBoarded VNF Package Content  
     Log    Trying to get a VNF Package Content
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1003,7 +1003,7 @@ GET Individual OnBoarded VNF Package Content with Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${range}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1013,7 +1013,7 @@ GET Individual OnBoarded VNF Package Content with invalid Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1021,7 +1021,7 @@ GET Individual OnBoarded VNF Package Content with invalid Range Request
 GET Individual OnBoarded VNF Package Content with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${erroneousVnfdId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1029,21 +1029,21 @@ GET Individual OnBoarded VNF Package Content with invalid resource identifier
 GET Content for OnBoarded VNF Package in onboarding state different from ONBOARDED
     Log    Trying to get a VNF Package content present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${onboardingStateVnfdId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 GET Individual OnBoarded VNF Package Artifact
     Log    Trying to get a VNF Package Artifact
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 GET Individual OnBoarded VNF Package Artifact in octet stream format  
     Log    Trying to get a VNF Package Artifact
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfdOctetStreamId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1052,7 +1052,7 @@ GET Individual OnBoarded VNF Package Artifact with Range Request
     Log    Trying to get an Artifact using RANGE Header and using an NFVO that can handle it
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Range": "${range}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1062,21 +1062,21 @@ GET Individual OnBoarded VNF Package Artifact with invalid Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
 GET Individual OnBoarded VNF Package Artifact with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${erroneousVnfdId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 GET Artifact for OnBoarded VNF Package in onboarding state different from ONBOARDED
     Log    Trying to get a VNF Package artifact present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${onboardingStateVnfdId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1084,7 +1084,7 @@ GET Artifact for OnBoarded VNF Package in onboarding state different from ONBOAR
 Send POST Request for individual OnBoarded VNF Package Artifact
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1092,7 +1092,7 @@ Send POST Request for individual OnBoarded VNF Package Artifact
 Send PUT Request for individual OnBoarded VNF Package Artifact
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1100,7 +1100,7 @@ Send PUT Request for individual OnBoarded VNF Package Artifact
 Send PATCH Request for individual OnBoarded VNF Package Artifact
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1108,7 +1108,7 @@ Send PATCH Request for individual OnBoarded VNF Package Artifact
 Send DELETE Request for individual OnBoarded VNF Package Artifact
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1117,7 +1117,7 @@ Get multi file VNFD in Individual OnBoarded VNF Package with security informatio
     Log    Trying to get a VNFD from a given OnBoarded VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/vnfd/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1126,7 +1126,7 @@ Get multi file VNFD in Individual VNF Package with security information
     Log    Trying to get a VNFD from a given VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1134,7 +1134,7 @@ Get multi file VNFD in Individual VNF Package with security information
 GET Individual VNF Package Artifact with security information 
     Log    Trying to get a VNF Package Artifact
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vndId}/artifacts/${artifactPath}/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1142,21 +1142,21 @@ GET Individual VNF Package Artifact with security information
 GET Individual OnBoarded VNF Package Artifact with security information  
     Log    Trying to get a VNF Package Artifact
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 GET Individual VNF Package Artifact with encrypted artifact
     Log    Trying to get a VNF Package Artifact
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vndEncryptedArtifactID}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 GET Individual OnBoarded VNF Package Artifact with encrypted artifact
     Log    Trying to get a VNF Package Artifact
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndEncryptedArtifactID}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1164,7 +1164,7 @@ GET Individual OnBoarded VNF Package Artifact with encrypted artifact
 GET Individual VNF Package Artifact with incompatable header
     Log    Trying to get a VNF Package Artifact
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vndId}/artifacts/${artifactPath}/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1172,7 +1172,7 @@ GET Individual VNF Package Artifact with incompatable header
 GET Individual OnBoarded VNF Package Artifact with incompatable header  
     Log    Trying to get a VNF Package Artifact
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1180,7 +1180,7 @@ GET Individual OnBoarded VNF Package Artifact with incompatable header
 Get Manifest in Individual VNF Package
     Log    Trying to get content of manifest file from a given VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1189,7 +1189,7 @@ Get Manifest in Individual VNF Package with security information
     Log    Trying to get a manifest from a given VNF Package present in the NFVO Catalogue with security certificates
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/manifest/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1198,7 +1198,7 @@ Get Manifest in Individual VNF Package with conflict due to onboarding state
     Log    Trying to get a manifest from a given VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1206,7 +1206,7 @@ Get Manifest in Individual VNF Package with conflict due to onboarding state
 Send POST Request for Manifest in individual VNF Package
     Log    Trying to perform a POST. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1214,7 +1214,7 @@ Send POST Request for Manifest in individual VNF Package
 Send PUT Request for Manifest in individual VNF Package
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1222,7 +1222,7 @@ Send PUT Request for Manifest in individual VNF Package
 Send PATCH Request for Manifest in individual VNF Package
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1230,7 +1230,7 @@ Send PATCH Request for Manifest in individual VNF Package
 Send DELETE Request for Manifest in individual VNF Package
     Log    Trying to perform a DELETE. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1238,7 +1238,7 @@ Send DELETE Request for Manifest in individual VNF Package
 Get Manifest in Individual OnBoarded VNF Package
     Log    Trying to get content of manifest file from a given OnBoarded VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1247,7 +1247,7 @@ Get Manifest in Individual OnBoarded VNF Package with security information
     Log    Trying to get a manifest from a given OnBoarded VNF Package present in the NFVO Catalogue with security certificates
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndIdZipVnfd}/manifest/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1256,7 +1256,7 @@ Get Manifest in Individual OnBoarded VNF Package with conflict due to onboarding
     Log    Trying to get a manifest from a given OnBoarded VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${onboardingStateVnfdId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1264,7 +1264,7 @@ Get Manifest in Individual OnBoarded VNF Package with conflict due to onboarding
 Send POST Request for Manifest in individual OnBoarded VNF Package
     Log    Trying to perform a POST. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1272,7 +1272,7 @@ Send POST Request for Manifest in individual OnBoarded VNF Package
 Send PUT Request for Manifest in individual OnBoarded VNF Package
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1280,7 +1280,7 @@ Send PUT Request for Manifest in individual OnBoarded VNF Package
 Send PATCH Request for Manifest in individual OnBoarded VNF Package
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1288,7 +1288,7 @@ Send PATCH Request for Manifest in individual OnBoarded VNF Package
 Send DELETE Request for Manifest in individual OnBoarded VNF Package
     Log    Trying to perform a DELETE. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
@@ -1296,7 +1296,7 @@ Send DELETE Request for Manifest in individual OnBoarded VNF Package
 Get Artifact in VNF Package
     Log    Trying to get Artifact in VNF Package
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1304,7 +1304,7 @@ Get Artifact in VNF Package
 Get Artifact in VNF Package with exclude_all_mano_artifacts parameter
     Log    Trying to get Artifact in VNF Package with exclude_all_mano_artifacts
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_mano_artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1312,7 +1312,7 @@ Get Artifact in VNF Package with exclude_all_mano_artifacts parameter
 Get Artifact in VNF Package with exclude_all_non_mano_artifacts parameter
     Log    Trying to get Artifact in VNF Package with security certificates
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1321,7 +1321,7 @@ Get Artifact in VNF Package with select_non_mano_artifact_sets parameter
     Log    Trying to get Artifact in VNF Package with security certificates
     Pass Execution If    ${NFVO_non-MANO_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/select_non_mano_artifact_sets=${non_mano_artifact_sets}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1329,7 +1329,7 @@ Get Artifact in VNF Package with select_non_mano_artifact_sets parameter
 Get Artifact in VNF Package with include_signatures parameter
     Log    Trying to get Artifact in VNF Package with security certificates
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1338,7 +1338,7 @@ Get Artifact in VNF Package with Range Request
     Log    Trying to get an Artifact using RANGE Header and using an NFVO that can handle it
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Range": "${range}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1346,7 +1346,7 @@ Get Artifact in VNF Package with Range Request
 Get Artifact in VNF Package with exclude_all_non_mano_artifacts and select_non_mano_artifact_sets
     Log    Trying to get Artifact in VNF Package 
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&select_non_mano_artifact_sets=${non_mano_artifact_sets}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1354,14 +1354,14 @@ Get Artifact in VNF Package with exclude_all_non_mano_artifacts and select_non_m
 Get Artifact in VNF Package with exclude_all_non_mano_artifacts and exclude_all_mano_artifacts
     Log    Trying to get Artifact in VNF Package 
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&exclude_all_non_mano_artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 GET Artifact of VNF Package in onboarding state different from ONBOARDED
     Log    Trying to get a VNF Package artifact present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1371,7 +1371,7 @@ GET VNF Package Artifact with invalid Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1379,7 +1379,7 @@ GET VNF Package Artifact with invalid Range Request
 Send POST Request for VNF Package Artifact
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1387,7 +1387,7 @@ Send POST Request for VNF Package Artifact
 Send PUT Request for VNF Package Artifact
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1395,7 +1395,7 @@ Send PUT Request for VNF Package Artifact
 Send PATCH Request for VNF Package Artifact
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1403,7 +1403,7 @@ Send PATCH Request for VNF Package Artifact
 Send DELETE Request for VNF Package Artifact
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1411,7 +1411,7 @@ Send DELETE Request for VNF Package Artifact
 Get Artifact in OnBoarded VNF Package
     Log    Trying to get Artifact in OnBoarded VNF Package
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1419,7 +1419,7 @@ Get Artifact in OnBoarded VNF Package
 Get Artifact in OnBoarded VNF Package with exclude_all_mano_artifacts parameter
     Log    Trying to get Artifact in OnBoarded VNF Package with exclude_all_mano_artifacts
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts/exclude_all_mano_artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1427,7 +1427,7 @@ Get Artifact in OnBoarded VNF Package with exclude_all_mano_artifacts parameter
 Get Artifact in OnBoarded VNF Package with exclude_all_non_mano_artifacts parameter
     Log    Trying to get Artifact in OnBoarded VNF Package with security certificates
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1436,7 +1436,7 @@ Get Artifact in OnBoarded VNF Package with select_non_mano_artifact_sets paramet
     Log    Trying to get Artifact in OnBoarded VNF Package with security certificates
     Pass Execution If    ${NFVO_non-MANO_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts/select_non_mano_artifact_sets=${non_mano_artifact_sets}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1444,7 +1444,7 @@ Get Artifact in OnBoarded VNF Package with select_non_mano_artifact_sets paramet
 Get Artifact in OnBoarded VNF Package with include_signatures parameter
     Log    Trying to get Artifact in OnBoarded VNF Package with security certificates
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1453,7 +1453,7 @@ Get Artifact in OnBoarded VNF Package with Range Request
     Log    Trying to get an Artifact using RANGE Header and using an NFVO that can handle it
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Range": "${range}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1461,7 +1461,7 @@ Get Artifact in OnBoarded VNF Package with Range Request
 Get Artifact in OnBoarded VNF Package with exclude_all_non_mano_artifacts and select_non_mano_artifact_sets
     Log    Trying to get Artifact in OnBoarded VNF Package 
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&select_non_mano_artifact_sets=${non_mano_artifact_sets}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1469,14 +1469,14 @@ Get Artifact in OnBoarded VNF Package with exclude_all_non_mano_artifacts and se
 Get Artifact in OnBoarded VNF Package with exclude_all_non_mano_artifacts and exclude_all_mano_artifacts
     Log    Trying to get Artifact in OnBoarded VNF Package 
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&exclude_all_non_mano_artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 GET Artifact of OnBoarded VNF Package in onboarding state different from ONBOARDED
     Log    Trying to get a OnBoarded VNF Package artifact present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${onboardingStateVnfPkgId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1486,7 +1486,7 @@ GET OnBoarded VNF Package Artifact with invalid Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1494,7 +1494,7 @@ GET OnBoarded VNF Package Artifact with invalid Range Request
 Send POST Request for OnBoarded VNF Package Artifact
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1502,7 +1502,7 @@ Send POST Request for OnBoarded VNF Package Artifact
 Send PUT Request for OnBoarded VNF Package Artifact
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1510,7 +1510,7 @@ Send PUT Request for OnBoarded VNF Package Artifact
 Send PATCH Request for OnBoarded VNF Package Artifact
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1518,7 +1518,7 @@ Send PATCH Request for OnBoarded VNF Package Artifact
 Send DELETE Request for OnBoarded VNF Package Artifact
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -1527,7 +1527,7 @@ GET OnBoarded VNF Packages with fields and exclude_default attribute selector
     Log    Trying to get all OnBoarded VNF Packages present in the NFVO Catalogue, using fields
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages?fields=${fields}&exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL003/VNFPackageManagement-API/environment/variables.txt b/SOL003/VNFPackageManagement-API/environment/variables.txt
index d35a4bae6..85599df9d 100644
--- a/SOL003/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL003/VNFPackageManagement-API/environment/variables.txt
@@ -2,7 +2,8 @@
 ${NFVO_HOST}      localhost    # Hostname of the NFVO
 ${NFVO_PORT}      8081    # Listening port of the NFVO
 ${NFVO_SCHEMA}    https
-${AUTHORIZATION}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
+${AUTHORIZATION_HEADER}    Authorization
+${AUTHORIZATION_TOKEN}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 ${ACCEPT_JSON}    application/json
 ${AUTH_USAGE}     1
 ${CONTENT_TYPE_JSON}    application/json
diff --git a/SOL003/VNFPerformanceManagement-API/ApiVersion.robot b/SOL003/VNFPerformanceManagement-API/ApiVersion.robot
index 88ba224c7..38ce2dbc4 100644
--- a/SOL003/VNFPerformanceManagement-API/ApiVersion.robot
+++ b/SOL003/VNFPerformanceManagement-API/ApiVersion.robot
@@ -133,70 +133,70 @@ DELETE API Version with apiMajorVerion - Method not implemented
 *** Keywords ***
 POST API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
index d8324e537..bbe425897 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
@@ -113,7 +113,7 @@ PATCH Individual VNF Performance Job - Precondition failed
 GET individual VNF Performance Job
     Log    Trying to get a Pm Job present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -121,7 +121,7 @@ GET individual VNF Performance Job
 GET individual VNF Performance Job with invalid resource identifier  
     Log    Trying to perform a negative get, using erroneous PM Job identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${erroneousPmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -129,7 +129,7 @@ GET individual VNF Performance Job with invalid resource identifier
 Send Delete request for individual VNF Performance Job
     Log    Trying to delete an existing PM Job
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -137,7 +137,7 @@ Send Delete request for individual VNF Performance Job
 Send Delete request for individual VNF Performance Job with invalid resource identifier
     Log    Trying to perform a negative delete, using erroneous PM Job identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${erroneousPmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -145,7 +145,7 @@ Send Delete request for individual VNF Performance Job with invalid resource ide
 Send Post request for individual VNF Performance Job    
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${newPmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -153,7 +153,7 @@ Send Post request for individual VNF Performance Job
 Send Put request for individual VNF Performance Job    
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -164,7 +164,7 @@ Send Put request for individual VNF Performance Job
 Send Patch request for individual VNF Performance Job    
     Set Headers  {"Accept":"${ACCEPT_JSON}"} 
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/PMJobModifications.json
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}     ${body}
 
@@ -174,7 +174,7 @@ Send Patch request for individual VNF Performance Job
 Check Postcondition VNF Performance Job is not Created
     Log    Trying to get a new Pm Job
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${newPmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualReport.robot b/SOL003/VNFPerformanceManagement-API/IndividualReport.robot
index 48017858d..e029d6cbe 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualReport.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualReport.robot
@@ -83,7 +83,7 @@ DELETE Individual Performance Report - Method not implemented
 Get Individual Performance Report
     Log    Trying to get a performance report present in the VNFM
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -91,21 +91,21 @@ Get Individual Performance Report
 Get Individual Performance Report with invalid resource endpoint
     Log    Trying to get a performance report with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${erroneousReportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for Individual Performance Report
     Log    Trying to create new performance report
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for Individual Performance Report
     Log    Trying to update performance report
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -115,7 +115,7 @@ Send Put request for Individual Performance Report
     
 Send Patch request for Individual Performance Report
     Log    Trying to update performance report
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -125,7 +125,7 @@ Send Patch request for Individual Performance Report
 
 Send Delete request for Individual Performance Report
     Log    Trying to delete performance report   
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
index 1790d9cd4..39af0c1aa 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -113,7 +113,7 @@ PATCH Individual Threshold - Precondition failed
 GET Individual VNF Performance Threshold
     Log    Trying to get a Threhsold present in the VNFM
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -121,28 +121,28 @@ GET Individual VNF Performance Threshold
 GET individual VNF Performance Threshold with invalid resource identifier
     Log    Trying to get a Threhsold with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${erroneousThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual VNF Performance Threshold
     Log    Trying to delete a Threhsold in the VNFM
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual VNF Performance Threshold with invalid resource identifier
     Log    Trying to delete a Threhsold in the VNFM with invalid id
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${erroneousThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual VNF Performance Threshold
     Log    Trying to create new threshold
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${newThresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -150,7 +150,7 @@ Send Post request for individual VNF Performance Threshold
 Send Put request for individual VNF Performance Threshold
     Log    Trying to PUT threshold
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -162,7 +162,7 @@ Send Patch request for individual VNF Performance Threshold
     Log    Trying to PUT threshold
     Set Headers  {"Accept":"${ACCEPT_JSON}"} 
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/ThresholdModifications.json
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
diff --git a/SOL003/VNFPerformanceManagement-API/NotificationConsumer.robot b/SOL003/VNFPerformanceManagement-API/NotificationConsumer.robot
index 55d99d44d..ea8f9283a 100644
--- a/SOL003/VNFPerformanceManagement-API/NotificationConsumer.robot
+++ b/SOL003/VNFPerformanceManagement-API/NotificationConsumer.robot
@@ -1,69 +1,69 @@
-*** Settings ***
-Library    String
-Library    OperatingSystem
-Library    JSONSchemaLibrary    schemas/
-Resource   environment/variables.txt
-Library    JSONLibrary
-Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
-Suite Setup    Check resource existence and get CallbackUri
-
-*** Test Cases ***
-Performance Information Available Notification
-    [Documentation]    Test ID: 7.3.4.10.1
-    ...    Test title: Performance Information Available Notification
-    ...    Test objective: The objective is to test that the POST request triggers Performance Information Available Notification.
-    ...    Pre-conditions: A VNF performance job is created, and a subscription for performance information available notification is available in the VNFM.
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post Performance Information Available Notification
-    Check HTTP Response Status Code Is    204
-    
-Threshold Crossed Notification
-    [Documentation]    Test ID: 7.3.4.10.2
-    ...    Test title: Threshold Crossed Notification
-    ...    Test objective: The objective is to test that the POST request triggers Threshold Crossed Notification
-    ...    Pre-conditions: A VNF performance job is created, and a subscription for threshold crossed notification is available in the VNFM.
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Post Threshold Crossed Notification
-    Check HTTP Response Status Code Is    204
-    
-*** Keywords ***
-Check resource existence and get CallbackUri
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
-    Integer    response status    200
-    Validate Json    response body    PmJob.schema.json
-    Set Global Variable    ${callbackResp}    response body callbackUri
-    
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}
-    ${status}=    Convert To Integer    ${expected_status}    
-    Should Be Equal As Strings    ${response['status']}    ${status} 
-    Log    Status code validated
-
-Post Performance Information Available Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body} =    Get File    jsons/PerformanceInformationAvailableNotification.json
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}	
-
-Post Threshold Crossed Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body} =    Get File    jsons/ThresholdCrossedNotification.json
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
+*** Settings ***
+Library    String
+Library    OperatingSystem
+Library    JSONSchemaLibrary    schemas/
+Resource   environment/variables.txt
+Library    JSONLibrary
+Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+Performance Information Available Notification
+    [Documentation]    Test ID: 7.3.4.10.1
+    ...    Test title: Performance Information Available Notification
+    ...    Test objective: The objective is to test that the POST request triggers Performance Information Available Notification.
+    ...    Pre-conditions: A VNF performance job is created, and a subscription for performance information available notification is available in the VNFM.
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Performance Information Available Notification
+    Check HTTP Response Status Code Is    204
+    
+Threshold Crossed Notification
+    [Documentation]    Test ID: 7.3.4.10.2
+    ...    Test title: Threshold Crossed Notification
+    ...    Test objective: The objective is to test that the POST request triggers Threshold Crossed Notification
+    ...    Pre-conditions: A VNF performance job is created, and a subscription for threshold crossed notification is available in the VNFM.
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Threshold Crossed Notification
+    Check HTTP Response Status Code Is    204
+    
+*** Keywords ***
+Check resource existence and get CallbackUri
+    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}/pm_jobs/${pmJobId}
+    Integer    response status    200
+    Validate Json    response body    PmJob.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+    
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}
+    ${status}=    Convert To Integer    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${status} 
+    Log    Status code validated
+
+Post Performance Information Available Notification
+    log    Trying to perform a POST to get notification
+    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/PerformanceInformationAvailableNotification.json
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+
+Post Threshold Crossed Notification
+    log    Trying to perform a POST to get notification
+    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/ThresholdCrossedNotification.json
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
\ No newline at end of file
diff --git a/SOL003/VNFPerformanceManagement-API/PMJobs.robot b/SOL003/VNFPerformanceManagement-API/PMJobs.robot
index 5ef0d5a24..be4b8957f 100644
--- a/SOL003/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL003/VNFPerformanceManagement-API/PMJobs.robot
@@ -212,7 +212,7 @@ GET all VNF Performance Monitoring Jobs with fields and exclude_default attribut
 GET all VNF Performance Monitoring Jobs
     Log    Trying to get all PM Jobs present in the VNFM
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -220,7 +220,7 @@ GET all VNF Performance Monitoring Jobs
 GET VNF Performance Monitoring Jobs with attribute-based filter
     Log    Trying to get all PM Jobs present in the VNFM, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?${POS_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -228,7 +228,7 @@ GET VNF Performance Monitoring Jobs with attribute-based filter
 GET VNF Performance Monitoring Jobs with all_fields attribute selector
     Log    Trying to get all PM Jobs present in the VNFM, using 'all_fields' filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?all_fields
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -236,7 +236,7 @@ GET VNF Performance Monitoring Jobs with all_fields attribute selector
 GET VNF Performance Monitoring Jobs with exclude_default attribute selector
     Log    Trying to get all VNF Packages present in the VNFM, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -245,7 +245,7 @@ GET VNF Performance Monitoring Jobs with fields attribute selector
     Log    Trying to get all VNF Packages present in the VNFM, using filter params
     Pass Execution If    ${FIELD_USAGE} == 0    Skipping test as VNFM is not supporting 'fields'
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -254,7 +254,7 @@ GET VNF Performance Monitoring Jobs with fields and exclude_default attribute se
     Log    Trying to get all VNF Packages present in the VNFM, using filter params
     Pass Execution If    ${FIELD_USAGE} == 0    Skipping test as VNFM is not supporting 'fields'
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?fields=${fields}&exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -263,7 +263,7 @@ GET VNF Performance Monitoring Jobs with exclude_fields attribute selector
     Log    Trying to get all VNF Packages present in the VNFM, using filter params
     Pass Execution If    ${FIELD_USAGE} == 0    Skipping test as VNFM is not supporting 'fields'
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -271,7 +271,7 @@ GET VNF Performance Monitoring Jobs with exclude_fields attribute selector
 GET VNF Performance Monitoring Jobs with invalid attribute-based filter
     Log    Trying to get all PM Jobs present in the VNFM, using an erroneous filter param
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?${NEG_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -279,7 +279,7 @@ GET VNF Performance Monitoring Jobs with invalid attribute-based filter
 GET VNF Performance Monitoring Jobs with invalid resource endpoint    
     Log    Trying to perform a GET on a erroneous URI
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_job    # wrong URI /pm_job instead of /pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -288,7 +288,7 @@ Send Post Request Create new VNF Performance Monitoring Job
     Log    Creating a new PM Job
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/CreatePmJobRequest.json
     ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs    ${body}
@@ -298,7 +298,7 @@ Send Post Request Create new VNF Performance Monitoring Job
 Send PUT Request for all VNF Performance Monitoring Jobs 
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -306,7 +306,7 @@ Send PUT Request for all VNF Performance Monitoring Jobs
 Send PATCH Request for all VNF Performance Monitoring Jobs 
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -314,7 +314,7 @@ Send PATCH Request for all VNF Performance Monitoring Jobs
 Send DELETE Request for all VNF Performance Monitoring Jobs 
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -326,7 +326,7 @@ Check Postcondition VNF Performance Monitoring Jobs Exist
 Check Postcondition PmJob Exists
     Log    Checking that Pm Job exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL003/VNFPerformanceManagement-API/Thresholds.robot b/SOL003/VNFPerformanceManagement-API/Thresholds.robot
index 1555adaa8..efcc68988 100644
--- a/SOL003/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL003/VNFPerformanceManagement-API/Thresholds.robot
@@ -140,7 +140,7 @@ GET Performance Thresholds - Bad Request Response too Big
 GET all Performance Thresholds
     Log    Trying to get all thresholds present in the VNFM    
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -148,7 +148,7 @@ GET all Performance Thresholds
 GET Performance Thresholds with attribute-based filter
     Log    Trying to get thresholds present in the VNFM with filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds?${FILTER_OK}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -156,7 +156,7 @@ GET Performance Thresholds with attribute-based filter
 GET Performance Thresholds with invalid attribute-based filter
     Log    Trying to get thresholds present in the VNFM with invalid filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds?${FILTER_KO}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -164,14 +164,14 @@ GET Performance Thresholds with invalid attribute-based filter
 GET VNF Performance Thresholds with invalid resource endpoint
     Log    Trying to get thresholds present in the VNFM with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/threshold
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post Request Create new Performance Threshold
     Log    Creating a new THreshold
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${template}=    Get File    jsons/CreateThresholdRequest.json
@@ -182,7 +182,7 @@ Send Post Request Create new Performance Threshold
 
 Send PUT Request for all Performance Thresholds
     Log    PUT THresholds
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
@@ -191,7 +191,7 @@ Send PUT Request for all Performance Thresholds
     
 Send PATCH Request for all Performance Thresholds
     Log    PUT THresholds
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
@@ -200,7 +200,7 @@ Send PATCH Request for all Performance Thresholds
 
 Send DELETE Request for all Performance Thresholds
     Log    DELETE THresholds
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -212,7 +212,7 @@ Check Postcondition Thresholds Exist
 Check Postcondition Threshold Exists
     Log    Checking that Threshold exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL003/VNFPerformanceManagement-API/environment/variables.txt b/SOL003/VNFPerformanceManagement-API/environment/variables.txt
index f61232c97..3b1c0b844 100644
--- a/SOL003/VNFPerformanceManagement-API/environment/variables.txt
+++ b/SOL003/VNFPerformanceManagement-API/environment/variables.txt
@@ -4,7 +4,8 @@ ${VNFM_PORT}      8080    # Listening port of the VNFM
 ${VNFM_SCHEMA}    https
 
 
-${AUTHORIZATION}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
+${AUTHORIZATION_HEADER}    Authorization
+${AUTHORIZATION_TOKEN}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 ${NEG_AUTHORIZATION}    Bearer negativetoken
 
 ${CONTENT_TYPE_JSON}    application/json
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/ApiVersion.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/ApiVersion.robot
index 45cf503da..851231ae0 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/ApiVersion.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/ApiVersion.robot
@@ -131,70 +131,70 @@ DELETE API Version with apiMajorVerion - Method not implemented
 *** Keywords ***
 POST API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationConsumer.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationConsumer.robot
index 47465a390..e02be2df5 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationConsumer.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationConsumer.robot
@@ -1,47 +1,47 @@
-*** Settings ***
-Library    String
-Resource    environment/variables.txt
-Library    OperatingSystem
-Library    JSONLibrary
-Library    JSONSchemaLibrary    schemas/
-Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
-Suite Setup    Check resource existence and get CallbackUri
-
-*** Test Cases ***
-Vr Quota Availibility Notification
-    [Documentation]    Test ID: 7.3.7.4.1
-    ...    Test title: Vr Quota Availibility Notification
-    ...    Test objective: The objective is to test that Vr Quota Availibility Notification is delivered with success to the notification consumer
-    ...    Pre-conditions: The VNF has subscribed to the Vr Quota Availibility resource
-    ...    Reference: Clause 11.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_Notif_Endpoint
-    ...    Applicability: none
-    ...    Post-Conditions:  none
-    Post Vr Quota Avail Notification
-    Check HTTP Response Status Code Is    204
-    
-*** Keywords ***
-Check resource existence and get CallbackUri
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
-    Integer    response status    200
-    Validate Json    response body    VrQuotaAvailSubscription.schema.json
-    Set Global Variable    ${callbackResp}    response body callbackUri
-
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}    
-    Should Be Equal As Strings    ${response['status']}    ${expected_status}
-    Log    Status code validated 
-    
-Post Vr Quota Avail Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template} =    Get File    jsons/VrQuotaAvailNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}   
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
+*** Settings ***
+Library    String
+Resource    environment/variables.txt
+Library    OperatingSystem
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
+Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
+Suite Setup    Check resource existence and get CallbackUri
+
+*** Test Cases ***
+Vr Quota Availibility Notification
+    [Documentation]    Test ID: 7.3.7.4.1
+    ...    Test title: Vr Quota Availibility Notification
+    ...    Test objective: The objective is to test that Vr Quota Availibility Notification is delivered with success to the notification consumer
+    ...    Pre-conditions: The VNF has subscribed to the Vr Quota Availibility resource
+    ...    Reference: Clause 11.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions:  none
+    Post Vr Quota Avail Notification
+    Check HTTP Response Status Code Is    204
+    
+*** Keywords ***
+Check resource existence and get CallbackUri
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    Integer    response status    200
+    Validate Json    response body    VrQuotaAvailSubscription.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+    
+Post Vr Quota Avail Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template} =    Get File    jsons/VrQuotaAvailNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
\ No newline at end of file
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot
index 237409f64..b8944baf7 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot
@@ -17,7 +17,7 @@ Create Sessions
     
 Check Individual Subscription existence
     Set Headers    {"Accept":"${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
     Integer    response status    200
 
@@ -52,7 +52,7 @@ Check Postcondition VNF Virtualised Resources Quota Available Notification indiv
 Send Post request for Virtualised Resources Quota Available Notification Individual Subscription
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
@@ -60,7 +60,7 @@ Send Post request for Virtualised Resources Quota Available Notification Individ
 Put Virtualised Resources Quota Available Notification individual Subscription
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
@@ -68,7 +68,7 @@ Put Virtualised Resources Quota Available Notification individual Subscription
 Patch Virtualised Resources Quota Available Notification individual subscription
     log    Trying to perform a Patch. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
@@ -76,7 +76,7 @@ Patch Virtualised Resources Quota Available Notification individual subscription
 Get Virtualised Resources Quota Available Notification individual subscription 
     log    Trying to get information about an individual subscription
     Set Headers    {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
@@ -84,7 +84,7 @@ Get Virtualised Resources Quota Available Notification individual subscription
 Delete Virtualised Resources Quota Available Notification individual subscription
     log    Try to delete an individual subscription
     Set Headers  {"Accept":"${ACCEPT}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}   
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
@@ -93,7 +93,7 @@ Send Post request for new Virtualised Resources Quota Available Notification sub
     Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/vrQuotaAvailSubscriptionRequest.json
     ${body}=        Format String   ${template}    callback_uri=${callback_uri}:${callback_port}    callback_subscribe=${callback_subscribe}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
@@ -105,7 +105,7 @@ Send Post request for new Virtualised Resources Quota Available Notification sub
     Pass Execution If    ${NFVO_DUPLICATION} == 0    NVFO is not permitting duplication. Skipping the test
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/vrQuotaAvailSubscriptionRequest.json
     ${body}=        Format String   ${template}    callback_uri=${callback_uri}:${callback_port}    callback_subscribe=${callback_subscribe}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
@@ -117,7 +117,7 @@ Send Post request for new Virtualised Resources Quota Available Notification sub
     Pass Execution If    ${NFVO_DUPLICATION} == 1    VNFM permits duplication. Skipping the test
     Set Headers    {"Accept": "${ACCEPT}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/vrQuotaAvailSubscriptionRequest.json
     ${body}=        Format String   ${template}    callback_uri=${callback_uri}:${callback_port}    callback_subscribe=${callback_subscribe}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
@@ -127,7 +127,7 @@ Send Post request for new Virtualised Resources Quota Available Notification sub
 GET Virtualised Resources Quota Available Notification Subscriptions
     Log    Get the list of active subscriptions
     Set Headers  {"Accept":"${ACCEPT}"} 
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${outputResponse}=    Output    response 
@@ -136,7 +136,7 @@ GET Virtualised Resources Quota Available Notification Subscriptions
 GET Virtualised Resources Quota Available Notification Subscriptions with Filter
     Log    Get the list of active subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter}
     ${outputResponse}=    Output    response 
@@ -145,7 +145,7 @@ GET Virtualised Resources Quota Available Notification Subscriptions with Filter
 Get Virtualised Resources Quota Available Notification subscriptions with Bad Request Invalid attribute-based filtering parameters    
      Log    Get the list of active subscriptions using an invalid filter
     Set Headers    {"Accept": "${ACCEPT}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter_invalid}
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
@@ -154,7 +154,7 @@ Send Put request for Virtualised Resources Quota Available Notification subscrip
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse} 
@@ -163,7 +163,7 @@ Send Patch request for Virtualised Resources Quota Available Notification subscr
     log    Trying to perform a Patch. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}  
@@ -172,7 +172,7 @@ Send Delete request for Virtualised Resources Quota Available Notification subsc
     log    Trying to perform a Delete. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}     
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt
index 742e6b3b6..a705ad751 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt
@@ -2,7 +2,8 @@
 ${NFVO_HOST}      localhost    # Hostname of the NFVO
 ${NFVO_PORT}      8081    # Listening port of the NFVO
 ${NFVO_SCHEMA}    https
-${AUTHORIZATION}    Bearer    QWxhZGRpbjpvcGVuIHNlc2FtZQ==
+${AUTHORIZATION_HEADER}    Authorization
+${AUTHORIZATION_TOKEN}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 ${CONTENT_TYPE}    application/json
 ${AUTH_USAGE}     1
 ${ACCEPT}         application/json
-- 
GitLab


From 9eb1681a2aecf38ce04ff43e010d092b0de49de8 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Mon, 15 Feb 2021 11:58:59 +0100
Subject: [PATCH 286/322] fixed issue #154 on SOL005 subscriptions - v2.7.1

---
 .../NSDManagementKeywords.robot               |  37 +-
 .../jsons/subscriptions.json                  |   2 +-
 .../NSFMOperationKeywords.robot               |  14 +-
 .../NSFaultManagement-API/Subscriptions.robot |   3 +
 .../NSLCMOperationKeywords.robot              |  20 +-
 .../Subscriptions.robot                       |   3 +
 .../VNFPackageManagementKeywords.robot        |  31 +-
 .../jsons/PkgmSubscription.json               | 414 ------------------
 8 files changed, 83 insertions(+), 441 deletions(-)
 delete mode 100644 SOL005/VNFPackageManagement-API/jsons/PkgmSubscription.json

diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index 9ea91b491..c5fd69b64 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -789,13 +789,19 @@ Send Post Request for NSD Management Subscription
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File
     ${template}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String   ${template}     notifCallbackUri=${notifCallbackUri}    nsdId=${NS_DescriptorID}    nsdName=${NS_Name}    nsdVersion=${NS_Version}    nsdDesigner=${Designer}    nsdInvariantId=${NS_InvariantId}
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}    nsdId=${NS_DescriptorID}    nsdName=${NS_Name}    nsdVersion=${NS_Version}    nsdDesigner=${Designer}    nsdInvariantId=${NS_InvariantId}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1
-    ...    Check Notification Endpoint  
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
+	${output}=    Output    response
+	Set Global Variable    ${response}    ${output}
+	Clear Requests    ${callback_endpoint}
+    #Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1    #removed as the check of notif endpoint is done by NFVO while processing subscription reques
+    #...    Check Notification Endpoint     
 
 
 Send POST Request for Duplicated NSD Management Subscription
@@ -804,13 +810,19 @@ Send POST Request for Duplicated NSD Management Subscription
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File
     ${template}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String   ${template}     notifCallbackUri=${notifCallbackUri}    nsdId=${NS_DescriptorID}    nsdName=${NS_Name}    nsdVersion=${NS_Version}    nsdDesigner=${Designer}    nsdInvariantId=${NS_InvariantId}
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}    nsdId=${NS_DescriptorID}    nsdName=${NS_Name}    nsdVersion=${NS_Version}    nsdDesigner=${Designer}    nsdInvariantId=${NS_InvariantId}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1
-    ...    Check Notification Endpoint  
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
+	${output}=    Output    response
+	Set Global Variable    ${response}    ${output}
+	Clear Requests    ${callback_endpoint}
+    #Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1    #removed as the check of notif endpoint is done by NFVO while processing subscription reques
+    #...    Check Notification Endpoint   
 
 
 
@@ -982,7 +994,6 @@ Check HTTP Response Header Contains Etag
     Set Suite Variable    ${original_etag}    ${response['headers]['ETag']}
 
 Create Sessions
-    Pass Execution If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 0    MockServer not started as NFVO is not checking the notification endpoint
     Start Process  java  -jar  ${MOCK_SERVER_JAR}    -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
     Create Mock Session  ${callback_uri}
diff --git a/SOL005/NSDManagement-API/jsons/subscriptions.json b/SOL005/NSDManagement-API/jsons/subscriptions.json
index a82df503c..b94f3efea 100644
--- a/SOL005/NSDManagement-API/jsons/subscriptions.json
+++ b/SOL005/NSDManagement-API/jsons/subscriptions.json
@@ -1,5 +1,5 @@
 {{
-	"callbackUri": "{notifCallbackUri}",
+	"callbackUri": "{callback_uri}{callback_endpoint}",
 	"filter": {{
 		"nsdId": "{nsdId}",
 		"nsdName": "{nsdName}",
diff --git a/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot b/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
index 414f1a847..406c95fc1 100644
--- a/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
+++ b/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
@@ -215,9 +215,17 @@ POST Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
-    ${outputResponse}=    Output    response
-    Set Global Variable    ${response}    ${outputResponse}
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
+	${output}=    Output    response
+	Set Global Variable    ${response}    ${output}
+	Clear Requests    ${callback_endpoint}
+    #Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1    #removed as the check of notif endpoint is done by NFVO while processing subscription reques
+    #...    Check Notification Endpoint 
 
 # Post Create subscription - DUPLICATION
     # Log    Trying to create a subscription with an already created content
diff --git a/SOL005/NSFaultManagement-API/Subscriptions.robot b/SOL005/NSFaultManagement-API/Subscriptions.robot
index b8e00065e..4850c4b07 100644
--- a/SOL005/NSFaultManagement-API/Subscriptions.robot
+++ b/SOL005/NSFaultManagement-API/Subscriptions.robot
@@ -6,6 +6,9 @@ Library     OperatingSystem
 Library  DependencyLibrary
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
+Library    Process
+Suite Setup       Create Sessions
+Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Create a new alarm subscription
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index aa89c7eec..37405543c 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -1097,10 +1097,16 @@ POST subscriptions
     Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File
     ${template}=    Get File    jsons/LccnSubscriptionRequest.json
     ${body}=        Format String   ${template}     callbackUri=${callback_uri}   callbackEndpoint=${callback_endpoint}   callbackPort=${callback_port}   nsdId=${NS_DescriptorID}
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
-	
+	Clear Requests    ${callback_endpoint}
+		
 POST subscriptions DUPLICATION
     Log    Trying to create a subscription with an already created content
     Pass Execution If    ${NFVO_DUPLICATION} == 0    NFVO is not permitting duplication. Skipping the test
@@ -1110,9 +1116,15 @@ POST subscriptions DUPLICATION
     Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File
     ${template}=    Get File    jsons/LccnSubscriptionRequest.json
     ${body}=        Format String   ${template}     callbackUri=${callback_uri}   callbackEndpoint=${callback_endpoint}   callbackPort=${callback_port}     nsdId=${NS_DescriptorID}
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
+	Clear Requests    ${callback_endpoint}
 	
 POST subscriptions NO DUPLICATION
     Log    Trying to create a subscription with an already created content
@@ -1123,9 +1135,15 @@ POST subscriptions NO DUPLICATION
     Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File
     ${template}=    Get File    jsons/LccnSubscriptionRequest.json
     ${body}=        Format String   ${template}     callbackUri=${callback_uri}   callbackEndpoint=${callback_endpoint}   callbackPort=${callback_port}     nsdId=${NS_DescriptorID}
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
 	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
+	Clear Requests    ${callback_endpoint}
 
 GET Subscriptions
     Log    Get the list of active subscriptions
diff --git a/SOL005/NSLifecycleManagement-API/Subscriptions.robot b/SOL005/NSLifecycleManagement-API/Subscriptions.robot
index d2d0010ce..bce367fd3 100644
--- a/SOL005/NSLifecycleManagement-API/Subscriptions.robot
+++ b/SOL005/NSLifecycleManagement-API/Subscriptions.robot
@@ -5,6 +5,9 @@ Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=fal
 Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
+Library    Process
+Suite Setup       Create Sessions
+Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 POST Create a new subscription
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 389a9bf59..2c13b7c5b 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -735,11 +735,17 @@ Send Post Request for VNF Package Subscription
     ${template}=    Get File    jsons/subscriptions.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}    vnfdId=${Descriptor_ID}    vnfProvider=${Provider}    vnfProductName=${Product_Name}    vnfSoftwareVersion=${Software_Version}    vnfdVersions=${Descriptor_Version}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output} 
-    Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1
-    ...       Check Notification Endpoint
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
+	${output}=    Output    response
+	Set Global Variable    ${response}    ${output}
+	Clear Requests    ${callback_endpoint}
+    #Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1    #removed as the check of notif endpoint is done by NFVO while processing subscription reques
+    #...    Check Notification Endpoint 
 
 Send Post Request for Duplicated VNF Package Subscription
     Log    Trying to create a subscription with an already created content
@@ -748,9 +754,17 @@ Send Post Request for Duplicated VNF Package Subscription
     ${template}=    Get File    jsons/subscriptions.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output} 
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
+	${output}=    Output    response
+	Set Global Variable    ${response}    ${output}
+	Clear Requests    ${callback_endpoint}
+    #Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1    #removed as the check of notif endpoint is done by NFVO while processing subscription reques
+    #...    Check Notification Endpoint 
 
 Send Put Request for VNF Package Subscriptions
     Log    Trying to perform a PUT. This method should not be implemented
@@ -894,7 +908,6 @@ Check Postcondition VNF Package Subscription is not Created
     Check HTTP Response Status Code Is    404
 
 Create Sessions
-    Pass Execution If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 0    MockServer not started as NFVO is not checking the notification endpoint
     Start Process  java  -jar  ${MOCK_SERVER_JAR}    -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
     Create Mock Session  ${callback_uri}:${callback_port}
diff --git a/SOL005/VNFPackageManagement-API/jsons/PkgmSubscription.json b/SOL005/VNFPackageManagement-API/jsons/PkgmSubscription.json
deleted file mode 100644
index c01e92b48..000000000
--- a/SOL005/VNFPackageManagement-API/jsons/PkgmSubscription.json
+++ /dev/null
@@ -1,414 +0,0 @@
-[
-  {
-    "id": "ABCDEFGHIJKL",
-    "callbackUri": "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
-    "_links": {
-      "self": {
-        "href": "ABCDEFGHIJKLMNOPQR"
-      }
-    },
-    "filter": {
-      "notificationTypes": [
-        "VnfPackageChangeNotification"
-      ],
-      "vnfProductsFromProviders": [
-        {
-          "vnfProvider": "ABCDEFGHIJKLMNOPQRSTUVW",
-          "vnfProducts": [
-            {
-              "vnfProductName": "ABCDEFGHIJKLMNOPQRSTUVWX",
-              "versions": [
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNOPQRSTUVWXYZABC",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQ",
-                    "ABCDE"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNOPQRSTUVWXYZA",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZABC"
-                  ]
-                }
-              ]
-            },
-            {
-              "vnfProductName": "ABCDEFGHIJKLM",
-              "versions": [
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMN",
-                  "vnfdVersions": [
-                    "ABCDEF",
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNOPQRSTUVWXYZABC",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNO",
-                    "ABCDEFGH",
-                    "ABCDEF"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCD",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQRSTUVWXY",
-                    "ABCDEFGHIJ",
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZABC"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNOPQRST",
-                  "vnfdVersions": [
-                    "ABCDEFG",
-                    "ABCDEFGHIJKLMNOPQRSTU"
-                  ]
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "vnfProvider": "ABCDEF",
-          "vnfProducts": [
-            {
-              "vnfProductName": "ABCDEFGH",
-              "versions": [
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNOPQRST",
-                  "vnfdVersions": [
-                    "ABCDE",
-                    "ABCDE",
-                    "ABCDEFGHIJKLMNOPQR"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNOPQRSTUVWX",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOP"
-                  ]
-                }
-              ]
-            },
-            {
-              "vnfProductName": "ABCDE",
-              "versions": [
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNO",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZABC"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJ",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQRS"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJK",
-                  "vnfdVersions": [
-                    "ABCD"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCD",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKL",
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZABC"
-                  ]
-                }
-              ]
-            },
-            {
-              "vnfProductName": "ABCD",
-              "versions": [
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNOPQRST",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQ",
-                    "ABCDEFGHIJKL"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNOPQRSTUVWXY",
-                  "vnfdVersions": [
-                    "ABCDEF",
-                    "ABCDEFGHIJKLMNOPQRST"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEF",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZABC",
-                    "ABCDEFGHIJKLMNOPQR",
-                    "ABCDEFGHIJKLMNOP"
-                  ]
-                }
-              ]
-            }
-          ]
-        }
-      ],
-      "vnfdId": [
-        "ABCDEFGHIJKLMNOPQRS",
-        "ABCDEFGHIJKLMNO",
-        "ABCDEFGHIJKLM",
-        "ABCDEFGHIJK"
-      ],
-      "vnfPkgId": [
-        "ABCDEFGH",
-        "ABCDEFGHIJKLMNOPQ",
-        "ABCDE",
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZABC"
-      ],
-      "operationalState": "DISABLED",
-      "usageState": {}
-    }
-  },
-  {
-    "id": "ABCDE",
-    "callbackUri": "ABCDEFGHIJKLM",
-    "_links": {
-      "self": {
-        "href": "ABCDEFGHIJKLMNOPQRSTU"
-      }
-    },
-    "filter": {
-      "notificationTypes": [
-        "VnfPackageOnboardingNotification",
-        "VnfPackageOnboardingNotification",
-        "VnfPackageOnboardingNotification"
-      ],
-      "vnfProductsFromProviders": [
-        {
-          "vnfProvider": "ABCDEFGH",
-          "vnfProducts": [
-            {
-              "vnfProductName": "ABCDEFGHIJKLMNOPQRSTUV",
-              "versions": [
-                {
-                  "vnfSoftwareVersion": "ABCD",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMN",
-                    "ABCDEFGHIJKLMNOPQRSTUVW",
-                    "ABCDE",
-                    "ABCDEFGHIJKLMNOPQRS"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQRS"
-                  ]
-                }
-              ]
-            },
-            {
-              "vnfProductName": "ABCDEFGHIJKLMN",
-              "versions": [
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNOP",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJ",
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZABC",
-                    "ABCDEFGHIJKLMNOPQRSTUVWX",
-                    "ABCDEFGHIJKLMNOPQR"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMN",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNO",
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
-                    "ABCDEFGHIJKLMNOPQRSTUVW"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEF",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLM",
-                    "ABCDE",
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZA"
-                  ]
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "vnfProvider": "ABCDEFGHIJKLMNOPQRSTUVWXYZABC",
-          "vnfProducts": [
-            {
-              "vnfProductName": "ABCDEFGHIJKLMNOPQ",
-              "versions": [
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNOPQRSTUVWXY",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQ",
-                    "ABCDE"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMN",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQRSTUVWX",
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZABC"
-                  ]
-                }
-              ]
-            },
-            {
-              "vnfProductName": "ABCDEFGHIJKLMNOP",
-              "versions": [
-                {
-                  "vnfSoftwareVersion": "ABCD",
-                  "vnfdVersions": [
-                    "ABCDEFGH",
-                    "ABCDEFGHIJKLMN",
-                    "ABCDEFGHIJKLMNOP"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLM",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLM",
-                    "ABCDEFGH"
-                  ]
-                }
-              ]
-            }
-          ]
-        }
-      ],
-      "vnfdId": [
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZABC",
-        "ABCDEFGHIJKLM",
-        "ABCDEFGHIJKLMNOPQRS",
-        "ABCDEFGHIJKL"
-      ],
-      "vnfPkgId": [
-        "ABCDEFGHIJKLMNOPQRSTUVWXY"
-      ],
-      "operationalState": "DISABLED",
-      "usageState": {}
-    }
-  },
-  {
-    "id": "ABCDEF",
-    "callbackUri": "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
-    "_links": {
-      "self": {
-        "href": "ABCDEFGHIJKLMNOPQ"
-      }
-    },
-    "filter": {
-      "notificationTypes": [
-        "VnfPackageChangeNotification",
-        "VnfPackageOnboardingNotification",
-        "VnfPackageChangeNotification",
-        "VnfPackageOnboardingNotification"
-      ],
-      "vnfProductsFromProviders": [
-        {
-          "vnfProvider": "ABCDEFGHIJKL",
-          "vnfProducts": [
-            {
-              "vnfProductName": "ABCDEFGHIJK",
-              "versions": [
-                {
-                  "vnfSoftwareVersion": "ABCDE",
-                  "vnfdVersions": [
-                    "ABCDEFGHI",
-                    "ABCDEFGHIJKLMNOPQRS",
-                    "ABCDEFGHIJKLMNOPQR"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNOPQRSTUVWX",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQRSTUVWX",
-                    "ABCDEFG",
-                    "ABCDEFGHIJKLMNOPQRSTUVW",
-                    "ABCDEFGHIJKLMNOPQRSTUVWXY"
-                  ]
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "vnfProvider": "ABCDEFGHI",
-          "vnfProducts": [
-            {
-              "vnfProductName": "ABCDEFGHIJ",
-              "versions": [
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKL",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZA",
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZABC",
-                    "ABCDEFGHIJKL",
-                    "ABCDEFGHIJKLMNOPQR"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNOPQ",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZABC",
-                    "ABCDEFGHIJKLMNOPQRSTU",
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZABC",
-                    "ABCDEFGHIJKLMN"
-                  ]
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "vnfProvider": "ABCDEFGHIJKLMNOPQRSTUVWXYZA",
-          "vnfProducts": [
-            {
-              "vnfProductName": "ABCDEFGH",
-              "versions": [
-                {
-                  "vnfSoftwareVersion": "ABCDE",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZABC",
-                    "ABCDEFGHIJKLMNOPQRS",
-                    "ABCDEFGHIJKLMNOPQRST"
-                  ]
-                }
-              ]
-            }
-          ]
-        }
-      ],
-      "vnfdId": [
-        "ABCDEFGHIJKLMNOP",
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZA"
-      ],
-      "vnfPkgId": [
-        "ABCDEFGHIJKLMNOPQRSTUVW",
-        "ABCDEFGHIJKLMNOPQ",
-        "ABCDEFGHIJKLMN"
-      ],
-      "operationalState": "ENABLED",
-      "usageState": [
-        773,
-        [
-          {},
-          [
-            false,
-            true
-          ],
-          null,
-          null
-        ]
-      ]
-    }
-  }
-]
\ No newline at end of file
-- 
GitLab


From c9b85ade1d26276a17f694fbb5c7f430a50e1380 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Mon, 15 Feb 2021 12:36:21 +0100
Subject: [PATCH 287/322] fixed issue #154 on SOL002 subscriptions - v2.7.1

---
 .../Subscriptions.robot                       | 22 ++++++-
 SOL002/VNFIndicator-API/Subscriptions.robot   | 64 ++++++++++++++-----
 .../Subscriptions.robot                       |  3 +
 .../VnfLcmOperationKeywords.robot             | 49 ++++++++++----
 4 files changed, 109 insertions(+), 29 deletions(-)

diff --git a/SOL002/VNFFaultManagement-API/Subscriptions.robot b/SOL002/VNFFaultManagement-API/Subscriptions.robot
index 0783ff138..a03299db3 100644
--- a/SOL002/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL002/VNFFaultManagement-API/Subscriptions.robot
@@ -5,6 +5,10 @@ Library     OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 Library    String
+Library    Process
+Library    MockServerLibrary
+Suite Setup       Create Sessions
+Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Create a new subscription
@@ -314,6 +318,11 @@ POST Create a new Subscription - Unprocessable Entity
     Check HTTP Response Body Json Schema Is  ProblemDetails
 
 *** Keywords ***
+Create Sessions
+    Start Process  java  -jar  ${MOCK_SERVER_JAR}    -serverPort  ${callback_port}  alias=mockInstance
+    Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
+    Create Mock Session  ${callback_uri}:${callback_port}
+
 Post Create subscription
     Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
@@ -321,9 +330,16 @@ Post Create subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}				
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
+	${output}=    Output    response
+	Set Global Variable    ${response}    ${output}
+	Clear Requests    ${callback_endpoint}
+		
 # Post Create subscription - DUPLICATION
     # Log    Trying to create a subscription with an already created content
     # Pass Execution If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 0    NVFO is not permitting duplication. Skipping the test
diff --git a/SOL002/VNFIndicator-API/Subscriptions.robot b/SOL002/VNFIndicator-API/Subscriptions.robot
index 91fa1f258..8642b1d96 100644
--- a/SOL002/VNFIndicator-API/Subscriptions.robot
+++ b/SOL002/VNFIndicator-API/Subscriptions.robot
@@ -145,12 +145,12 @@ POST Create a new Subscription - Unprocessable Entity
     [Documentation]    Test ID: 6.3.2.4.11
     ...    Test title: POST Create a new Subscription - Unprocessable Entity
     ...    Test objective: The objective is to test that content type of the payload body is supported and the payload body of a request contains syntactically correct data but the data cannot be processed.
-    ...    re-conditions: none
+    ...    Pre-conditions: none
     ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
-    Send Post Request for VNF Indicator Subscription
+    Send Post Request for VNF Indicator Subscription wih unprocessable entity
     Check HTTP Response Status Code Is    422
     Check HTTP Response Body Json Schema Is  ProblemDetails
  
@@ -221,11 +221,28 @@ Send Post Request for VNF Indicator Subscription
     ${template}=    Get File    jsons/subscriptions.json
     ${body}=        Format String    ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}  
-    Run Keyword If    ${VNFM_CHECKS_NOTIF_ENDPOINT} == 1
-    ...       Check Notification Endpoint 
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
+	${output}=    Output    response
+	Set Global Variable    ${response}    ${output}
+	Clear Requests    ${callback_endpoint}
+    #Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1    #removed as the check of notif endpoint is done by NFVO while processing subscription reques
+    #...    Check Notification Endpoint
+
+Send Post Request for VNF Indicator Subscription with unprocessable entity
+    Log    Trying to create a new subscription
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    ${template}=    Get File    jsons/subscriptions.json
+    ${body}=        Format String    ${template}     callback_uri=localhost    #not reachable endpoint
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
+	${output}=    Output    response
+	Set Global Variable    ${response}    ${output}
 
 Send Put Request for VNF Indicator Subscriptions
     Log    Trying to create a new subscription
@@ -291,8 +308,7 @@ Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filte
     @{words} =  Split String    ${POS_FILTER}       ,${SEPERATOR} 
     Should Be Equal As Strings    ${response['body'][0]['callbackUri']}    @{words}[1]
     
-Create Sessions
-    Pass Execution If    ${VNFM_CHECKS_NOTIF_ENDPOINT} == 0   MockServer not necessary to run    
+Create Sessions 
     Start Process  java  -jar  ${MOCK_SERVER_JAR}    -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
     Create Mock Session  ${callback_uri}:${callback_port}
@@ -315,9 +331,18 @@ Post Create subscription - DUPLICATION
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/subscriptions.json
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}		
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}		
+    ${body}=        Format String    ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
+	${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	Clear Requests    ${callback_endpoint}
+    #Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1    #removed as the check of notif endpoint is done by NFVO while processing subscription reques
+    #...    Check Notification Endpoint 
 		
 Post Create subscription - NO-DUPLICATION	
     Log    Trying to create a subscription with an already created content
@@ -326,9 +351,18 @@ Post Create subscription - NO-DUPLICATION
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/subscriptions.json
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}	
+    ${body}=        Format String    ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
+	${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	Clear Requests    ${callback_endpoint}
+    #Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1    #removed as the check of notif endpoint is done by NFVO while processing subscription reques
+    #...    Check Notification Endpoint 
 	
 Check Operation Occurrence Id
     ${vnfLcmOpOccId}=    Get Value From Json    ${response['headers']}    $..Location
diff --git a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
index 6f8cbd6ed..65bff9a7c 100644
--- a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
+++ b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
@@ -5,6 +5,9 @@ Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=fal
 Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
+Library           Process
+Suite Setup       Create Sessions
+Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 POST Create a new subscription
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index f4cf32f3e..e3c3a231a 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -9,12 +9,17 @@ Library    BuiltIn
 Library    JSONLibrary
 Library    Collections
 Library    JSONSchemaLibrary    schemas/
-Library           String
+Library    String
+Library    Process
 Variables    descriptors/SOL001/VNFD/vnfd_SOL001.yaml
 Variables    descriptors/SOL006/VNFD/vnfd_SOL006.yaml
 
 *** Keywords ***
-
+Create Sessions 
+    Start Process  java  -jar  ${MOCK_SERVER_JAR}    -serverPort  ${callback_port}  alias=mockInstance
+    Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
+    Create Mock Session  ${callback_uri}:${callback_port}
+    
 Get Vnf Instance 
     [Arguments]    ${vnfInstanceId}
     Set Headers    {"Accept":"${ACCEPT}"}  
@@ -795,9 +800,17 @@ Post Create subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
     ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}				
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
+	${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	Clear Requests    ${callback_endpoint}
+
+ 	
 Post Create subscription - DUPLICATION
     Log    Trying to create a subscription with an already created content
     Pass Execution If    ${VNFM_DUPLICATION} == 0    VNFM is not permitting duplication. Skipping the test
@@ -806,9 +819,16 @@ Post Create subscription - DUPLICATION
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
     ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}		
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}			
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
+	${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	Clear Requests    ${callback_endpoint}
+			
 Post Create subscription - NO-DUPLICATION	
     Log    Trying to create a subscription with an already created content
     Pass Execution If    ${VNFM_DUPLICATION} == 1    VNFM permits duplication. Skipping the test
@@ -817,9 +837,16 @@ Post Create subscription - NO-DUPLICATION
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
     ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}		
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
+	${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	Clear Requests    ${callback_endpoint}
+			
 Get subscriptions
     Log    Get the list of active subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
-- 
GitLab


From 565276cf54a899560c409b2f2e7e4b446c0ed6ff Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Mon, 15 Feb 2021 13:00:52 +0100
Subject: [PATCH 288/322] fix

---
 SOL002/VNFIndicator-API/Subscriptions.robot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SOL002/VNFIndicator-API/Subscriptions.robot b/SOL002/VNFIndicator-API/Subscriptions.robot
index 8642b1d96..ba79c1fdd 100644
--- a/SOL002/VNFIndicator-API/Subscriptions.robot
+++ b/SOL002/VNFIndicator-API/Subscriptions.robot
@@ -150,7 +150,7 @@ POST Create a new Subscription - Unprocessable Entity
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
-    Send Post Request for VNF Indicator Subscription wih unprocessable entity
+    Send Post Request for VNF Indicator Subscription with unprocessable entity
     Check HTTP Response Status Code Is    422
     Check HTTP Response Body Json Schema Is  ProblemDetails
  
-- 
GitLab


From 430db536ce7acbcf90318c2ecf0138fe2a297c6d Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Mon, 15 Feb 2021 13:13:37 +0100
Subject: [PATCH 289/322] fixed issue #154 on SOL003 subscriptions - v2.7.1

---
 .../FaultManagement-APIKeyword.robot          |  42 +-
 .../Subscriptions.robot                       |   3 +
 .../environment/variables.txt                 |   4 +-
 .../VNFIndicatorsKeywords.robot               |  53 ++-
 .../environment/variables.txt                 |   3 -
 .../VNFIndicator-API/jsons/subscriptions.json |   2 +-
 .../SubscriptionKeywords.robot                |   5 -
 .../Subscriptions.robot                       |   6 +-
 .../VnfLcmMntOperationKeywords.robot          |  57 ++-
 .../jsons/lccnSubscriptionRequest.json        |   2 +-
 .../VNFPackageManagementKeywords.robot        |  34 +-
 .../jsons/PkgmSubscription.json               | 414 ------------------
 .../jsons/subscriptions.json                  |   2 +-
 .../Subscriptions.robot                       |   3 +
 .../VRQANOperationKeywords.robot              |  34 +-
 15 files changed, 169 insertions(+), 495 deletions(-)
 delete mode 100644 SOL003/VNFPackageManagement-API/jsons/PkgmSubscription.json

diff --git a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
index 9c1f50f5a..6b9dcd2d7 100644
--- a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
+++ b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
@@ -5,6 +5,7 @@ Library    REST     ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=fal
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 Library    OperatingSystem
+Library    MockServerLibrary
 #Suite Teardown    Terminate All Processes    kill=true
 
 Library    Process
@@ -13,6 +14,11 @@ Library    Process
 ${original_etag}    1234
 
 *** Keywords ***
+Create Sessions
+    Start Process  java  -jar  ${MOCK_SERVER_JAR}  -serverPort  ${callback_port}  alias=mockInstance
+    Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
+    Create Mock Session  ${callback_uri}:${callback_port} 
+    
 Check created Subscription existence
     Set Headers    {"Accept":"${ACCEPT}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
@@ -257,9 +263,15 @@ POST Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
     ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}      callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
-    ${outputResponse}=    Output    response
-    Set Global Variable    ${response}    ${outputResponse}
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
+	${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	Clear Requests    ${callback_endpoint}
     
 Send POST Request for duplicated subscription
     Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
@@ -269,9 +281,15 @@ Send POST Request for duplicated subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
     ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
-    ${outputResponse}=    Output    response
-    Set Global Variable    ${response}    ${outputResponse}
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
+	${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	Clear Requests    ${callback_endpoint}
 
 Send POST Request for duplicated subscription not permitted
     Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
@@ -281,9 +299,15 @@ Send POST Request for duplicated subscription not permitted
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
     ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
-    ${outputResponse}=    Output    response
-    Set Global Variable    ${response}    ${outputResponse}
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
+	${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	Clear Requests    ${callback_endpoint}
 
 GET Subscriptions
     Log    Get the list of active subscriptions
diff --git a/SOL003/VNFFaultManagement-API/Subscriptions.robot b/SOL003/VNFFaultManagement-API/Subscriptions.robot
index 6a98f35f8..f41f45a64 100644
--- a/SOL003/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL003/VNFFaultManagement-API/Subscriptions.robot
@@ -6,6 +6,9 @@ Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=fal
 Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
+Library           Process
+Suite Setup       Create Sessions
+Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Create a new Fault Management alarm subscription
diff --git a/SOL003/VNFFaultManagement-API/environment/variables.txt b/SOL003/VNFFaultManagement-API/environment/variables.txt
index 44740b77a..f8bfd19c3 100644
--- a/SOL003/VNFFaultManagement-API/environment/variables.txt
+++ b/SOL003/VNFFaultManagement-API/environment/variables.txt
@@ -58,4 +58,6 @@ ${callback_endpoint}    /subscribe
 
 ${vnfdIds}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
 
-${callbackResp}    localhost
\ No newline at end of file
+${callbackResp}    localhost
+
+${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
\ No newline at end of file
diff --git a/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot b/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
index 2ad8b478e..eb7e4d107 100644
--- a/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
+++ b/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
@@ -99,21 +99,19 @@ Send Post Request for VNF Indicator Subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${template}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String   ${template}     callback=${callback}    {callback_subscribe}=${callback_subscribe}
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_port=${callback_port}    callback_endpoint=${callback_endpoint}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    Run Keyword If    ${VNFM_CHECKS_NOTIF_ENDPOINT} == 1
-    ...       Check Notification Endpoint
-    # Integer    response status    201
-    # Log    Received 201 Created as expected
-    # ${headers}=    Output    response headers
-    # Should Contain    ${headers}    Location
-    # Log    Response has header Location
-    # ${result}=    Output    response body
-    # Validate Json    VnfIndicatorSubscription.schema.json    ${result}
-    # Log    Validation of VnfIndicatorSubscription OK
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
+	${output}=    Output    response
+	Set Global Variable    ${response}    ${output}
+	Clear Requests    ${callback_endpoint}
+    #Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1    #removed as the check of notif endpoint is done by NFVO while processing subscription reques
+    #...    Check Notification Endpoint 
 
 
 
@@ -122,19 +120,19 @@ Send Post Request for Duplicated VNF indicator Subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
      ${template}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String   ${template}     callback=${callback}    {callback_subscribe}=${callback_subscribe}
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_port=${callback_port}    callback_endpoint=${callback_endpoint}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    # Integer    response status    201
-    # Log    Received 201 Created as expected
-    # ${headers}=    Output    response headers
-    # Should Contain    ${headers}    Location
-    # Log    Response has header Location
-    # ${result}=    Output    response body
-    # Validate Json    VnfIndicatorSubscription.schema.json    ${result}
-    # Log    Validation of VnfIndicatorSubscription OK
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
+	${output}=    Output    response
+	Set Global Variable    ${response}    ${output}
+	Clear Requests    ${callback_endpoint}
+    #Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1    #removed as the check of notif endpoint is done by NFVO while processing subscription reques
+    #...    Check Notification Endpoint 
     
     
 Send Put Request for VNF Indicator Subscriptions
@@ -527,8 +525,7 @@ Check Postcondition Individual VNF Indicator Subscription is Deleted
     GET Individual VNF Indicator Subscription
     Check HTTP Response Status Code Is    404
 
-Create Sessions
-    Pass Execution If    ${VNFM_CHECKS_NOTIF_ENDPOINT} == 0   MockServer not necessary to run    
+Create Sessions   
     Start Process  java  -jar  ${MOCK_SERVER_JAR}    -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
     Create Mock Session  ${callback_uri}:${callback_port}
diff --git a/SOL003/VNFIndicator-API/environment/variables.txt b/SOL003/VNFIndicator-API/environment/variables.txt
index a3d6321d4..f4df749d5 100644
--- a/SOL003/VNFIndicator-API/environment/variables.txt
+++ b/SOL003/VNFIndicator-API/environment/variables.txt
@@ -35,9 +35,6 @@ ${notification_response}    []
 
 ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
 
-${callback}    http://172.22.1.7:${callback_port}
-${callback_subscribe}    /vnfind/subscribes
-
 
 ${subscriptionId}    17563e75-0e14-4bd7-94b4-6bbb869c79aa
 ${erroneousSubscriptionId}    erroneousSubscriptionId
diff --git a/SOL003/VNFIndicator-API/jsons/subscriptions.json b/SOL003/VNFIndicator-API/jsons/subscriptions.json
index d48f9f99d..42d0689a0 100644
--- a/SOL003/VNFIndicator-API/jsons/subscriptions.json
+++ b/SOL003/VNFIndicator-API/jsons/subscriptions.json
@@ -1,3 +1,3 @@
 {{
-	"callbackUri": "{callback}{callback_subscribe}"
+	"callbackUri": "{callback_uri}:{callback_port}{callback_endpoint}"
 }}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/SubscriptionKeywords.robot b/SOL003/VNFLifecycleManagement-API/SubscriptionKeywords.robot
index 835aa876c..cc358f27c 100644
--- a/SOL003/VNFLifecycleManagement-API/SubscriptionKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/SubscriptionKeywords.robot
@@ -20,11 +20,6 @@ Check subscriptions about one VNFInstance and operation type
     Array    response body    minItems=1
     ${body}    Output    response body
     [Return]    ${body}
-  
-Create Sessions
-    Start Process  java  -jar  ${MOCK_SERVER_JAR}  -serverPort  ${callback_port}  alias=mockInstance
-    Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
-    Create Mock Session  ${callback_uri}:${callback_port}
     
 Configure Notification Status Handler
     [Arguments]    ${endpoint}    ${status}=""
diff --git a/SOL003/VNFLifecycleManagement-API/Subscriptions.robot b/SOL003/VNFLifecycleManagement-API/Subscriptions.robot
index f3b210195..a8ee0fba1 100644
--- a/SOL003/VNFLifecycleManagement-API/Subscriptions.robot
+++ b/SOL003/VNFLifecycleManagement-API/Subscriptions.robot
@@ -5,7 +5,9 @@ Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 Resource    VnfLcmMntOperationKeywords.robot
-
+Library           Process
+Suite Setup       Create Sessions
+Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 POST Create a new subscription
@@ -24,7 +26,7 @@ POST Create a new subscription
 Create a new Subscription - DUPLICATION
     [Documentation]    Test ID: 7.3.1.17.2
     ...    Test title: POST Create a new subscription - DUPLICATION
-    ...    Test objective: The objective is to test request to create a duplicate (same cakkbackurl and filter) subscription
+    ...    Test objective: The objective is to test request to create a duplicate (same callbackurl and filter) subscription
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index 018d6dea5..e157cac4b 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -7,11 +7,17 @@ Library    OperatingSystem
 Library    BuiltIn
 Library    JSONLibrary
 Library    Collections
+Library    Process
 Library    JSONSchemaLibrary    schemas/
 Variables    descriptors/SOL001/VNFD/vnfd_SOL001.yaml
 Variables    descriptors/SOL006/VNFD/vnfd_SOL006.yaml
 
 *** Keywords ***
+Create Sessions   
+    Start Process  java  -jar  ${MOCK_SERVER_JAR}    -serverPort  ${callback_port}  alias=mockInstance
+    Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
+    Create Mock Session  ${callback_uri}:${callback_port}
+    
 Get Vnf Instance 
     [Arguments]    ${vnfInstanceId}
     Set Headers    {"Accept":"${ACCEPT}"}  
@@ -1180,10 +1186,19 @@ Post Create subscription
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_notification=${callback_notification}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}				
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
+	${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	Clear Requests    ${callback_endpoint}
+    #Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1    #removed as the check of notif endpoint is done by NFVO while processing subscription reques
+    #...    Check Notification Endpoint 
+    			
 Post Create subscription - DUPLICATION
     Log    Trying to create a subscription with an already created content
     Pass Execution If    ${VNFM_DUPLICATION} == 0    VNFM is not permitting duplication. Skipping the test
@@ -1191,10 +1206,19 @@ Post Create subscription - DUPLICATION
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_notification=${callback_notification}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}		
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}			
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
+	${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	Clear Requests    ${callback_endpoint}
+    #Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1    #removed as the check of notif endpoint is done by NFVO while processing subscription reques
+    #...    Check Notification Endpoint 
+    		
 Post Create subscription - NO-DUPLICATION	
     Log    Trying to create a subscription with an already created content
     Pass Execution If    ${VNFM_DUPLICATION} == 1    VNFM permits duplication. Skipping the test
@@ -1202,10 +1226,19 @@ Post Create subscription - NO-DUPLICATION
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_notification=${callback_notification}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}		
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
+	${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	Clear Requests    ${callback_endpoint}
+    #Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1    #removed as the check of notif endpoint is done by NFVO while processing subscription reques
+    #...    Check Notification Endpoint 
+    	
 Get subscriptions
     Log    Get the list of active subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
diff --git a/SOL003/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json b/SOL003/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json
index 7624e81f2..9ba2f5047 100644
--- a/SOL003/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json
+++ b/SOL003/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json
@@ -6,5 +6,5 @@
       ]
     }}
   }},
-  "callbackUri": "{callback_uri}{callback_notification}"
+  "callbackUri": "{callback_uri}{callback_endpoint}"
 }}
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 523795d9f..1cefa6c91 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -390,24 +390,38 @@ Send Post Request for VNF Package Subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${template}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String   ${template}    callbackUri=${callbackUri} 
+    ${body}=        Format String   ${template}    callback_uri=${callback_uri}    callback_port=${callback_port}    callback_uri=${callback_endpoint} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output} 
-    Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1
-    ...       Check Notification Endpoint
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
+	${output}=    Output    response
+	Set Global Variable    ${response}    ${output}
+	Clear Requests    ${callback_endpoint}
+    #Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1    #removed as the check of notif endpoint is done by NFVO while processing subscription reques
+    #...    Check Notification Endpoint 
 
 Send Post Request for Duplicated VNF Package Subscription
     Log    Trying to create a subscription with an already created content
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${template}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String   ${template}    callbackUri=${callbackUri} 
+    ${body}=        Format String   ${template}    callback_uri=${callback_uri}    callback_port=${callback_port}    callback_uri=${callback_endpoint} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output} 
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
+	${output}=    Output    response
+	Set Global Variable    ${response}    ${output}
+	Clear Requests    ${callback_endpoint}
+    #Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1    #removed as the check of notif endpoint is done by NFVO while processing subscription reques
+    #...    Check Notification Endpoint 
 
 Send Put Request for VNF Package Subscriptions
     Log    Trying to perform a PUT. This method should not be implemented
diff --git a/SOL003/VNFPackageManagement-API/jsons/PkgmSubscription.json b/SOL003/VNFPackageManagement-API/jsons/PkgmSubscription.json
deleted file mode 100644
index c01e92b48..000000000
--- a/SOL003/VNFPackageManagement-API/jsons/PkgmSubscription.json
+++ /dev/null
@@ -1,414 +0,0 @@
-[
-  {
-    "id": "ABCDEFGHIJKL",
-    "callbackUri": "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
-    "_links": {
-      "self": {
-        "href": "ABCDEFGHIJKLMNOPQR"
-      }
-    },
-    "filter": {
-      "notificationTypes": [
-        "VnfPackageChangeNotification"
-      ],
-      "vnfProductsFromProviders": [
-        {
-          "vnfProvider": "ABCDEFGHIJKLMNOPQRSTUVW",
-          "vnfProducts": [
-            {
-              "vnfProductName": "ABCDEFGHIJKLMNOPQRSTUVWX",
-              "versions": [
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNOPQRSTUVWXYZABC",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQ",
-                    "ABCDE"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNOPQRSTUVWXYZA",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZABC"
-                  ]
-                }
-              ]
-            },
-            {
-              "vnfProductName": "ABCDEFGHIJKLM",
-              "versions": [
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMN",
-                  "vnfdVersions": [
-                    "ABCDEF",
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNOPQRSTUVWXYZABC",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNO",
-                    "ABCDEFGH",
-                    "ABCDEF"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCD",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQRSTUVWXY",
-                    "ABCDEFGHIJ",
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZABC"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNOPQRST",
-                  "vnfdVersions": [
-                    "ABCDEFG",
-                    "ABCDEFGHIJKLMNOPQRSTU"
-                  ]
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "vnfProvider": "ABCDEF",
-          "vnfProducts": [
-            {
-              "vnfProductName": "ABCDEFGH",
-              "versions": [
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNOPQRST",
-                  "vnfdVersions": [
-                    "ABCDE",
-                    "ABCDE",
-                    "ABCDEFGHIJKLMNOPQR"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNOPQRSTUVWX",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOP"
-                  ]
-                }
-              ]
-            },
-            {
-              "vnfProductName": "ABCDE",
-              "versions": [
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNO",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZABC"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJ",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQRS"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJK",
-                  "vnfdVersions": [
-                    "ABCD"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCD",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKL",
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZABC"
-                  ]
-                }
-              ]
-            },
-            {
-              "vnfProductName": "ABCD",
-              "versions": [
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNOPQRST",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQ",
-                    "ABCDEFGHIJKL"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNOPQRSTUVWXY",
-                  "vnfdVersions": [
-                    "ABCDEF",
-                    "ABCDEFGHIJKLMNOPQRST"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEF",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZABC",
-                    "ABCDEFGHIJKLMNOPQR",
-                    "ABCDEFGHIJKLMNOP"
-                  ]
-                }
-              ]
-            }
-          ]
-        }
-      ],
-      "vnfdId": [
-        "ABCDEFGHIJKLMNOPQRS",
-        "ABCDEFGHIJKLMNO",
-        "ABCDEFGHIJKLM",
-        "ABCDEFGHIJK"
-      ],
-      "vnfPkgId": [
-        "ABCDEFGH",
-        "ABCDEFGHIJKLMNOPQ",
-        "ABCDE",
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZABC"
-      ],
-      "operationalState": "DISABLED",
-      "usageState": {}
-    }
-  },
-  {
-    "id": "ABCDE",
-    "callbackUri": "ABCDEFGHIJKLM",
-    "_links": {
-      "self": {
-        "href": "ABCDEFGHIJKLMNOPQRSTU"
-      }
-    },
-    "filter": {
-      "notificationTypes": [
-        "VnfPackageOnboardingNotification",
-        "VnfPackageOnboardingNotification",
-        "VnfPackageOnboardingNotification"
-      ],
-      "vnfProductsFromProviders": [
-        {
-          "vnfProvider": "ABCDEFGH",
-          "vnfProducts": [
-            {
-              "vnfProductName": "ABCDEFGHIJKLMNOPQRSTUV",
-              "versions": [
-                {
-                  "vnfSoftwareVersion": "ABCD",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMN",
-                    "ABCDEFGHIJKLMNOPQRSTUVW",
-                    "ABCDE",
-                    "ABCDEFGHIJKLMNOPQRS"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQRS"
-                  ]
-                }
-              ]
-            },
-            {
-              "vnfProductName": "ABCDEFGHIJKLMN",
-              "versions": [
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNOP",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJ",
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZABC",
-                    "ABCDEFGHIJKLMNOPQRSTUVWX",
-                    "ABCDEFGHIJKLMNOPQR"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMN",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNO",
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
-                    "ABCDEFGHIJKLMNOPQRSTUVW"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEF",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLM",
-                    "ABCDE",
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZA"
-                  ]
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "vnfProvider": "ABCDEFGHIJKLMNOPQRSTUVWXYZABC",
-          "vnfProducts": [
-            {
-              "vnfProductName": "ABCDEFGHIJKLMNOPQ",
-              "versions": [
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNOPQRSTUVWXY",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQ",
-                    "ABCDE"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMN",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQRSTUVWX",
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZABC"
-                  ]
-                }
-              ]
-            },
-            {
-              "vnfProductName": "ABCDEFGHIJKLMNOP",
-              "versions": [
-                {
-                  "vnfSoftwareVersion": "ABCD",
-                  "vnfdVersions": [
-                    "ABCDEFGH",
-                    "ABCDEFGHIJKLMN",
-                    "ABCDEFGHIJKLMNOP"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLM",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLM",
-                    "ABCDEFGH"
-                  ]
-                }
-              ]
-            }
-          ]
-        }
-      ],
-      "vnfdId": [
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZABC",
-        "ABCDEFGHIJKLM",
-        "ABCDEFGHIJKLMNOPQRS",
-        "ABCDEFGHIJKL"
-      ],
-      "vnfPkgId": [
-        "ABCDEFGHIJKLMNOPQRSTUVWXY"
-      ],
-      "operationalState": "DISABLED",
-      "usageState": {}
-    }
-  },
-  {
-    "id": "ABCDEF",
-    "callbackUri": "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
-    "_links": {
-      "self": {
-        "href": "ABCDEFGHIJKLMNOPQ"
-      }
-    },
-    "filter": {
-      "notificationTypes": [
-        "VnfPackageChangeNotification",
-        "VnfPackageOnboardingNotification",
-        "VnfPackageChangeNotification",
-        "VnfPackageOnboardingNotification"
-      ],
-      "vnfProductsFromProviders": [
-        {
-          "vnfProvider": "ABCDEFGHIJKL",
-          "vnfProducts": [
-            {
-              "vnfProductName": "ABCDEFGHIJK",
-              "versions": [
-                {
-                  "vnfSoftwareVersion": "ABCDE",
-                  "vnfdVersions": [
-                    "ABCDEFGHI",
-                    "ABCDEFGHIJKLMNOPQRS",
-                    "ABCDEFGHIJKLMNOPQR"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNOPQRSTUVWX",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQRSTUVWX",
-                    "ABCDEFG",
-                    "ABCDEFGHIJKLMNOPQRSTUVW",
-                    "ABCDEFGHIJKLMNOPQRSTUVWXY"
-                  ]
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "vnfProvider": "ABCDEFGHI",
-          "vnfProducts": [
-            {
-              "vnfProductName": "ABCDEFGHIJ",
-              "versions": [
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKL",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZA",
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZABC",
-                    "ABCDEFGHIJKL",
-                    "ABCDEFGHIJKLMNOPQR"
-                  ]
-                },
-                {
-                  "vnfSoftwareVersion": "ABCDEFGHIJKLMNOPQ",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZABC",
-                    "ABCDEFGHIJKLMNOPQRSTU",
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZABC",
-                    "ABCDEFGHIJKLMN"
-                  ]
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "vnfProvider": "ABCDEFGHIJKLMNOPQRSTUVWXYZA",
-          "vnfProducts": [
-            {
-              "vnfProductName": "ABCDEFGH",
-              "versions": [
-                {
-                  "vnfSoftwareVersion": "ABCDE",
-                  "vnfdVersions": [
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZABC",
-                    "ABCDEFGHIJKLMNOPQRS",
-                    "ABCDEFGHIJKLMNOPQRST"
-                  ]
-                }
-              ]
-            }
-          ]
-        }
-      ],
-      "vnfdId": [
-        "ABCDEFGHIJKLMNOP",
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZA"
-      ],
-      "vnfPkgId": [
-        "ABCDEFGHIJKLMNOPQRSTUVW",
-        "ABCDEFGHIJKLMNOPQ",
-        "ABCDEFGHIJKLMN"
-      ],
-      "operationalState": "ENABLED",
-      "usageState": [
-        773,
-        [
-          {},
-          [
-            false,
-            true
-          ],
-          null,
-          null
-        ]
-      ]
-    }
-  }
-]
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/jsons/subscriptions.json b/SOL003/VNFPackageManagement-API/jsons/subscriptions.json
index 35c8671eb..42d0689a0 100644
--- a/SOL003/VNFPackageManagement-API/jsons/subscriptions.json
+++ b/SOL003/VNFPackageManagement-API/jsons/subscriptions.json
@@ -1,3 +1,3 @@
 {{
-	"callbackUri": "{callbackUri}"
+	"callbackUri": "{callback_uri}:{callback_port}{callback_endpoint}"
 }}
\ No newline at end of file
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/Subscriptions.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/Subscriptions.robot
index 1b7cfe68a..30d90c4f9 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/Subscriptions.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/Subscriptions.robot
@@ -5,6 +5,9 @@ Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=fal
 Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
+Library           Process
+Suite Setup       Create Sessions
+Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Create new Virtualised Resources Quota Available Notification subscription
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot
index b8944baf7..8ba214350 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot
@@ -96,9 +96,15 @@ Send Post request for new Virtualised Resources Quota Available Notification sub
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/vrQuotaAvailSubscriptionRequest.json
     ${body}=        Format String   ${template}    callback_uri=${callback_uri}:${callback_port}    callback_subscribe=${callback_subscribe}
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
-    ${outputResponse}=    Output    response 
-    Set Global Variable    ${response}    ${outputResponse}
+	${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	Clear Requests    ${callback_endpoint}
     
 Send Post request for new Virtualised Resources Quota Available Notification subscription - DUPLICATION
     Log    Trying to create a subscription with an already created content
@@ -108,9 +114,15 @@ Send Post request for new Virtualised Resources Quota Available Notification sub
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/vrQuotaAvailSubscriptionRequest.json
     ${body}=        Format String   ${template}    callback_uri=${callback_uri}:${callback_port}    callback_subscribe=${callback_subscribe}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
-    ${outputResponse}=    Output    response 
-    Set Global Variable    ${response}    ${outputResponse}
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
+	${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	Clear Requests    ${callback_endpoint}
     
 Send Post request for new Virtualised Resources Quota Available Notification subscription - NO-DUPLICATION
     Log    Trying to create a subscription with an already created content
@@ -120,9 +132,15 @@ Send Post request for new Virtualised Resources Quota Available Notification sub
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/vrQuotaAvailSubscriptionRequest.json
     ${body}=        Format String   ${template}    callback_uri=${callback_uri}:${callback_port}    callback_subscribe=${callback_subscribe}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
-    ${outputResponse}=    Output    response 
-    Set Global Variable    ${response}    ${outputResponse}
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
+	${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	Clear Requests    ${callback_endpoint}
     
 GET Virtualised Resources Quota Available Notification Subscriptions
     Log    Get the list of active subscriptions
-- 
GitLab


From 3702fe41d096e0100d9a07677f203dce4b41ffa6 Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Thu, 18 Feb 2021 13:21:59 +0100
Subject: [PATCH 290/322] Tentative fix on issue #157 and fix on issue #158

---
 .../VNFPackageManagementKeywords.robot                    | 4 ++--
 SOL003/VNFPackageManagement-API/environment/variables.txt | 8 +++-----
 .../VNFPackageManagementKeywords.robot                    | 4 ++--
 SOL005/VNFPackageManagement-API/environment/variables.txt | 7 +++----
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 1cefa6c91..840a44dce 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -286,13 +286,13 @@ GET Individual VNF Package Content with explicit Range Request
 Check HTTP Response Header Content-Range Is Present and Matches the requested range
     Log    Check Content-Range HTTP Header
     Should Contain    ${response['headers']}    Content-Range
-    Should Be Equal As Strings    ${response['headers']['Content-Range']}    ${range}/${full_size}
+    Should Be Equal As Strings    ${response['headers']['Content-Range']}    ${range}/${full_length}
     Log    Header Content-Range is present
     
 Check HTTP Response Header Content-Length Is Present and Matches the requested range length
     Log    Check Content-Length HTTP Header
     Should Contain    ${response['headers']}    Content-Length
-    Should Be Equal As Integers    ${response['headers']['Content-Length']}    ${length}
+    Should Be Equal As Integers    ${response['headers']['Content-Length']}    ${full_length}
     Log    Header Content-Length is present
 
 GET Individual VNF Package Content with invalid Range Request
diff --git a/SOL003/VNFPackageManagement-API/environment/variables.txt b/SOL003/VNFPackageManagement-API/environment/variables.txt
index 85599df9d..fc848f24a 100644
--- a/SOL003/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL003/VNFPackageManagement-API/environment/variables.txt
@@ -73,16 +73,14 @@ ${vndIdZipVnfd}       f5b220d4-6177-4ebb-a554-a43311e16075
 ${artifactPath}    artifactPath
 ${CONTENT_TYPE_OCTET}    application/octet-stream
 ${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
-${range}          bytes=0-1023
-${full_size}        2000            # Size of the requested artifact to be downloaded via partial downloads
-${erroneousRange}    bytes=10000000-1000000000    # Requesting a out of range number of bytes
+${range}          bytes 0-1023
+${full_length}        2000            # Size of the requested artifact to be downloaded via partial downloads
+${erroneousRange}    bytes 10000000-1000000000    # Requesting a out of range number of bytes
 ${vnfPackageOctetStreamId}    octetStreamPkgId
 ${vnfdOctetStreamId}    octetStreamVnfdId
 ${vndEncryptedArtifactID}    encryptedId
 
 
-${length}          1024
-
 ${POS_FILTER}     vnfdId=41fdd38a-3d4c-465c-83e0-f80e014425f8 ,vnfProvider=NXW    # Positive case, suing compiant fields name for filtering get request
 ${NEG_FILTER}     nfvId=41fdd38a-3d4c-465c-83e0-f80e014425f8    # Negative case, using wrong name of field
 ${fields}         softwareImages,additionalArtifacts
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 2c13b7c5b..b3b02cccf 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -471,13 +471,13 @@ GET Individual VNF Package Content with explicit Range Request
 Check HTTP Response Header Content-Range Is Present and Matches the requested range
     Log    Check Content-Range HTTP Header
     Should Contain    ${response['headers']}    Content-Range
-    Should Be Equal As Strings    ${response['headers']['Content-Range']}    ${range}/${full_size}
+    Should Be Equal As Strings    ${response['headers']['Content-Range']}    ${range}/${full_length}
     Log    Header Content-Range is present
     
 Check HTTP Response Header Content-Length Is Present and Matches the requested range length
     Log    Check Content-Length HTTP Header
     Should Contain    ${response['headers']}    Content-Length
-    Should Be Equal As Integers    ${response['headers']['Content-Length']}    ${length}
+    Should Be Equal As Integers    ${response['headers']['Content-Length']}    ${full_length}
     Log    Header Content-Length is present
 
 GET Individual VNF Package Content with invalid Range Request
diff --git a/SOL005/VNFPackageManagement-API/environment/variables.txt b/SOL005/VNFPackageManagement-API/environment/variables.txt
index 8846ff677..745b7c889 100644
--- a/SOL005/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFPackageManagement-API/environment/variables.txt
@@ -66,12 +66,11 @@ ${onboardingStateVnfPkgId}    788106a2-d692-44f3-a86d-384f0ce35e42    # The VNF
 ${artifactPath}    artifactPath
 ${CONTENT_TYPE_OCTET}    application/octet-stream
 ${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
-${range}          bytes=0-1023
-${full_size}        2000            # Size of the requested artifact to be downloaded via partial downloads 
-${erroneousRange}    bytes=10000000-1000000000    # Requesting a out of range number of bytes
+${range}          bytes 0-1023
+${full_length}        2000            # Size of the requested artifact to be downloaded via partial downloads 
+${erroneousRange}    bytes 10000000-1000000000    # Requesting a out of range number of bytes
 ${vnfPackageOctetStreamId}    octetStreamPkgId
 ${vnfPkgId}       788106a2-d692-44f3-a86d-384f0ce35e42
-${length}          1024
 ${creatingVnfPackageId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
 ${newVnfPackageId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
 
-- 
GitLab


From a411d4639efc1c17ee1b40d93bc6ea5c3573d53e Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Thu, 18 Feb 2021 15:46:06 +0100
Subject: [PATCH 291/322] Fix issue #155

---
 SOL002/VNFIndicator-API/Subscriptions.robot               | 6 +++---
 SOL002/VNFIndicator-API/VNFIndicators.robot               | 6 +++---
 .../VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot   | 2 +-
 SOL002/VNFIndicator-API/environment/variables.txt         | 4 ++--
 SOL002/VNFPerformanceManagement-API/PMJobs.robot          | 2 +-
 SOL002/VNFPerformanceManagement-API/Thresholds.robot      | 2 +-
 .../environment/variables.txt                             | 2 +-
 SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot       | 6 +++---
 SOL003/VNFIndicator-API/environment/variables.txt         | 4 ++--
 .../VNFPackageManagementKeywords.robot                    | 8 ++++----
 SOL003/VNFPackageManagement-API/environment/variables.txt | 4 ++--
 SOL003/VNFPerformanceManagement-API/PMJobs.robot          | 2 +-
 .../environment/variables.txt                             | 2 +-
 SOL005/NSDManagement-API/NSDManagementKeywords.robot      | 6 +++---
 SOL005/NSDManagement-API/environment/variables.txt        | 2 +-
 .../NSPerformanceManagementKeywords.robot                 | 2 +-
 .../NSPerformanceManagement-API/environment/variables.txt | 2 +-
 .../VNFPackageManagementKeywords.robot                    | 8 ++++----
 SOL005/VNFPackageManagement-API/environment/variables.txt | 4 ++--
 19 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/SOL002/VNFIndicator-API/Subscriptions.robot b/SOL002/VNFIndicator-API/Subscriptions.robot
index ba79c1fdd..a1c846577 100644
--- a/SOL002/VNFIndicator-API/Subscriptions.robot
+++ b/SOL002/VNFIndicator-API/Subscriptions.robot
@@ -305,7 +305,7 @@ Check Postcondition VNF Indicator Subscription Is Set
     
 Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filter
     Log    Check Response includes VNF Indicators according to filter
-    @{words} =  Split String    ${POS_FILTER}       ,${SEPERATOR} 
+    @{words} =  Split String    ${POS_FILTER}       ${SEPARATOR} 
     Should Be Equal As Strings    ${response['body'][0]['callbackUri']}    @{words}[1]
     
 Create Sessions 
@@ -331,7 +331,7 @@ Post Create subscription - DUPLICATION
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String    ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
+    ${body}=        Format String    ${body}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Log  Creating mock request and response to handle GET operation on notification endpoint
     &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
     &{notification_response}=  Create Mock Response	status_code=204
@@ -351,7 +351,7 @@ Post Create subscription - NO-DUPLICATION
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String    ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
+    ${body}=        Format String    ${body}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Log  Creating mock request and response to handle GET operation on notification endpoint
     &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
     &{notification_response}=  Create Mock Response	status_code=204
diff --git a/SOL002/VNFIndicator-API/VNFIndicators.robot b/SOL002/VNFIndicator-API/VNFIndicators.robot
index a0db14482..ad6536a22 100644
--- a/SOL002/VNFIndicator-API/VNFIndicators.robot
+++ b/SOL002/VNFIndicator-API/VNFIndicators.robot
@@ -293,9 +293,9 @@ Check HTTP Response Body Json Schema Is
     
 Check HTTP Response Body vnfIndicators Matches the requested attribute-based filter
     Log    Check Response includes VNF Indicators according to filter
-    @{attr} =  Split String    ${POS_FILTER}       ,${VAR_SEPERATOR} 
-    @{var_name} =    Split String    @{attr}[0]       ,${SEPERATOR}
-    @{var_id} =    Split String    @{attr}[1]       ,${SEPERATOR}
+    @{attr} =  Split String    ${POS_FILTER}       ${VAR_SEPARATOR} 
+    @{var_name} =    Split String    @{attr}[0]       ${SEPARATOR}
+    @{var_id} =    Split String    @{attr}[1]       ${SEPARATOR}
     Should Be True     "${response['body'][0]['name']}"=="@{var_name}[1]" and "${response['body'][0]['vnfInstanceId']}"=="@{var_id}[1]"
 
 Check HTTP Response Header Contain Link
diff --git a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
index eb01deded..cee2b50d9 100644
--- a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
+++ b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
@@ -225,7 +225,7 @@ Check HTTP Response Body Includes Requested VNF Instance ID
     
 Check HTTP Response Body Matches Attribute-Based Filter
     Log    Check Response includes VNF Indicators according to filter
-    @{words} =  Split String    ${POS_FIELDS}       ,${SEPERATOR} 
+    @{words} =  Split String    ${POS_FIELDS}       ${SEPARATOR} 
     Should Be Equal As Strings    ${response['body'][0]['name']}    @{words}[1]
     
 Check HTTP Response Header Contain Link
diff --git a/SOL002/VNFIndicator-API/environment/variables.txt b/SOL002/VNFIndicator-API/environment/variables.txt
index b3efe3d90..82627dcab 100644
--- a/SOL002/VNFIndicator-API/environment/variables.txt
+++ b/SOL002/VNFIndicator-API/environment/variables.txt
@@ -41,7 +41,7 @@ ${POS_FILTER}     callbackUri=http://127.0.0.1/subscribe
 ${NEG_FILTER}     callback=http://127.0.0.1/subscribe
 ${total_polling_time}   2 min
 ${polling_interval}     10 sec
-${SEPERATOR}      =
+${SEPARATOR}      =
 
 ${erroneousVnfInstanceId}    erroneousVnfInstanceId
 ${POS_FIELDS}     name=vnfIndicator
@@ -49,6 +49,6 @@ ${NEG_FIELDS}     wrongName=any_value
 
 
 ${vnfIndicators}  =     
-${VAR_SEPERATOR}    &
+${VAR_SEPARATOR}    &
 
 ${callbackResp}    localhost
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/PMJobs.robot b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
index 8da793e3a..4c976169a 100644
--- a/SOL002/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
@@ -365,7 +365,7 @@ Check HTTP Response Body Matches all_fields selector
     
 Check HTTP Response Body Matches filter
     Log    Checking that attribute-based filter is matched
-    @{words} =  Split String    ${POS_FILTER}       ,${SEPERATOR} 
+    @{words} =  Split String    ${POS_FILTER}       ${SEPARATOR} 
     Should Be Equal As Strings    ${response['body'][0]['objectInstanceIds']}    @{words}[1]
     
 Check HTTP Response Status Code Is
diff --git a/SOL002/VNFPerformanceManagement-API/Thresholds.robot b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
index d02e7c625..474f02002 100644
--- a/SOL002/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
@@ -218,7 +218,7 @@ Check Postcondition Threshold Exists
         
 Check HTTP Response Body Thresholds match the requested attribute-based filter
     Log    Checking that attribute-based filter is matched
-    @{words} =  Split String    ${FILTER_OK}       ,${SEPERATOR} 
+    @{words} =  Split String    ${FILTER_OK}       ${SEPARATOR} 
     Should Be Equal As Strings    ${response['body'][0]['objectInstanceId']}    @{words}[1]
     
 Check HTTP Response Status Code Is
diff --git a/SOL002/VNFPerformanceManagement-API/environment/variables.txt b/SOL002/VNFPerformanceManagement-API/environment/variables.txt
index f06af76c5..c71b69f32 100644
--- a/SOL002/VNFPerformanceManagement-API/environment/variables.txt
+++ b/SOL002/VNFPerformanceManagement-API/environment/variables.txt
@@ -44,7 +44,7 @@ ${newThresholdId}    newThresholdId
 ${POS_FILTER}     objectInstanceIds=${objectInstanceIds}
 ${NEG_FILTER}     criteriaPmJob=erroneousAttributeName
 ${fields}         criteria,reports
-${SEPERATOR}      =
+${SEPARATOR}      =
 
 ${reportId}       0fb4c875-e07f-46ca-a9dd-13907667a568
 ${erroneousReportId}    erroneousReportId
diff --git a/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot b/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
index eb7e4d107..7c6cbd5ec 100644
--- a/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
+++ b/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
@@ -325,9 +325,9 @@ Check Postcondition VNF Indicators Exist
     
 Check HTTP Response Body vnfIndicators Matches the requested attribute-based filter
     Log    Check Response includes VNF Indicators according to filter
-    @{attr} =  Split String    ${POS_FIELDS}       ,${VAR_SEPERATOR} 
-    @{var_name} =    Split String    @{attr}[0]       ,${SEPERATOR}
-    @{var_id} =    Split String    @{attr}[1]       ,${SEPERATOR}
+    @{attr} =  Split String    ${POS_FIELDS}       ${VAR_SEPARATOR} 
+    @{var_name} =    Split String    @{attr}[0]       ${SEPARATOR}
+    @{var_id} =    Split String    @{attr}[1]       ${SEPARATOR}
     Should Be True     "${response['body'][0]['name']}"=="@{var_name}[1]" and "${response['body'][0]['vnfInstanceId']}"=="@{var_id}[1]"
     
 Get all indicators for a VNF instance
diff --git a/SOL003/VNFIndicator-API/environment/variables.txt b/SOL003/VNFIndicator-API/environment/variables.txt
index f4df749d5..86318fb44 100644
--- a/SOL003/VNFIndicator-API/environment/variables.txt
+++ b/SOL003/VNFIndicator-API/environment/variables.txt
@@ -57,7 +57,7 @@ ${POS_FIELDS}     name=vnfIndicator
 ${NEG_FIELDS}     wrongName=any_value
 
 
-${SEPERATOR}      =
-${VAR_SEPERATOR}    &
+${SEPARATOR}      =
+${VAR_SEPARATOR}    &
 
 ${callbackResp}    localhost
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 840a44dce..6d577205c 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -49,9 +49,9 @@ GET VNF Packages with attribute-based filter
 
 Check HTTP Response Body VnfPkgsInfo Matches the requested Attribute-Based Filter
     Log    Checking that attribute-based filter is matched
-    @{attr} =    Split String    ${POS_FILTER}       ,${VAR_SEPERATOR} 
-    @{var_id} =    Split String    @{attr}[0]       ,${SEPERATOR}
-    @{var_provider} =    Split String    @{attr}[1]       ,${SEPERATOR}
+    @{attr} =    Split String    ${POS_FILTER}       ${VAR_SEPARATOR} 
+    @{var_id} =    Split String    @{attr}[0]       ${SEPARATOR}
+    @{var_provider} =    Split String    @{attr}[1]       ${SEPARATOR}
     Should Be True     "${response['body'][0]['vnfdId']}"=="@{var_id}[1]" and "${response['body'][0]['vnfProvider']}"=="@{var_provider}[1]"
 
 GET VNF Packages with invalid attribute-based filter
@@ -643,7 +643,7 @@ Check HTTP Response Body Is Empty
 
 Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filter
     Log    Check Response includes VNF Package Management according to filter
-    @{words} =  Split String    ${filter_ok}       ,${SEPERATOR} 
+    @{words} =  Split String    ${filter_ok}       ${SEPARATOR} 
     Should Be Equal As Strings    ${response['body'][0]['callbackUri']}    @{words}[1]
 
 Check HTTP Response Body PkgmSubscription Attributes Values Match the Issued Subscription
diff --git a/SOL003/VNFPackageManagement-API/environment/variables.txt b/SOL003/VNFPackageManagement-API/environment/variables.txt
index fc848f24a..480f3c558 100644
--- a/SOL003/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL003/VNFPackageManagement-API/environment/variables.txt
@@ -57,7 +57,7 @@ ${erroneousVnfdId}    erroneousVnfdId
 
 ${filter_ok}      callbackUri=http://172.22.1.7:9091/vnfpkgm/subscriptions
 ${filter_ko}      nfvId=f9f130e4-05eb-4082-a676-4c97d13a883d    # Not existant filter attribute-based
-${SEPERATOR}      =
+${SEPARATOR}      =
 
 
 ${ACCEPT_PLAIN}    text/plain
@@ -84,7 +84,7 @@ ${vndEncryptedArtifactID}    encryptedId
 ${POS_FILTER}     vnfdId=41fdd38a-3d4c-465c-83e0-f80e014425f8 ,vnfProvider=NXW    # Positive case, suing compiant fields name for filtering get request
 ${NEG_FILTER}     nfvId=41fdd38a-3d4c-465c-83e0-f80e014425f8    # Negative case, using wrong name of field
 ${fields}         softwareImages,additionalArtifacts
-${VAR_SEPERATOR}    &
+${VAR_SEPARATOR}    &
 
 ${callbackResp}    localhost
 
diff --git a/SOL003/VNFPerformanceManagement-API/PMJobs.robot b/SOL003/VNFPerformanceManagement-API/PMJobs.robot
index be4b8957f..15f98c68b 100644
--- a/SOL003/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL003/VNFPerformanceManagement-API/PMJobs.robot
@@ -374,7 +374,7 @@ Check HTTP Response Body PmJobs Matches the requested all_fields selector
     
 Check HTTP Response Body PmJobs Matches the requested Attribute-Based Filter 
     Log    Checking that attribute-based filter is matched
-    @{words} =  Split String    ${POS_FILTER}       ,${SEPERATOR} 
+    @{words} =  Split String    ${POS_FILTER}       ${SEPARATOR} 
     Should Be Equal As Strings    ${response['body'][0]['objectInstanceIds']}    @{words}[1]
 
 Check HTTP Response Body Does Not Contain reports
diff --git a/SOL003/VNFPerformanceManagement-API/environment/variables.txt b/SOL003/VNFPerformanceManagement-API/environment/variables.txt
index 3b1c0b844..84c9f84d4 100644
--- a/SOL003/VNFPerformanceManagement-API/environment/variables.txt
+++ b/SOL003/VNFPerformanceManagement-API/environment/variables.txt
@@ -56,7 +56,7 @@ ${notification_response}    []
 ${POS_FILTER}     objectInstanceIds=${objectInstanceIds}
 ${NEG_FILTER}     criteriaPmJob=erroneousAttributeName
 ${fields}         criteria,objectInstanceIds        
-${SEPERATOR}      =
+${SEPARATOR}      =
 
 
 ${reportId}       0fb4c875-e07f-46ca-a9dd-13907667a568
diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index c5fd69b64..3c5eea772 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -32,7 +32,7 @@ GET Network Service Descriptors Information with attribute-based filter
     
 Check HTTP Response Body NsdInfos Matches the requested attribute-based filter
     Log    Checking that attribute-based filter is matched
-    @{words} =    Split String    ${NSD_NAME}       ,${SEPERATOR} 
+    @{words} =    Split String    ${NSD_NAME}       ${SEPARATOR} 
     Should Be Equal As Strings    ${response['body'][0]['nsdName']}    @{words}[1]
 
 GET Network Service Descriptors Information with invalid attribute-based filter
@@ -453,7 +453,7 @@ GET PNF Descriptors Information with attribute-based filter
     
 Check HTTP Response Body PnfdInfos Matches the requested attribute-based filter
     Log    Checking that attribute-based filter is matched
-    @{words} =    Split String    ${PNFD_NAME}       ,${SEPERATOR} 
+    @{words} =    Split String    ${PNFD_NAME}       ${SEPARATOR} 
     Should Be Equal As Strings    ${response['body'][0]['pnfdName']}    @{words}[1]
 
 GET PNF Descriptors Information with invalid attribute-based filter
@@ -878,7 +878,7 @@ Check HTTP Response Body Is Empty
     
 Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filter
     Log    Check Response includes NSD Management Management according to filter
-    @{words} =  Split String    ${filter_ok}       ,${SEPERATOR} 
+    @{words} =  Split String    ${filter_ok}       ${SEPARATOR} 
     Should Be Equal As Strings    ${response['body'][0]['callbackUri']}    @{words}[1]
 
 Check HTTP Response Body NsdmSubscription Attributes Values Match the Issued Subscription
diff --git a/SOL005/NSDManagement-API/environment/variables.txt b/SOL005/NSDManagement-API/environment/variables.txt
index 71dfea8be..38f419fdb 100644
--- a/SOL005/NSDManagement-API/environment/variables.txt
+++ b/SOL005/NSDManagement-API/environment/variables.txt
@@ -76,7 +76,7 @@ ${length}          1024
 ${createdNsdInfoId}    f27200b1-1d8b-48c2-9d98-a993b8ab117f
 ${NSD_NAME}     nsdName=onBoardedNSD
 ${PNFD_NAME}     pnfdName=onBoardedPNFD
-${SEPERATOR}      =
+${SEPARATOR}      =
 
 
 ${pnfdInfoId}    40853bda-8a8f-4f63-9130-cef439f65348
diff --git a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
index d1cef9426..e5d045cc9 100644
--- a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
+++ b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
@@ -402,7 +402,7 @@ Check Postcondition Threshold Exists
         
 Check HTTP Response Body Thresholds match the requested attribute-based filter
     Log    Checking that attribute-based filter is matched
-    @{words} =    Split String    ${FILTER_OK_Threshold}       ,${SEPERATOR} 
+    @{words} =    Split String    ${FILTER_OK_Threshold}       ${SEPARATOR} 
     Should Be Equal As Strings    ${response['body'][0]['objectInstanceId']}    @{words}[1]
     
 
diff --git a/SOL005/NSPerformanceManagement-API/environment/variables.txt b/SOL005/NSPerformanceManagement-API/environment/variables.txt
index 46ef3afbb..1f6e3dfad 100644
--- a/SOL005/NSPerformanceManagement-API/environment/variables.txt
+++ b/SOL005/NSPerformanceManagement-API/environment/variables.txt
@@ -63,6 +63,6 @@ ${newReportId}    newReportId
 
 ${FILTER_OK_Threshold}      objectInstanceId=1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
 ${FILTER_KO}      criterias=erroneousFilter
-${SEPERATOR}      =
+${SEPARATOR}      =
 
 ${callbackResp}    127.0.0.1
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index b3b02cccf..092b4a399 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -56,9 +56,9 @@ GET VNF Packages with attribute-based filter
 
 Check HTTP Response Body VnfPkgsInfo Matches the requested Attribute-Based Filter
     Log    Checking that attribute-based filter is matched
-    @{attr} =    Split String    ${POS_FILTER}       ,${VAR_SEPERATOR} 
-    @{var_id} =    Split String    @{attr}[0]       ,${SEPERATOR}
-    @{var_provider} =    Split String    @{attr}[1]       ,${SEPERATOR}
+    @{attr} =    Split String    ${POS_FILTER}       ${VAR_SEPARATOR} 
+    @{var_id} =    Split String    @{attr}[0]       ${SEPARATOR}
+    @{var_provider} =    Split String    @{attr}[1]       ${SEPARATOR}
     Should Be True     "${response['body'][0]['vnfdId']}"=="@{var_id}[1]" and "${response['body'][0]['vnfProvider']}"=="@{var_provider}[1]"
     
 GET VNF Packages with invalid attribute-based filter
@@ -926,7 +926,7 @@ Check HTTP Response Body Json Schema Is
     
 Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filter
     Log    Check Response includes VNF Package Management according to filter
-    @{words} =  Split String    ${filter_ok}       ,${SEPERATOR} 
+    @{words} =  Split String    ${filter_ok}       ${SEPARATOR} 
     Should Be Equal As Strings    ${response['body'][0]['callbackUri']}    @{words}[1]
 
 Check HTTP Response Body Subscription Identifier matches the requested Subscription
diff --git a/SOL005/VNFPackageManagement-API/environment/variables.txt b/SOL005/VNFPackageManagement-API/environment/variables.txt
index 745b7c889..72323bfe6 100644
--- a/SOL005/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFPackageManagement-API/environment/variables.txt
@@ -43,7 +43,7 @@ ${origResponse}    httpresponse
 
 ${filter_ok}      callbackUri=http://172.22.1.7:9091/vnfpkgm/subscriptions
 ${filter_ko}      nfvId=f9f130e4-05eb-4082-a676-4c97d13a883d    # Not existant filter attribute-based
-${SEPERATOR}      =
+${SEPARATOR}      =
 
 ${erroneousVnfPackageId}    erroneousVnfPackageId    # Given ID for vnfPkg not present in database
 ${disabledVnfPackageId}    87a2c9d3-00ea-4032-8c67-a5106d001868
@@ -79,7 +79,7 @@ ${NEG_FILTER}     nfvId=41fdd38a-3d4c-465c-83e0-f80e014425f8    # Negative case,
 ${CAN_FILTER}     1    # NFVO in able to use filters when retrieving VNF Packages
 ${fields}         softwareImages,additionalArtifacts
 ${BAD_AUTHORIZATION_TOKEN}    Bear sometoken
-${VAR_SEPERATOR}    &
+${VAR_SEPARATOR}    &
 
 ${vnfPkgViaUriId}       788106a2-d692-44f3-a86d-384f0ce35e42
 ${creatingVnfPkgViaUriId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
-- 
GitLab


From 1977524f61721871376c893123395a39b2608907 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Fri, 19 Feb 2021 17:23:57 +0100
Subject: [PATCH 292/322] fixed issue #156 on v2.7.1

---
 .../CreateNSInstanceWorkflow.robot            |  9 ++-
 .../DeleteNSInstanceWorkflow.robot            |  7 ++-
 .../HealNSTaskWorkflow.robot                  |  5 +-
 ....robot => InstantiateNSTaskWorkflow.robot} |  8 +--
 .../NSLCMOperationKeywords.robot              | 63 +++++++++++++++----
 .../ScaleNSTaskWorkflow.robot                 |  8 +--
 .../TerminateNSTaskWorkflow.robot             |  9 +--
 .../UpdateNSTaskWorkflow.robot                |  8 +--
 indexes/sol_005_index.csv                     |  2 +-
 9 files changed, 85 insertions(+), 34 deletions(-)
 rename SOL005/NSLifecycleManagement-API/{InstanciateNSTaskWorkflow.robot => InstantiateNSTaskWorkflow.robot} (84%)

diff --git a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
index a1dda903c..9ae07218f 100644
--- a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
@@ -5,6 +5,9 @@ Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=fal
 Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
+Library    Process
+Suite Setup       Initialize System
+Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 NS Instance Creation
@@ -15,11 +18,13 @@ NS Instance Creation
     ...    Reference: Clause 6.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS lifecycle management operation occurrence is in NOT_ISTANTIATED state
+    ...    Post-Conditions: The NS resource is in NOT_ISTANTIATED state
     POST New nsInstance
     Check HTTP Response Status Code Is    201
     Check HTTP Response Header Contains    Location
     Check HTTP Response Body Json Schema Is    NsInstance
+    Check Notification Http POST Request Body Json Schema Is    NsIdentifierCreationNotification
+    Check Notification Http POST Request Body notificationType attribute Is    NsIdentifierCreationNotification
     Check resource not_instantiated
     
 NS Instance Creation with DISABLED Network Service Descriptor
@@ -27,7 +32,7 @@ NS Instance Creation with DISABLED Network Service Descriptor
     ...    Test title: NS Instance Creation with DISABLED Network Service Descriptor
     ...    Test objective: The objective is to test the workflow for Creating a NS instance with a disabled NSD
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in disabled operational state.
-    ...    Reference: Clauses 6.4.2.3.1 and 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Reference: Clauses 6.4.2.3.1 and 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot b/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
index 697c949f2..f700f388f 100644
--- a/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
@@ -5,6 +5,10 @@ Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=fal
 Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
+Library    Process
+Suite Setup       Initialize System
+Suite Teardown    Terminate All Processes    kill=true
+
 
 *** Test Cases ***
 NS Instance Deletion
@@ -16,7 +20,8 @@ NS Instance Deletion
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: NS Instance resource is deleted
-    Check resource not_instantiated
     DELETE IndividualNSInstance
     Check HTTP Response Status Code Is    204
+    Check Notification Http POST Request Body Json Schema Is    NsIdentifierDeletionNotification
+    Check Notification Http POST Request Body notificationType attribute Is    NsIdentifierDeletionNotification
     Check Postcondition NS instance is deleted
diff --git a/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot
index 7ee91bf85..4ab717c41 100644
--- a/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot
@@ -5,6 +5,7 @@ Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=fal
 Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
+Library    Process
 Suite Setup       Initialize System
 Suite Teardown    Terminate All Processes    kill=true
 
@@ -17,10 +18,10 @@ Heal Flow of NS lifecycle management operations
     ...    Reference: Clause 6.4.7 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: NS Instance still in INSTANTIATED state
-    Check resource instantiated
+    ...    Post-Conditions: The NS Instance is still in INSTANTIATED state
     POST Heal NSInstance
     Check HTTP Response Status Code Is    202
+    Check HTTP Response Header Contains    Location
     Check Operation Occurrence Id
     Check Operation Notification Status is    START
     Check Operation Notification Status is    RESULT
diff --git a/SOL005/NSLifecycleManagement-API/InstanciateNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/InstantiateNSTaskWorkflow.robot
similarity index 84%
rename from SOL005/NSLifecycleManagement-API/InstanciateNSTaskWorkflow.robot
rename to SOL005/NSLifecycleManagement-API/InstantiateNSTaskWorkflow.robot
index a6a087ca6..da479341c 100644
--- a/SOL005/NSLifecycleManagement-API/InstanciateNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/InstantiateNSTaskWorkflow.robot
@@ -5,6 +5,7 @@ Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=fal
 Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
+Library    Process
 Suite Setup       Initialize System
 Suite Teardown    Terminate All Processes    kill=true
 
@@ -13,15 +14,14 @@ Instantiate Flow of NS lifecycle management operations
     [Documentation]    Test ID: 5.3.2.21.1
     ...    Test title: Instantiate Flow of NS lifecycle management operations
     ...    Test objective: The objective is to test the workflow for Instantiate a NS instance
-    ...    Pre-conditions: the resource is in NOT_INSTANTIATED state
+    ...    Pre-conditions: The resource is in NOT_INSTANTIATED state
     ...    Reference: Clause 6.4.4 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: the resource is in INSTANTIATED state
-    Check resource existence
-    Check resource not_instantiated
+    ...    Post-Conditions: The resource is in INSTANTIATED state
     POST Instantiate nsInstance
     Check HTTP Response Status Code Is    202
+    Check HTTP Response Header Contains    Location
     Check Operation Occurrence Id
     Check Operation Notification Status is    START
     Check Operation Notification Status is    RESULT
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index 37405543c..b0b1d3592 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -89,7 +89,7 @@ Check Operation Notification
     Configure Notification Status Handler    ${callback_endpoint_fwd}    ${status}
     ${BODY}=    evaluate    json.dumps(${json})    json
     &{notification_request}=  Create Mock Request Matcher	POST  ${callback_endpoint}  body_type="JSON"    body=${BODY}
-    Wait Until Keyword Succeeds    2 min   10 sec   Verify Mock Expectation    ${notification_request}
+    Wait Until Keyword Succeeds    ${total_polling_time}   ${polling_interval}   Verify Mock Expectation    ${notification_request}
     Clear Requests    ${callback_endpoint}
     Clear Requests    ${callback_endpoint_fwd}
     
@@ -117,33 +117,43 @@ Check resource operationState is
     String    ${response['body']['operationState']}   ${state}
 
 Check resource Instantiated
-    Wait Until Keyword Succeeds    2 min   10 sec   Probe resource Instantiated
+    Wait Until Keyword Succeeds    ${total_polling_time}   ${polling_interval}   Probe resource Instantiated
 
 Probe resource Instantiated 
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId} 
+    GET    ${response['headers']['Location']}  
+    ${opocc}=    Output    response
+    Should Be Equal as Strings  ${opocc['status']}    200
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${opocc['body']['nsInstanceId']} 
     String    response body nsState    INSTANTIATED
 
 Check resource not_instantiated
-    Wait Until Keyword Succeeds    2 min   10 sec   Probe resource not_instantiated
+    Set Headers    {"Accept":"${ACCEPT}"}  
+    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${response['body']['id']}
+    String    response body nsState     NOT_INSTANTIATED
 
-Probe resource not_instantiated
-    [Arguments]  ${fresh_resource}=0
+Check NS resource not_instantiated
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    Log     ${fresh_resource}
-    ${instanceId}=  Set Variable If	    ${fresh_resource} == 0   ${nsInstanceId}   ${response['body']['id']}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${instanceId}
+    GET    ${response['headers']['Location']}  
+    ${opocc}=    Output    response
+    Should Be Equal as Strings  ${opocc['status']}    200
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${opocc['body']['nsInstanceId']} 
     String    response body nsState     NOT_INSTANTIATED
 
 Check operation resource state is FAILED_TEMP    
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId} 
+    GET    ${response['headers']['Location']}  
+    ${opocc}=    Output    response
+    Should Be Equal as Strings  ${opocc['status']}    200
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${opocc['body']['nsInstanceId']}  
     String    response body instantiationState    FAILED_TEMP 
     
 Check operation resource state is not FAILED_TEMP
@@ -151,14 +161,20 @@ Check operation resource state is not FAILED_TEMP
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId} 
+    GET    ${response['headers']['Location']}  
+    ${opocc}=    Output    response
+    Should Be Equal as Strings  ${opocc['status']}    200
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${opocc['body']['nsInstanceId']} 
     String  response body instantiationState  not  FAILED_TEMP
 
 Check resource is finally failed
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId} 
+    GET    ${response['headers']['Location']}  
+    ${opocc}=    Output    response
+    Should Be Equal as Strings  ${opocc['status']}    200
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${opocc['body']['nsInstanceId']}  
     String    response body instantiationState    FINALLY_FAILED 
 
 Launch another LCM operation
@@ -1392,3 +1408,26 @@ Check NsLcmOpOcc content against NS Descriptor
 Match the NsLcmOpOcc Response Attributes with NS Descriptors
     Should Be Equal As Strings    ${response['body']['affectedNss'][0]['nsdId']}    ${NSDescriptor_ID}
     Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${SAP_IDs}    ${response['body']['affectedSaps'][0]['sapdId']}
+
+Check Notification Http POST Request Body Json Schema Is  
+    [Arguments]    ${element}
+    ${schema}=	Get File	schemas/${element}.schema.json
+    Configure Notification Forward    ${schema}    ${callback_endpoint}    ${callback_endpoint_fwd}
+
+Check Notification Http POST Request Body notificationType attribute Is
+    [Arguments]    ${type}
+    Configure Notification NS Creation Deletion Handler    ${callback_endpoint_fwd}    ${type}
+    Wait Until Keyword Succeeds    ${total_polling_time}   ${polling_interval}   Verify Mock Expectation    ${notification_request}
+    Clear Requests    ${callback_endpoint}
+    Clear Requests    ${callback_endpoint_fwd}
+
+Configure Notification NS Creation Deletion Handler
+    [Arguments]    ${endpoint}    ${type}
+    ${json}=    evaluate    {}
+    set to dictionary   ${json}    notificationType    ${type}
+    ${BODY}=    evaluate    json.dumps(${json})    json
+    Log  Creating mock request and response to handle status notification
+    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    Create Mock Expectation  ${notification_request}  ${notification_response}
+
diff --git a/SOL005/NSLifecycleManagement-API/ScaleNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/ScaleNSTaskWorkflow.robot
index dd49111b0..49ea4c5fe 100644
--- a/SOL005/NSLifecycleManagement-API/ScaleNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/ScaleNSTaskWorkflow.robot
@@ -5,6 +5,7 @@ Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=fal
 Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
+Library    Process
 Suite Setup       Initialize System
 Suite Teardown    Terminate All Processes    kill=true
 
@@ -13,15 +14,14 @@ Scale Flow of NS lifecycle management operations
     [Documentation]    Test ID: 5.3.2.22.1
     ...    Test title: Instantiate Flow of NS lifecycle management operations
     ...    Test objective: The objective is to test the workflow for Instantiate a NS instance
-    ...    Pre-conditions: the resource is in NOT_INSTANTIATED state
+    ...    Pre-conditions: The resource is in INSTANTIATED state
     ...    Reference: Clause 6.4.5 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: the resource is in INSTANTIATED state    
-    Check resource existence
-    Check resource instantiated
+    ...    Post-Conditions: The resource is in INSTANTIATED state    
     POST scale nsInstance
     Check HTTP Response Status Code Is    202
+    Check HTTP Response Header Contains    Location
     Check Operation Occurrence Id
     Check Operation Notification Status is    START
     Check Operation Notification Status is    RESULT
diff --git a/SOL005/NSLifecycleManagement-API/TerminateNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/TerminateNSTaskWorkflow.robot
index 802a35ac0..1ff34c64c 100644
--- a/SOL005/NSLifecycleManagement-API/TerminateNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/TerminateNSTaskWorkflow.robot
@@ -5,6 +5,7 @@ Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=fal
 Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
+Library    Process
 Suite Setup       Initialize System
 Suite Teardown    Terminate All Processes    kill=true
 
@@ -17,15 +18,15 @@ Terminate Flow of NS lifecycle management operations
     ...    Reference: Clause 6.4.8 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: the resource is in NOT_INSTANTIATED state
-    Check resource existence
-    Check resource instantiated
+    ...    Post-Conditions: The NS resource is in NOT_INSTANTIATED state
     POST Terminate NSInstance
     Check HTTP Response Status Code Is    202
+    Check HTTP Response Header Contains    Location
     Check Operation Occurrence Id
     Check Operation Notification Status is    START
     Check Operation Notification Status is    RESULT
-    Check resource not_instantiated
+    Check NS resource not_instantiated
+
     
     
     
diff --git a/SOL005/NSLifecycleManagement-API/UpdateNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/UpdateNSTaskWorkflow.robot
index f64a83120..61b7aa8ae 100644
--- a/SOL005/NSLifecycleManagement-API/UpdateNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/UpdateNSTaskWorkflow.robot
@@ -5,6 +5,7 @@ Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}     ssl_verify=fal
 Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
+Library    Process
 Suite Setup       Initialize System
 Suite Teardown    Terminate All Processes    kill=true
 
@@ -13,15 +14,14 @@ Update Flow of NS lifecycle management operations
     [Documentation]    Test ID: 5.3.2.24.1
     ...    Test title: Update Flow of NS lifecycle management operations
     ...    Test objective: The objective is to test the workflow for Update a NS instance
-    ...    Pre-conditions: the resource is in INSTANTIATED state
+    ...    Pre-conditions: The resource is in INSTANTIATED state
     ...    Reference: Clause 6.4.6 - ETSI GS NFV-SOL 005 [3] v2.7.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: the resource is in INSTANTIATED state
-    Check resource existence
-    Check resource instantiated
+    ...    Post-Conditions: The resource is in INSTANTIATED state
     POST Update NSInstance
     Check HTTP Response Status Code Is    202
+    Check HTTP Response Header Contains    Location
     Check Operation Occurrence Id
     Check Operation Notification Status is    START
     Check Operation Notification Status is    RESULT
diff --git a/indexes/sol_005_index.csv b/indexes/sol_005_index.csv
index 31fcb08ef..02b0ff9bf 100644
--- a/indexes/sol_005_index.csv
+++ b/indexes/sol_005_index.csv
@@ -36,7 +36,7 @@
 5.3.2.18,NS Instance Creation Workflow, CreateNSInstanceWorkflow.robot
 5.3.2.19, NS Instance Deletion, DeleteNSInstanceWorkflow.robot
 5.3.2.20, Heal Flow of NS lifecycle management operations, HealNSTaskWorkflow.robot
-5.3.2.21, Instantiate Flow of NS lifecycle management operations, InstanciateNSTaskWorkflow.robot
+5.3.2.21, Instantiate Flow of NS lifecycle management operations, InstantiateNSTaskWorkflow.robot
 5.3.2.22, Scale Flow of NS lifecycle management operations, ScaleNSTaskWorkflow.robot
 5.3.2.23, Terminate Flow of NS lifecycle management operations, TerminateNSTaskWorkflow.robot
 5.3.2.24, Update Flow of NS lifecycle management operations, UpdateNSTaskWorkflow.robot
-- 
GitLab


From 430af9a32a97c867b3de337183c496e1796d62bb Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Sun, 21 Feb 2021 08:36:44 +0100
Subject: [PATCH 293/322] Fix issue #158

---
 .../VNFPackageManagementKeywords.robot        | 28 +++++++++----------
 .../environment/variables.txt                 |  4 +--
 .../VNFPackageManagementKeywords.robot        | 16 +++++------
 .../environment/variables.txt                 |  4 +--
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 6d577205c..5bf55cc2c 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -267,7 +267,7 @@ GET Individual VNF Package Content with Range Request
     Log    Trying to get a VNF Package Content using RANGE using an NFVO that can handle it
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Set Headers    {"Range": "${range}"}
+    Set Headers    {"Range": "bytes=${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
@@ -276,7 +276,7 @@ GET Individual VNF Package Content with Range Request
 GET Individual VNF Package Content with explicit Range Request
     Log    Trying to get a VNF Package Content using RANGE using an NFVO that can handle it
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Set Headers    {"Range": "${range}"}
+    Set Headers    {"Range": "bytes=${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
@@ -286,7 +286,7 @@ GET Individual VNF Package Content with explicit Range Request
 Check HTTP Response Header Content-Range Is Present and Matches the requested range
     Log    Check Content-Range HTTP Header
     Should Contain    ${response['headers']}    Content-Range
-    Should Be Equal As Strings    ${response['headers']['Content-Range']}    ${range}/${full_length}
+    Should Be Equal As Strings    ${response['headers']['Content-Range']}    bytes ${range}/${full_length}
     Log    Header Content-Range is present
     
 Check HTTP Response Header Content-Length Is Present and Matches the requested range length
@@ -299,7 +299,7 @@ GET Individual VNF Package Content with invalid Range Request
     Log    Trying to get a range of bytes of the limit of the VNF Package
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Set Headers    {"Range": "${erroneousRange}"}
+    Set Headers    {"Range": "bytes=${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
@@ -560,7 +560,7 @@ GET Individual VNF Package Artifact in octet stream format
 GET Individual VNF Package Artifact with Range Request
     Log    Trying to get an Artifact using RANGE Header and using an NFVO that can handle it
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
-    Set Headers    {"Range": "${range}"}
+    Set Headers    {"Range": "bytes=${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
@@ -570,7 +570,7 @@ GET Individual VNF Package Artifact with invalid Range Request
     Log    Trying to get a range of bytes of the limit of the VNF Package
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Set Headers    {"Range": "${erroneousRange}"}
+    Set Headers    {"Range": "bytes=${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
@@ -1016,7 +1016,7 @@ GET Individual OnBoarded VNF Package Content with Range Request
     Log    Trying to get a VNF Package Content using RANGE using an NFVO that can handle it
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Set Headers    {"Range": "${range}"}
+    Set Headers    {"Range": "bytes=${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/package_content
     ${output}=    Output    response
@@ -1026,7 +1026,7 @@ GET Individual OnBoarded VNF Package Content with invalid Range Request
     Log    Trying to get a range of bytes of the limit of the VNF Package
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Set Headers    {"Range": "${erroneousRange}"}
+    Set Headers    {"Range": "bytes=${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/package_content
     ${output}=    Output    response
@@ -1065,7 +1065,7 @@ GET Individual OnBoarded VNF Package Artifact in octet stream format
 GET Individual OnBoarded VNF Package Artifact with Range Request
     Log    Trying to get an Artifact using RANGE Header and using an NFVO that can handle it
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
-    Set Headers    {"Range": "${range}"}
+    Set Headers    {"Range": "bytes=${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
     ${output}=    Output    response
@@ -1075,7 +1075,7 @@ GET Individual OnBoarded VNF Package Artifact with invalid Range Request
     Log    Trying to get a range of bytes of the limit of the VNF Package
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Set Headers    {"Range": "${erroneousRange}"}
+    Set Headers    {"Range": "bytes=${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vndId}/artifacts/${artifactPath}
     ${output}=    Output    response
@@ -1351,7 +1351,7 @@ Get Artifact in VNF Package with include_signatures parameter
 Get Artifact in VNF Package with Range Request
     Log    Trying to get an Artifact using RANGE Header and using an NFVO that can handle it
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
-    Set Headers    {"Range": "${range}"}
+    Set Headers    {"Range": "bytes=${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
@@ -1384,7 +1384,7 @@ GET VNF Package Artifact with invalid Range Request
     Log    Trying to get a range of bytes of the limit of the VNF Package
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Set Headers    {"Range": "${erroneousRange}"}
+    Set Headers    {"Range": "bytes=${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
@@ -1466,7 +1466,7 @@ Get Artifact in OnBoarded VNF Package with include_signatures parameter
 Get Artifact in OnBoarded VNF Package with Range Request
     Log    Trying to get an Artifact using RANGE Header and using an NFVO that can handle it
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
-    Set Headers    {"Range": "${range}"}
+    Set Headers    {"Range": "bytes=${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
@@ -1499,7 +1499,7 @@ GET OnBoarded VNF Package Artifact with invalid Range Request
     Log    Trying to get a range of bytes of the limit of the OnBoarded VNF Package
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Set Headers    {"Range": "${erroneousRange}"}
+    Set Headers    {"Range": "bytes=${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/onboarded_vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
diff --git a/SOL003/VNFPackageManagement-API/environment/variables.txt b/SOL003/VNFPackageManagement-API/environment/variables.txt
index 480f3c558..b8610ee60 100644
--- a/SOL003/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL003/VNFPackageManagement-API/environment/variables.txt
@@ -73,9 +73,9 @@ ${vndIdZipVnfd}       f5b220d4-6177-4ebb-a554-a43311e16075
 ${artifactPath}    artifactPath
 ${CONTENT_TYPE_OCTET}    application/octet-stream
 ${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
-${range}          bytes 0-1023
+${range}          0-1023
 ${full_length}        2000            # Size of the requested artifact to be downloaded via partial downloads
-${erroneousRange}    bytes 10000000-1000000000    # Requesting a out of range number of bytes
+${erroneousRange}    10000000-1000000000    # Requesting a out of range number of bytes
 ${vnfPackageOctetStreamId}    octetStreamPkgId
 ${vnfdOctetStreamId}    octetStreamVnfdId
 ${vndEncryptedArtifactID}    encryptedId
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 092b4a399..b54fe34dc 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -452,7 +452,7 @@ GET Individual VNF Package Content with Range Request
     Log    Trying to get a VNF Package Content using RANGE using an NFVO that can handle it
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Set Headers    {"Range": "${range}"}
+    Set Headers    {"Range": "bytes=${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
@@ -461,7 +461,7 @@ GET Individual VNF Package Content with Range Request
 GET Individual VNF Package Content with explicit Range Request
     Log    Trying to get a VNF Package Content using RANGE using an NFVO that can handle it
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Set Headers    {"Range": "${range}"}
+    Set Headers    {"Range": "bytes=${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
@@ -471,7 +471,7 @@ GET Individual VNF Package Content with explicit Range Request
 Check HTTP Response Header Content-Range Is Present and Matches the requested range
     Log    Check Content-Range HTTP Header
     Should Contain    ${response['headers']}    Content-Range
-    Should Be Equal As Strings    ${response['headers']['Content-Range']}    ${range}/${full_length}
+    Should Be Equal As Strings    ${response['headers']['Content-Range']}    bytes ${range}/${full_length}
     Log    Header Content-Range is present
     
 Check HTTP Response Header Content-Length Is Present and Matches the requested range length
@@ -484,7 +484,7 @@ GET Individual VNF Package Content with invalid Range Request
     Log    Trying to get a range of bytes of the limit of the VNF Package
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Set Headers    {"Range": "${erroneousRange}"}
+    Set Headers    {"Range": "bytes=${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
@@ -581,7 +581,7 @@ GET Individual VNF Package Artifact in octet stream format
 GET Individual VNF Package Artifact with Range Request
     Log    Trying to get an Artifact using RANGE Header and using an NFVO that can handle it
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
-    Set Headers    {"Range": "${range}"}
+    Set Headers    {"Range": "bytes=${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
@@ -591,7 +591,7 @@ GET Individual VNF Package Artifact with invalid Range Request
     Log    Trying to get a range of bytes of the limit of the VNF Package
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Set Headers    {"Range": "${erroneousRange}"}
+    Set Headers    {"Range": "bytes=${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
@@ -1119,7 +1119,7 @@ Get Artifact in VNF Package with include_signatures parameter
 Get Artifact in VNF Package with Range Request
     Log    Trying to get an Artifact using RANGE Header and using an NFVO that can handle it
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
-    Set Headers    {"Range": "${range}"}
+    Set Headers    {"Range": "bytes=${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
@@ -1152,7 +1152,7 @@ GET VNF Package Artifact with invalid Range Request
     Log    Trying to get a range of bytes of the limit of the VNF Package
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
-    Set Headers    {"Range": "${erroneousRange}"}
+    Set Headers    {"Range": "bytes=${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
diff --git a/SOL005/VNFPackageManagement-API/environment/variables.txt b/SOL005/VNFPackageManagement-API/environment/variables.txt
index 72323bfe6..7a69525ad 100644
--- a/SOL005/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFPackageManagement-API/environment/variables.txt
@@ -66,9 +66,9 @@ ${onboardingStateVnfPkgId}    788106a2-d692-44f3-a86d-384f0ce35e42    # The VNF
 ${artifactPath}    artifactPath
 ${CONTENT_TYPE_OCTET}    application/octet-stream
 ${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
-${range}          bytes 0-1023
+${range}          0-1023
 ${full_length}        2000            # Size of the requested artifact to be downloaded via partial downloads 
-${erroneousRange}    bytes 10000000-1000000000    # Requesting a out of range number of bytes
+${erroneousRange}    10000000-1000000000    # Requesting a out of range number of bytes
 ${vnfPackageOctetStreamId}    octetStreamPkgId
 ${vnfPkgId}       788106a2-d692-44f3-a86d-384f0ce35e42
 ${creatingVnfPackageId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
-- 
GitLab


From f4c4cf09b99806d83bc7e0cfc2f5963b497e7f79 Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Mon, 22 Feb 2021 09:43:54 +0100
Subject: [PATCH 294/322] Fix issue #159

---
 .../{subscriptions.schema.json => Subscriptions.schema.json}      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename SOL003/VNFLifecycleManagement-API/schemas/{subscriptions.schema.json => Subscriptions.schema.json} (100%)

diff --git a/SOL003/VNFLifecycleManagement-API/schemas/subscriptions.schema.json b/SOL003/VNFLifecycleManagement-API/schemas/Subscriptions.schema.json
similarity index 100%
rename from SOL003/VNFLifecycleManagement-API/schemas/subscriptions.schema.json
rename to SOL003/VNFLifecycleManagement-API/schemas/Subscriptions.schema.json
-- 
GitLab


From d17a5dac707d2a8ba1ebeaced2463092df8ce874 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Tue, 23 Feb 2021 12:20:33 +0100
Subject: [PATCH 295/322] fixed issue #161 on v2.7.1

---
 .../IndividualVnfLcmOperationOccurence.robot  | 45 +++++++--------
 .../VnfLcmOperationKeywords.robot             | 23 +++++---
 .../IndividualVnfLcmOperationOccurence.robot  | 55 ++++++++++---------
 .../VnfLcmMntOperationKeywords.robot          | 45 +++++++++++++--
 4 files changed, 104 insertions(+), 64 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot b/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
index cf5882df8..9c4f7477f 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
@@ -5,64 +5,65 @@ Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}        ssl_verify=
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 *** Test Cases ***
-Post Individual VNF LCM OP occurrences - Method not implemented
+Post Individual VNF LCM OP occurrence - Method not implemented
     [Documentation]    Test ID: 6.3.5.12.1
-    ...    Test title: Post Individual VNF LCM OP occurrences - Method not implemented
+    ...    Test title: Post Individual VNF LCM OP occurrence - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.13.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Post Individual VNF LCM OP occurrences
+    Post Individual VNF LCM OP occurrence
     Check HTTP Response Status Code Is    405
     
-Get status information about multiple VNF instances 
+Get Individual VNF LCM OP occurrence
     [Documentation]    Test ID: 6.3.5.12.2
-    ...    Test title: Get status information about multiple VNF instances
-    ...    Test objective: The objective is to test that this method retrieve status information about a VNF lifecycle management operation occurrence 
+    ...    Test title: Get Individual VNF LCM OP occurrence
+    ...    Test objective: The objective is to test that this method retrieve a VNF lifecycle management operation occurrence and perform a JSON schema validation of the returned data structure
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Get Individual VNF LCM OP occurrences
+    Get Individual VNF LCM OP occurrence
     Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    vnfLcmOpOcc 
+    Check HTTP Response Body Json Schema Is    VnfLcmOpOcc
     Check HTTP Response Body vnf LCM OpOCC content against VNF Descriptor
 
-PUT status information about multiple VNF instances - Method not implemented
+PUT Individual VNF LCM OP occurrence - Method not implemented
     [Documentation]    Test ID: 6.3.5.12.3
-    ...    Test title: PUT status information about multiple VNF instances - Method not implemented
+    ...    Test title: PUT Individual VNF LCM OP occurrence - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.13.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
-    PUT Individual VNF LCM OP occurrences
+    Put Individual VNF LCM OP occurrence
     Check HTTP Response Status Code Is    405
 
-PATCH status information about multiple VNF instances - Method not implemented 
+PATCH Individual VNF LCM OP occurrence - Method not implemented
     [Documentation]    Test ID: 6.3.5.12.4
-    ...    Test title: PATCH status information about multiple VNF instances - Method not implemented 
+    ...    Test title: PATCH Individual VNF LCM OP occurrence - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.13.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none      
-    PATCH Individual VNF LCM OP occurrences
+    Patch Individual VNF LCM OP occurrence
     Check HTTP Response Status Code Is    405
     
-DELETE status information about multiple VNF instances - Method not implemented 
+DELETE Individual VNF LCM OP occurrence - Method not implemented
     [Documentation]    Test ID: 6.3.5.12.5
-    ...    Test title: DELETE status information about multiple VNF instances - Method not implemented
+    ...    Test title: DELETE Individual VNF LCM OP occurrence - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.13.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
-    DELETE Individual VNF LCM OP occurrences
+    Delete Individual VNF LCM OP occurrence
     Check HTTP Response Status Code Is    405
+
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index e3c3a231a..08dc46e9b 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -612,41 +612,46 @@ DELETE VNF LCM OP occurrences
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
-Post Individual VNF LCM OP occurrences
+Post Individual VNF LCM OP occurrence
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
-Get Individual VNF LCM OP occurrences
+
+Get Individual VNF LCM OP occurrence
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
-Put Individual VNF LCM OP occurrences
+
+Put Individual VNF LCM OP occurrence
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
     ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}
-Patch Individual VNF LCM OP occurrences
+	Set Global Variable    ${response}    ${outputResponse}	
+
+Patch Individual VNF LCM OP occurrence
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    Patch   ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
     ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}
-Delete Individual VNF LCM OP occurrences
+	Set Global Variable    ${response}    ${outputResponse}	
+	
+Delete Individual VNF LCM OP occurrence
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
     ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}			
+	Set Global Variable    ${response}    ${outputResponse}	
+	
 Post Retry operation
     Log    Retry a VNF lifecycle operation if that operation has experienced a temporary failure
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot b/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
index 85bc89adc..823f35ca9 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
@@ -6,77 +6,78 @@ Library    JSONSchemaLibrary    schemas/
 Resource    VnfLcmMntOperationKeywords.robot
 
 *** Test Cases ***
-Post Individual VNF LCM Operation occurrences - Method not implemented
+Post Individual VNF LCM OP occurrence - Method not implemented
     [Documentation]    Test ID: 7.3.1.12.1
-    ...    Test title: Post Individual VNF LCM Operation occurrences - Method not implemented
+    ...    Test title: Post Individual VNF LCM OP occurrence - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 5.4.13.3.1 - ETSI GS NFV-SOL 003 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Post Individual VNF LCM Operation occurrences
+    Post Individual VNF LCM OP occurrence
     Check HTTP Response Status Code Is    405
     
-Get Individual VNF LCM Operation occurrences
+Get Individual VNF LCM OP occurrence
     [Documentation]    Test ID: 7.3.1.12.2
-    ...    Test title: Get Individual VNF LCM Operation occurrences
-    ...    Test objective: The objective is to test that this method retrieve information about a VNF lifecycle management operation occurrence 
+    ...    Test title: Get Individual VNF LCM OP occurrence
+    ...    Test objective: The objective is to test that this method retrieve a VNF lifecycle management operation occurrence and perform a JSON schema validation of the returned data structure
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 003 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Get Individual VNF LCM Operation occurrences
+    Get Individual VNF LCM OP occurrence
     Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    VnfLcmOpOcc 
+    Check HTTP Response Body Json Schema Is    VnfLcmOpOcc
     Check HTTP Response Body of Individual VNF LCM Operation occurrences content against VNF Descriptor
 
-PUT Individual VNF LCM Operation occurrences - Method not implemented
+PUT Individual VNF LCM OP occurrence - Method not implemented
     [Documentation]    Test ID: 7.3.1.12.3
-    ...    Test title: PUT Individual VNF LCM Operation occurrences - Method not implemented
+    ...    Test title: PUT Individual VNF LCM OP occurrence - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 5.4.13.3.3 - ETSI GS NFV-SOL 003 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none  
-    Put multiple VNF instances
+    Put Individual VNF LCM OP occurrence
     Check HTTP Response Status Code Is    405
 
-PATCH Individual VNF LCM Operation occurrences - Method not implemented 
+PATCH Individual VNF LCM OP occurrence - Method not implemented
     [Documentation]    Test ID: 7.3.1.12.4
-    ...    Test title: PATCH Individual VNF LCM Operation occurrences - Method not implemented
+    ...    Test title: PATCH Individual VNF LCM OP occurrence - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 5.4.13.3.4 - ETSI GS NFV-SOL 003 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none      
-    Patch multiple VNF instances
+    Patch Individual VNF LCM OP occurrence
     Check HTTP Response Status Code Is    405
     
- DELETE Individual VNF LCM Operation occurrences - Method not implemented
+DELETE Individual VNF LCM OP occurrence - Method not implemented
     [Documentation]    Test ID: 7.3.1.12.5
-    ...    Test title: DELETE Individual VNF LCM Operation occurrences - Method not implemented
+    ...    Test title: DELETE Individual VNF LCM OP occurrence - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 5.4.13.3.5 - ETSI GS NFV-SOL 003 [2] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none  
-    Delete multiple VNF instances
+    Delete Individual VNF LCM OP occurrence
     Check HTTP Response Status Code Is    405
-    
-Get Individual VNF LCM Operation occurrences - Not Found
+
+Get Individual VNF LCM Operation occurrence - Not Found
     [Documentation]    Test ID: 7.3.1.12.6
-    ...    Test title: Get Individual VNF LCM Operation occurrences - Not Found
+    ...    Test title: Get Individual VNF LCM Operation occurrence - Not Found
     ...    Test objective: The objective is to test that the retrieval of VNF lifecycle management operation occurrence fails when instance is not present. 
     ...    Pre-conditions: none
     ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Get Individual VNF LCM Operation occurrences
+    Get Individual VNF LCM OP occurrence with invalid resource identifier
     Check HTTP Response Status Code Is    404 
-    Check HTTP Response Body Json Schema Is    ProblemDetails
\ No newline at end of file
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index e157cac4b..3103050dd 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -991,21 +991,54 @@ DELETE VNF LCM Operation occurrences
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
-Post Individual VNF LCM Operation occurrences 
+Post Individual VNF LCM OP occurrence
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
-Get Individual VNF LCM Operation occurrences
-    Log    Query status information about multiple VNF lifecycle management operation occurrences.
+
+Get Individual VNF LCM OP occurrence
+    log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
     ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}	   
+	Set Global Variable    ${response}    ${outputResponse}	
+
+Get Individual VNF LCM OP occurrence with invalid resource identifier
+    log    Trying to perform a POST. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${notExistingVnfLcmOpOccId}	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+
+Put Individual VNF LCM OP occurrence
+    log    Trying to perform a POST. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+
+Patch Individual VNF LCM OP occurrence
+    log    Trying to perform a POST. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+	
+Delete Individual VNF LCM OP occurrence
+    log    Trying to perform a POST. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+	   
 Put multiple VNF instances	
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
-- 
GitLab


From 21f3d0ca23e4f79d708bcb71735a953ea9011df4 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Tue, 23 Feb 2021 12:25:12 +0100
Subject: [PATCH 296/322] missing update for #161 on v2.7.1

---
 .../IndividualVnfLcmOperationOccurence.robot           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot b/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
index 9c4f7477f..a6165996e 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
@@ -10,7 +10,7 @@ Post Individual VNF LCM OP occurrence - Method not implemented
     ...    Test title: Post Individual VNF LCM OP occurrence - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.13.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -22,7 +22,7 @@ Get Individual VNF LCM OP occurrence
     ...    Test title: Get Individual VNF LCM OP occurrence
     ...    Test objective: The objective is to test that this method retrieve a VNF lifecycle management operation occurrence and perform a JSON schema validation of the returned data structure
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -36,7 +36,7 @@ PUT Individual VNF LCM OP occurrence - Method not implemented
     ...    Test title: PUT Individual VNF LCM OP occurrence - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.13.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -48,7 +48,7 @@ PATCH Individual VNF LCM OP occurrence - Method not implemented
     ...    Test title: PATCH Individual VNF LCM OP occurrence - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.13.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none      
@@ -60,7 +60,7 @@ DELETE Individual VNF LCM OP occurrence - Method not implemented
     ...    Test title: DELETE Individual VNF LCM OP occurrence - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
+    ...    Reference: Clause 5.4.13.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
-- 
GitLab


From 96e54fe6786a549ab9ca1fb0ba8eed6d2deb6a8f Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Wed, 24 Feb 2021 13:15:20 +0100
Subject: [PATCH 297/322] Fix issue #166 for 2.7.1

---
 .../schemas/links.schema.json                 | 91 +++++++++----------
 .../VNFPackageManagementKeywords.robot        |  2 +-
 .../schemas/links.schema.json                 |  3 -
 3 files changed, 45 insertions(+), 51 deletions(-)

diff --git a/SOL005/NSPerformanceManagement-API/schemas/links.schema.json b/SOL005/NSPerformanceManagement-API/schemas/links.schema.json
index 945df7daa..0d6b2172a 100644
--- a/SOL005/NSPerformanceManagement-API/schemas/links.schema.json
+++ b/SOL005/NSPerformanceManagement-API/schemas/links.schema.json
@@ -1,53 +1,50 @@
 {
-  "type": "array",
-  "items": {
-    "type": "object",
-    "description": "Links to resources related to this resource.\n",
-    "required": [
-      "self",
-      "packageContent"
-    ],
-    "properties": {
-      "self": {
-        "description": "This type represents a link to a resource.\n",
-        "type": "object",
-        "required": [
-          "href"
-        ],
-        "properties": {
-          "href": {
-            "description": "URI of the referenced resource.\n",
-            "type": "string",
-            "format": "url"
-          }
+  "type": "object",
+  "description": "Links to resources related to this resource.\n",
+  "required": [
+    "self",
+    "packageContent"
+  ],
+  "properties": {
+    "self": {
+      "description": "This type represents a link to a resource.\n",
+      "type": "object",
+      "required": [
+        "href"
+      ],
+      "properties": {
+        "href": {
+          "description": "URI of the referenced resource.\n",
+          "type": "string",
+          "format": "url"
         }
-      },
-      "vnfd": {
-        "description": "This type represents a link to a resource.\n",
-        "type": "object",
-        "required": [
-          "href"
-        ],
-        "properties": {
-          "href": {
-            "description": "URI of the referenced resource.\n",
-            "type": "string",
-            "format": "url"
-          }
+      }
+    },
+    "vnfd": {
+      "description": "This type represents a link to a resource.\n",
+      "type": "object",
+      "required": [
+        "href"
+      ],
+      "properties": {
+        "href": {
+          "description": "URI of the referenced resource.\n",
+          "type": "string",
+          "format": "url"
         }
-      },
-      "packageContent": {
-        "description": "This type represents a link to a resource.\n",
-        "type": "object",
-        "required": [
-          "href"
-        ],
-        "properties": {
-          "href": {
-            "description": "URI of the referenced resource.\n",
-            "type": "string",
-            "format": "url"
-          }
+      }
+    },
+    "packageContent": {
+      "description": "This type represents a link to a resource.\n",
+      "type": "object",
+      "required": [
+        "href"
+      ],
+      "properties": {
+        "href": {
+          "description": "URI of the referenced resource.\n",
+          "type": "string",
+          "format": "url"
         }
       }
     }
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index b54fe34dc..e6fe7b39c 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -106,7 +106,7 @@ Check HTTP Response Body VnfPkgsInfo Matches the requested all_fields selector
     Validate Json    additionalArtifacts.schema.json    ${additional_artifacts[0]}
     Log    Validation for additionalArtifacts schema OK
     ${links}=    Get Value From Json    ${response['body']}    $.._links
-    Validate Json    links.schema.json    ${links[0]}
+    Validate Json    links.schema.json    ${links}
     Log    Validation for _links schema OK
 
 GET VNF Packages with exclude_default attribute selector
diff --git a/SOL005/VNFPackageManagement-API/schemas/links.schema.json b/SOL005/VNFPackageManagement-API/schemas/links.schema.json
index 945df7daa..3f4bb0e1f 100644
--- a/SOL005/VNFPackageManagement-API/schemas/links.schema.json
+++ b/SOL005/VNFPackageManagement-API/schemas/links.schema.json
@@ -1,6 +1,4 @@
 {
-  "type": "array",
-  "items": {
     "type": "object",
     "description": "Links to resources related to this resource.\n",
     "required": [
@@ -52,4 +50,3 @@
       }
     }
   }
-}
\ No newline at end of file
-- 
GitLab


From 3d35e2a8a3558d60b6bca6b819e609457dc8c5ed Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Wed, 24 Feb 2021 14:45:05 +0100
Subject: [PATCH 298/322] Fix issue #165

---
 .../VNFPackageManagement-API/VNFPackageManagementKeywords.robot | 2 +-
 SOL003/VNFPackageManagement-API/environment/variables.txt       | 1 +
 .../VNFPackageManagement-API/VNFPackageManagementKeywords.robot | 2 +-
 SOL005/VNFPackageManagement-API/environment/variables.txt       | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 5bf55cc2c..ec065374b 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -292,7 +292,7 @@ Check HTTP Response Header Content-Range Is Present and Matches the requested ra
 Check HTTP Response Header Content-Length Is Present and Matches the requested range length
     Log    Check Content-Length HTTP Header
     Should Contain    ${response['headers']}    Content-Length
-    Should Be Equal As Integers    ${response['headers']['Content-Length']}    ${full_length}
+    Should Be Equal As Integers    ${response['headers']['Content-Length']}    ${length}
     Log    Header Content-Length is present
 
 GET Individual VNF Package Content with invalid Range Request
diff --git a/SOL003/VNFPackageManagement-API/environment/variables.txt b/SOL003/VNFPackageManagement-API/environment/variables.txt
index b8610ee60..2e85f19b4 100644
--- a/SOL003/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL003/VNFPackageManagement-API/environment/variables.txt
@@ -75,6 +75,7 @@ ${CONTENT_TYPE_OCTET}    application/octet-stream
 ${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
 ${range}          0-1023
 ${full_length}        2000            # Size of the requested artifact to be downloaded via partial downloads
+${length}             1024            # Size of the requested range
 ${erroneousRange}    10000000-1000000000    # Requesting a out of range number of bytes
 ${vnfPackageOctetStreamId}    octetStreamPkgId
 ${vnfdOctetStreamId}    octetStreamVnfdId
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index e6fe7b39c..f03a46834 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -477,7 +477,7 @@ Check HTTP Response Header Content-Range Is Present and Matches the requested ra
 Check HTTP Response Header Content-Length Is Present and Matches the requested range length
     Log    Check Content-Length HTTP Header
     Should Contain    ${response['headers']}    Content-Length
-    Should Be Equal As Integers    ${response['headers']['Content-Length']}    ${full_length}
+    Should Be Equal As Integers    ${response['headers']['Content-Length']}    ${length}
     Log    Header Content-Length is present
 
 GET Individual VNF Package Content with invalid Range Request
diff --git a/SOL005/VNFPackageManagement-API/environment/variables.txt b/SOL005/VNFPackageManagement-API/environment/variables.txt
index 7a69525ad..afa29254f 100644
--- a/SOL005/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFPackageManagement-API/environment/variables.txt
@@ -68,6 +68,7 @@ ${CONTENT_TYPE_OCTET}    application/octet-stream
 ${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
 ${range}          0-1023
 ${full_length}        2000            # Size of the requested artifact to be downloaded via partial downloads 
+${length}             1024            # Size of the requested range 
 ${erroneousRange}    10000000-1000000000    # Requesting a out of range number of bytes
 ${vnfPackageOctetStreamId}    octetStreamPkgId
 ${vnfPkgId}       788106a2-d692-44f3-a86d-384f0ce35e42
-- 
GitLab


From 3f956f38c47474f2ba0ccbc08ebdb73b45d4056e Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Fri, 26 Feb 2021 09:46:25 +0100
Subject: [PATCH 299/322] fixed issue#168 in v2.7.1

---
 .../VnfLcmOperationOccurences.robot                | 12 ++++++------
 .../VnfLcmOperationOccurences.robot                | 14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
index d5e329d38..785ae77a4 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
@@ -30,7 +30,7 @@ GET status information about multiple VNF LCM operation occurrences
     ...    Applicability: none
     ...    Post-Conditions: none   
     GET VNF LCM OP occurrences
-    Check HTTP Response Status Code Is    202
+    Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    VnfLcmOpOccs 
     Check HTTP Response Body vnf LCM OpOCCs content against VNF Descriptor
     
@@ -70,7 +70,7 @@ GET status information about multiple VNF LCM Operation occurrences with "all_fi
     ...    Applicability: none
     ...    Post-Conditions: none   
     Get VNF LCM Operation occurrences with all_fields attribute selector
-    Check HTTP Response Status Code Is    202
+    Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    VnfLcmOpOccs 
 
 GET status information about multiple VNF LCM Operation occurrences with "exlude_default"   
@@ -83,7 +83,7 @@ GET status information about multiple VNF LCM Operation occurrences with "exlude
     ...    Applicability: none
     ...    Post-Conditions: none   
     Get VNF LCM Operation occurrences with exclude_default attribute selector
-    Check HTTP Response Status Code Is    202
+    Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    VnfLcmOpOccs 
 
 GET status information about multiple VNF LCM Operation occurrences with "fields"   
@@ -96,7 +96,7 @@ GET status information about multiple VNF LCM Operation occurrences with "fields
     ...    Applicability: none
     ...    Post-Conditions: none   
     Get VNF LCM Operation occurrences with fields attribute selector
-    Check HTTP Response Status Code Is    202
+    Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    VnfLcmOpOccs
 
 GET status information about multiple VNF LCM Operation occurrences with "exclude_fields"   
@@ -109,7 +109,7 @@ GET status information about multiple VNF LCM Operation occurrences with "exclud
     ...    Applicability: none
     ...    Post-Conditions: none   
     Get VNF LCM Operation occurrences with exclude_fields attribute selector
-    Check HTTP Response Status Code Is    202
+    Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    VnfLcmOpOccs    
     
 PUT status information about multiple VNF LCM operation occurrences - Method not implemented
@@ -184,5 +184,5 @@ GET status information about multiple VNF LCM Operation occurrences with "exlude
     ...    Applicability: none
     ...    Post-Conditions: none   
     Get VNF LCM Operation occurrences with exclude_default and fields attribute selector
-    Check HTTP Response Status Code Is    202
+    Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    VnfLcmOpOccs 
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
index 07f88d6a4..65458896a 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
@@ -28,7 +28,7 @@ GET status information about multiple VNF LCM Operation OCC
     ...    Applicability: none
     ...    Post-Conditions: none   
     GET VNF LCM Operation occurrences
-    Check HTTP Response Status Code Is    202
+    Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    VnfLcmOpOccs 
 
 GET status information about multiple VNF LCM Operation OCC Bad Request Invalid attribute-based filtering parameters
@@ -67,7 +67,7 @@ GET status information about multiple VNF LCM Operation OCC with "all_fields"
     ...    Applicability: none
     ...    Post-Conditions: none   
     Get VNF LCM Operation occurrences with all_fields attribute selector
-    Check HTTP Response Status Code Is    202
+    Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    VnfLcmOpOccs 
 
 GET status information about multiple VNF LCM Operation OCC with "exlude_default"   
@@ -80,7 +80,7 @@ GET status information about multiple VNF LCM Operation OCC with "exlude_default
     ...    Applicability: none
     ...    Post-Conditions: none   
     Get VNF LCM Operation occurrences with exclude_default attribute selector
-    Check HTTP Response Status Code Is    202
+    Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    VnfLcmOpOccs 
 
 GET status information about multiple VNF LCM Operation OCC with "fields"   
@@ -93,7 +93,7 @@ GET status information about multiple VNF LCM Operation OCC with "fields"
     ...    Applicability: none
     ...    Post-Conditions: none   
     Get VNF LCM Operation occurrences with fields attribute selector
-    Check HTTP Response Status Code Is    202
+    Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    VnfLcmOpOccs
 
 GET status information about multiple VNF LCM Operation OCC with "exclude_fields"   
@@ -106,7 +106,7 @@ GET status information about multiple VNF LCM Operation OCC with "exclude_fields
     ...    Applicability: none
     ...    Post-Conditions: none   
     Get VNF LCM Operation occurrences with exclude_fields attribute selector
-    Check HTTP Response Status Code Is    202
+    Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    VnfLcmOpOccs
             
 PUT status information about multiple VNF LCM Operation OCC - Method not implemented
@@ -155,7 +155,7 @@ GET status information about multiple VNF LCM Operation OCC to get Paged Respons
     ...    Applicability: none
     ...    Post-Conditions: none   
     GET VNF LCM Operation occurrences
-    Check HTTP Response Status Code Is    202
+    Check HTTP Response Status Code Is    200
     Check HTTP Response Header Contain Link
 
 GET status information about multiple VNF LCM Operation OCC - Bad Request Response too Big
@@ -181,5 +181,5 @@ GET status information about multiple VNF LCM Operation OCC with "exclude_defaul
     ...    Applicability: none
     ...    Post-Conditions: none   
     Get VNF LCM Operation occurrences with exclude_default and fields attribute selector
-    Check HTTP Response Status Code Is    202
+    Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    VnfLcmOpOccs
\ No newline at end of file
-- 
GitLab


From 5db738be0ead6f99c09247a735abcfc5dc36207b Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Fri, 26 Feb 2021 09:50:52 +0100
Subject: [PATCH 300/322] fixed issue #162 on v2.7.1

---
 SOL005/NSDManagement-API/NSDManagementKeywords.robot | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index 3c5eea772..5b427e837 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -195,7 +195,8 @@ GET Individual Network Service Descriptor Information
     REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
-
+    Set Suite Variable    ${usageState}    ${response['body']['nsdUsageState']}
+    
 Check HTTP Response Body NsdInfo Identifier matches the requested Network Service Descriptor Information
     Log    Going to validate info retrieved
     Should Be Equal    ${response['body']['id']}    ${nsdInfoId} 
-- 
GitLab


From d1df3c782d4c845b12fcb4994f68a63efa25a834 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Fri, 26 Feb 2021 11:41:12 +0100
Subject: [PATCH 301/322] fixed issue #167 on v2.7.1

---
 SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
index fd8544442..aa110655b 100644
--- a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
@@ -31,7 +31,7 @@ POST Terminate a vnfInstance Conflict (Not-Instantiated)
     ...    Applicability: none
     ...    Post-Conditions: none
     POST Terminate VNF in NOT-INSTANTIATED state
-    Check HTTP Response Status Code Is    202
+    Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
        
-- 
GitLab


From 38a8b7ac7093f372b1f4c87acb0badba8d47bfcf Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Fri, 26 Feb 2021 16:15:50 +0100
Subject: [PATCH 302/322] fixed mock server expectation in v2.7.1

---
 .../NotificationEndpoint.robot                | 18 +++++---
 .../VnfIndicatorNotification.robot            |  6 ++-
 .../NotificationEndpoint.robot                | 24 +++++++----
 .../PerformanceManagementNotification.robot   | 12 ++++--
 .../NotificationEndpoint.robot                | 18 +++++---
 .../VnfIndicatorNotification.robot            |  6 ++-
 .../NotificationEndpoint.robot                | 24 +++++++----
 .../PackageManagementNotification.robot       | 18 +++++---
 .../PerformanceManagementNotification.robot   | 12 ++++--
 .../NSDManagementNotification.robot           | 42 ++++++++++++-------
 .../NotificationEndpoint.robot                | 21 ++++++----
 .../NSLCMOperationKeywords.robot              | 13 +++---
 .../NotificationEndpoint.robot                | 28 +++++++------
 .../Notifications.robot                       | 14 ++++---
 .../Notifications.robot                       | 20 +++++----
 15 files changed, 176 insertions(+), 100 deletions(-)

diff --git a/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot b/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
index d5795f5c0..6a6830d26 100644
--- a/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
+++ b/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
@@ -113,8 +113,10 @@ Configure Notification Alarm List Rebuilt Handler
     set to dictionary    ${json}    notificationType    ${type}    
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Configure Notification Alarm Handler
@@ -123,8 +125,10 @@ Configure Notification Alarm Handler
     set to dictionary    ${json}    notificationType    ${type}    
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Configure Notification Alarm Cleareance Handler
@@ -133,8 +137,10 @@ Configure Notification Alarm Cleareance Handler
     set to dictionary   ${json}    notificationType    ${type}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
   
 Configure Notification Forward
diff --git a/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot b/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
index c58a979a1..65ba44ae9 100644
--- a/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
+++ b/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
@@ -49,8 +49,10 @@ Configure Notification Indicator Value Change Handler
     set to dictionary    ${json}    notificationType    ${type}    
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Configure Notification Forward
diff --git a/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot b/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
index 6a3ecfce5..17a3b3b61 100644
--- a/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
+++ b/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
@@ -97,8 +97,10 @@ Configure Notification VNF LCM Operation Occurrence Start Handler
     set to dictionary   ${json}    notificationType    ${type}    changeType    ${status}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Check VNF LCM Operation Occurrence Result Notification Http POST Request Body Json Schema Is  
@@ -119,8 +121,10 @@ Configure Notification VNF LCM Operation Occurrence Result Handler
     set to dictionary   ${json}    notificationType    ${type}    changeType    ${status}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Check VNF Identifier Creation Notification Http POST Request Body Json Schema Is  
@@ -141,8 +145,10 @@ Configure Notification VNF Identifier Creation Handler
     set to dictionary   ${json}    notificationType    ${type}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
     
 Check VNF Identifier Deletion Notification Http POST Request Body Json Schema Is  
@@ -163,8 +169,10 @@ Configure Notification VNF Identifier Deletion Handler
     set to dictionary   ${json}    notificationType    ${type}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Check VNF LCM Operation Occurrence Start Notification Http POST Request Body notificationStatus attribute Is
diff --git a/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot b/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
index 58a7d9039..b8bffd4c6 100644
--- a/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
+++ b/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
@@ -86,8 +86,10 @@ Configure Notification Performance Information Available Handler
     set to dictionary    ${json}    notificationType    ${type}    
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Configure Notification Threshold Crossed Handler
@@ -96,8 +98,10 @@ Configure Notification Threshold Crossed Handler
     set to dictionary   ${json}    notificationType    ${type}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
   
 Configure Notification Forward
diff --git a/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot b/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot
index 78e8209e1..ded07dadc 100644
--- a/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot
+++ b/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot
@@ -113,8 +113,10 @@ Configure Notification Alarm List Rebuilt Handler
     set to dictionary    ${json}    notificationType    ${type}    
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Configure Notification Alarm Handler
@@ -123,8 +125,10 @@ Configure Notification Alarm Handler
     set to dictionary    ${json}    notificationType    ${type}    
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Configure Notification Alarm Cleareance Handler
@@ -133,8 +137,10 @@ Configure Notification Alarm Cleareance Handler
     set to dictionary   ${json}    notificationType    ${type}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
   
 Configure Notification Forward
diff --git a/SOL003/VNFIndicator-API/VnfIndicatorNotification.robot b/SOL003/VNFIndicator-API/VnfIndicatorNotification.robot
index 79cd22af0..ee235b0b1 100644
--- a/SOL003/VNFIndicator-API/VnfIndicatorNotification.robot
+++ b/SOL003/VNFIndicator-API/VnfIndicatorNotification.robot
@@ -49,8 +49,10 @@ Configure Notification Indicator Value Change Handler
     set to dictionary    ${json}    notificationType    ${type}    
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Configure Notification Forward
diff --git a/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot b/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot
index b956fd49b..fd51a9ed6 100644
--- a/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot
+++ b/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot
@@ -97,8 +97,10 @@ Configure Notification VNF LCM Operation Occurrence Start Handler
     set to dictionary   ${json}    notificationType    ${type}    changeType    ${status}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Check VNF LCM Operation Occurrence Result Notification Http POST Request Body Json Schema Is  
@@ -119,8 +121,10 @@ Configure Notification VNF LCM Operation Occurrence Result Handler
     set to dictionary   ${json}    notificationType    ${type}    changeType    ${status}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Check VNF Identifier Creation Notification Http POST Request Body Json Schema Is  
@@ -141,8 +145,10 @@ Configure Notification VNF Identifier Creation Handler
     set to dictionary   ${json}    notificationType    ${type}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
     
 Check VNF Identifier Deletion Notification Http POST Request Body Json Schema Is  
@@ -163,8 +169,10 @@ Configure Notification VNF Identifier Deletion Handler
     set to dictionary   ${json}    notificationType    ${type}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Check VNF LCM Operation Occurrence Start Notification Http POST Request Body notificationStatus attribute Is
diff --git a/SOL003/VNFPackageManagement-API/PackageManagementNotification.robot b/SOL003/VNFPackageManagement-API/PackageManagementNotification.robot
index 13830fc38..148e6e3d7 100644
--- a/SOL003/VNFPackageManagement-API/PackageManagementNotification.robot
+++ b/SOL003/VNFPackageManagement-API/PackageManagementNotification.robot
@@ -118,8 +118,10 @@ Configure Notification Onboarding Handler
     set to dictionary    ${json}    notificationType    ${type}    
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Configure Notification Delete Handler
@@ -128,8 +130,10 @@ Configure Notification Delete Handler
     set to dictionary   ${json}    notificationType    ${type}    changeType    ${change}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Configure Notification Change Status Handler
@@ -138,8 +142,10 @@ Configure Notification Change Status Handler
     set to dictionary   ${json}    notificationType    ${type}    changeType    ${change}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
   
 Configure Notification Forward
diff --git a/SOL003/VNFPerformanceManagement-API/PerformanceManagementNotification.robot b/SOL003/VNFPerformanceManagement-API/PerformanceManagementNotification.robot
index fc6f7035b..e21a8b578 100644
--- a/SOL003/VNFPerformanceManagement-API/PerformanceManagementNotification.robot
+++ b/SOL003/VNFPerformanceManagement-API/PerformanceManagementNotification.robot
@@ -85,8 +85,10 @@ Configure Notification Performance Information Available Handler
     set to dictionary    ${json}    notificationType    ${type}    
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Configure Notification Threshold Crossed Handler
@@ -95,8 +97,10 @@ Configure Notification Threshold Crossed Handler
     set to dictionary   ${json}    notificationType    ${type}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
   
 Configure Notification Forward
diff --git a/SOL005/NSDManagement-API/NSDManagementNotification.robot b/SOL005/NSDManagement-API/NSDManagementNotification.robot
index 0648fb198..df9d2d0e0 100644
--- a/SOL005/NSDManagement-API/NSDManagementNotification.robot
+++ b/SOL005/NSDManagement-API/NSDManagementNotification.robot
@@ -222,8 +222,10 @@ Configure PNFD Deletion Handler
     set to dictionary    ${json}    notificationType    ${type}    
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Configure NSD Deletion Handler
@@ -232,8 +234,10 @@ Configure NSD Deletion Handler
     set to dictionary    ${json}    notificationType    ${type}    
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Configure NSD Operational State Change Handler
@@ -242,8 +246,10 @@ Configure NSD Operational State Change Handler
     set to dictionary    ${json}    notificationType    ${type}    
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Configure PNFD Onboarding Handler
@@ -252,8 +258,10 @@ Configure PNFD Onboarding Handler
     set to dictionary    ${json}    notificationType    ${type}    
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Configure Notification PNFD Onboarding Failure Handler
@@ -262,8 +270,10 @@ Configure Notification PNFD Onboarding Failure Handler
     set to dictionary   ${json}    notificationType    ${type}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Configure NSD Onboarding Handler
@@ -272,8 +282,10 @@ Configure NSD Onboarding Handler
     set to dictionary    ${json}    notificationType    ${type}    
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Configure Notification NSD Onboarding Failure Handler
@@ -282,8 +294,10 @@ Configure Notification NSD Onboarding Failure Handler
     set to dictionary   ${json}    notificationType    ${type}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
   
 Configure Notification Forward
diff --git a/SOL005/NSFaultManagement-API/NotificationEndpoint.robot b/SOL005/NSFaultManagement-API/NotificationEndpoint.robot
index 97421160e..90910ca8d 100644
--- a/SOL005/NSFaultManagement-API/NotificationEndpoint.robot
+++ b/SOL005/NSFaultManagement-API/NotificationEndpoint.robot
@@ -114,9 +114,10 @@ Configure Notification Alarm List Rebuilt Handler
     set to dictionary    ${json}    notificationType    ${type}    
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{headers} =	Create Dictionary	Content-Type=application/json
-    &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Configure Notification Alarm Handler
@@ -125,9 +126,10 @@ Configure Notification Alarm Handler
     set to dictionary    ${json}    notificationType    ${type}    
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{headers} =	Create Dictionary	Content-Type=application/json
-    &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Configure Notification Alarm Cleareance Handler
@@ -136,9 +138,10 @@ Configure Notification Alarm Cleareance Handler
     set to dictionary   ${json}    notificationType    ${type}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{headers} =	Create Dictionary	Content-Type=application/json
-    &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
   
 Configure Notification Forward
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index b0b1d3592..a2b3db706 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -107,9 +107,10 @@ Configure Notification Status Handler
     Run Keyword If   '${status}' != ""  set to dictionary    ${json["notificationStatus"]}    dp=${status}    
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle ${endpoint}
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{headers} =	Create Dictionary	"Content-Type"="application/json"
-    &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}    
         
 Check resource operationState is
@@ -1427,7 +1428,9 @@ Configure Notification NS Creation Deletion Handler
     set to dictionary   ${json}    notificationType    ${type}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
diff --git a/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot b/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot
index fcabe5b10..fee4daecd 100644
--- a/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot
+++ b/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot
@@ -97,9 +97,10 @@ Configure Notification NS LCM Operation Occurrence Start Handler
     set to dictionary   ${json}    notificationType    ${type}    changeType    ${status}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{headers}=  Create Dictionary  Content-Type=application/json
-    &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Check NS LCM Operation Occurrence Result Notification Http POST Request Body Json Schema Is  
@@ -120,9 +121,10 @@ Configure Notification NS LCM Operation Occurrence Result Handler
     set to dictionary   ${json}    notificationType    ${type}    changeType    ${status}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{headers}=  Create Dictionary  Content-Type=application/json
-    &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Check NS Identifier Creation Notification Http POST Request Body Json Schema Is  
@@ -143,9 +145,10 @@ Configure Notification NS Identifier Creation Handler
     set to dictionary   ${json}    notificationType    ${type}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{headers}=  Create Dictionary  Content-Type=application/json
-    &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
     
 Check NS Identifier Deletion Notification Http POST Request Body Json Schema Is  
@@ -166,9 +169,10 @@ Configure Notification NS Identifier Deletion Handler
     set to dictionary   ${json}    notificationType    ${type}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{headers}=  Create Dictionary  Content-Type=application/json
-    &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Check NS LCM Operation Occurrence Start Notification Http POST Request Body notificationStatus attribute Is
diff --git a/SOL005/NSPerformanceManagement-API/Notifications.robot b/SOL005/NSPerformanceManagement-API/Notifications.robot
index 18ab8e3f9..b973b2c6e 100644
--- a/SOL005/NSPerformanceManagement-API/Notifications.robot
+++ b/SOL005/NSPerformanceManagement-API/Notifications.robot
@@ -85,9 +85,10 @@ Configure Notification Performance Information Available Handler
     set to dictionary    ${json}    notificationType    ${type}    
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{headers} =	Create Dictionary	Content-Type=application/json
-    &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Configure Notification Threshold Crossed Handler
@@ -96,9 +97,10 @@ Configure Notification Threshold Crossed Handler
     set to dictionary   ${json}    notificationType    ${type}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{headers} =	Create Dictionary	Content-Type=application/json
-    &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
   
 Configure Notification Forward
diff --git a/SOL005/VNFPackageManagement-API/Notifications.robot b/SOL005/VNFPackageManagement-API/Notifications.robot
index 472dcda79..361499a7b 100644
--- a/SOL005/VNFPackageManagement-API/Notifications.robot
+++ b/SOL005/VNFPackageManagement-API/Notifications.robot
@@ -118,9 +118,10 @@ Configure Notification Onboarding Handler
     set to dictionary    ${json}    notificationType    ${type}    
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{headers} =	Create Dictionary	Content-Type=application/json
-    &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
     Set Suite Variable       ${notification_request}  ${notification_request}
 
@@ -130,9 +131,10 @@ Configure Notification Delete Handler
     set to dictionary   ${json}    notificationType    ${type}    changeType    ${change}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{headers} =	Create Dictionary	Content-Type=application/json
-    &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
 
 Configure Notification Change Status Handler
@@ -141,8 +143,10 @@ Configure Notification Change Status Handler
     set to dictionary   ${json}    notificationType    ${type}    changeType    ${change}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{headers} =    Create Dictionary    Content-Type=application/json
+    &{notification_response}=  Create Mock Response    headers=${headers}    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
   
 Configure Notification Forward
-- 
GitLab


From 70e6b62533e8940133bc74c509a4edd82776c6ba Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Tue, 2 Mar 2021 11:07:22 +0100
Subject: [PATCH 303/322] fix issue #166 on v2.7.1

---
 .../VNFPackageManagement-API/VNFPackageManagementKeywords.robot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index f03a46834..8fcb2b1cf 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -106,7 +106,7 @@ Check HTTP Response Body VnfPkgsInfo Matches the requested all_fields selector
     Validate Json    additionalArtifacts.schema.json    ${additional_artifacts[0]}
     Log    Validation for additionalArtifacts schema OK
     ${links}=    Get Value From Json    ${response['body']}    $.._links
-    Validate Json    links.schema.json    ${links}
+    Validate Json    links.schema.json    ${links[0]}
     Log    Validation for _links schema OK
 
 GET VNF Packages with exclude_default attribute selector
-- 
GitLab


From b3aae42aa38e029ae211ff82a407eefd1e657aa5 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Wed, 3 Mar 2021 09:40:06 +0100
Subject: [PATCH 304/322] fixed exmples of VNFDs

---
 .../descriptors/SOL001/VNFD/vnfd_SOL001.yaml  | 183 ++++++++----------
 .../environment/variables.txt                 |   2 +-
 .../descriptors/SOL001/VNFD/vnfd_SOL001.yaml  | 183 ++++++++----------
 .../environment/variables.txt                 |   2 +-
 .../descriptors/SOL001/VNFD/vnfd_SOL001.yaml  | 183 ++++++++----------
 .../environment/variables.txt                 |   1 +
 .../descriptors/SOL001/VNFD/vnfd_SOL001.yaml  | 183 ++++++++----------
 .../environment/variables.txt                 |   2 +
 .../descriptors/SOL001/NSD/nsd_SOL001.yaml    |   4 +
 .../IndividualNSInstance.robot                |   4 +-
 .../NSLCMOperationKeywords.robot              |   9 +-
 .../descriptors/SOL001/NSD/nsd_SOL001.yaml    |   4 +
 .../descriptors/SOL001/VNFD/vnfd_SOL001.yaml  | 183 ++++++++----------
 .../environment/variables.txt                 |   2 +-
 .../descriptors/SOL001/VNFD/vnfd_SOL001.yaml  | 183 ++++++++----------
 .../environment/variables.txt                 |   2 +-
 16 files changed, 517 insertions(+), 613 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml b/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
index e9159106a..fdcf741de 100644
--- a/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
+++ b/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
@@ -1,19 +1,70 @@
 tosca_definitions_version: tosca_simple_yaml_1_2
 description: "TST010 reference VNF-B"
+
+imports:
+  - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.7.1/etsi_nfv_sol001_vnfd_types.yaml
+
 metadata:
   descriptor_id: "VNF-B"
   vendor: "ETSI TST WG"
   version: "2.0"
+
+node_types:
+  tst010.vnf.simple:
+    derived_from: tosca.nodes.nfv.VNF
+    properties:
+      descriptor_id:
+        type: string
+        default: VNF-B
+      descriptor_version:
+        type: string
+        default: '1.0'
+      provider:
+        type: string
+        default: ETSI TST WG
+      product_name:
+        type: string
+        default: VNF-B
+      software_version:
+        type: string
+        default: '1.0'
+      product_info_name:
+        type: string
+        default: VNF-B
+      product_info_description:
+        type: string
+        default: TST010 reference VNF-B
+      flavour_id:
+        type: string
+        default: VNF-B_flavor
+      flavour_description:
+        type: string
+        default: "VNF-B flavor"
+      vnfm_info:
+        type: list
+        entry_schema:
+          type: string
+          default: [ 'etsivnfm:v2.3.1' ]
+    interfaces:
+      Vnflcm:
+        type: "tosca.interfaces.nfv.Vnflcm"
+        scale:
+          description: Invoked upon receipt of a Scale VNF request
+        terminate:
+          description: Invoked upon receipt Terminate VNF request
+        operate:
+          description: Invoked upon receipt of an Operate VNF request
+
 topology_template:
   substitution_mappings:
-    node_type: "tosca.nodes.nfv.VNF"
+    node_type: "tst010.vnf.simple"
     requirements:
+      virtual_link_right:
+        [right, virtual_link_right]
       virtual_link_management:
         [management, virtual_link_management]
       virtual_link_left:
         [left, virtual_link_left]
-      virtual_link_right:
-        [right, virtual_link_right]
   node_templates:
     right:
       type: "tosca.nodes.nfv.VduCp"
@@ -21,49 +72,22 @@ topology_template:
         order: 1
       requirements:
         virtual_link_right:
-        virtual_binding: VDU-B-2
+        virtual_binding: VDU-B
     management:
       type: "tosca.nodes.nfv.VduCp"
       properties:
         order: 0
       requirements:
         virtual_link_management:
-        virtual_binding: VDU-B-1
+        virtual_binding: VDU-B
     left:
       type: "tosca.nodes.nfv.VduCp"
       properties:
         order: 2
       requirements:
         virtual_link_left:
-        virtual_binding: VDU-B-1
-    internal_vl:
-      type: "tosca.nodes.nfv.VnfVirtualLink"
-      properties:
-        connectivity_type:
-          layer_protocols: [ ipv4 ]
-        description: Internal Virtual link in the VNF
-        vl_profile:
-          max_bitrate_requirements:
-            root: 100000
-            leaf: 20000
-          min_bitrate_requirements:
-            root: 10000
-            leaf: 10000
-    internal_vdu_b_1_cp:
-      type: "tosca.nodes.nfv.VduCp"
-      properties:
-        order: 2
-      requirements:
-        - virtual_binding: VDU-B-1
-        - virtual_link: internal_vl
-    internal_vdu_b_2_cp:
-      type: "tosca.nodes.nfv.VduCp"
-      properties:
-        order: 0
-      requirements:
-        - virtual_binding: VDU-B-2
-        - virtual_link: internal_vl
-    vdu_b_1_vsd:
+        virtual_binding: VDU-B
+    vdu-b-1-vsd:
       type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
       properties:
         virtual_block_storage_data:
@@ -80,55 +104,7 @@ topology_template:
           min-disk: '1'
           min-ram: '2'
           size: '1'
-      artifacts:
-        sw_image:
-          type: "tosca.artifacts.nfv.SwImage"
-          file: vdu-b-1.qcow2
-    vdu_b_2_vsd:
-      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
-      properties:
-        virtual_block_storage_data:
-          size_of_storage: 20
-          rdma_enabled: false
-        sw_image_data:
-          name: "vdu-b-2 image"
-          version: "1.1"
-          checksum: 
-            algorithm: "sha-224"
-            hash: "somehashfortst010"
-          container_format: "bare"
-          disk-format: qcow2
-          min-disk: '1'
-          min-ram: '2'
-          size: '1'
-      artifacts:
-        sw_image:
-          type: tosca.artifacts.nfv.SwImage
-          file: vdu-b-2.qcow2
-    vnf_b_1_VNF:
-      type: "tosca.nodes.nfv.VNF"
-      properties:
-        descriptor_id: "VNF-B-2VDUs"
-        descriptor_version: "2.0"
-        provider: "ETSI TST WG"
-        product_name: "VNF-B-2VDUs"
-        software_version: "2.0"
-        product_info_name: "VNF-B-2VDUs"
-        product_info_description: "TST010 reference VNF-B with 2 VDUs"
-        flavour_id: "VNF-B-2VDU_flavor"
-        flavour_description: "VNF-B with 2 VDUs flavor"
-        vnfm_info: 
-          etsivnfm: 
-          - v2.3.1 
-        interfaces:
-            Vnflcm:
-              scale:
-                implementation: scale-example.yaml
-              terminate:
-                implementation: terminate-example.yaml
-              operate:
-                implementation: operate-example.yaml
-    VDU_B_1:
+    VDU-B:
       type: "tosca.nodes.nfv.Vdu.Compute"
       properties:
         name: "vdu-b-1-vcd"
@@ -147,22 +123,27 @@ topology_template:
       requirements:
         virtual_storage:
         - "vdu-b-1-vsd"
-    VDU_B_2:
-      type: "tosca.nodes.nfv.Vdu.Compute"
+    vnf-b-1_VNF:
+      type: "tst010.vnf.simple"
       properties:
-        name: "vdu-b-2-vcd"
-        descriptor: "Description of VDU-B-2"
-        vdu_profile:
-          min_number_of_instances: 1
-          max_number_of_instances: 4
-      capabilities:
-        virtual_compute:
-          properties:
-            virtual_memory:
-              virtual_mem_size: 6144
-              numa_enabled: false
-            virtual_cpu:
-              num_virtual_cpu: 2
-      requirements:
-        virtual_storage:
-        - "vdu-b-2-vsd"                
\ No newline at end of file
+        descriptor_id: "VNF-B"
+        descriptor_version: "2.0"
+        provider: "ETSI TST WG"
+        product_name: "VDU_VNF-B"
+        software_version: "2.0"
+        product_info_name: "VDU_VNF-B"
+        product_info_description: "TST010 reference VNF-A"
+        flavour_id: "VNF-B_flavor"
+        flavour_description: "VNF-B flavor"
+        vnfm_info: 
+          - etsivnfm:v2.3.1 
+      interfaces:
+        Vnflcm:
+          type: "tosca.interfaces.nfv.Vnflcm"
+          scale:
+            implementation: scale-example.yaml
+          terminate:
+            implementation: terminate-example.yaml
+          operate:
+            implementation: operate-example.yaml
+
diff --git a/SOL002/VNFLifecycleManagement-API/environment/variables.txt b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
index 7a8e8c363..835a6f17a 100644
--- a/SOL002/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
@@ -86,7 +86,7 @@ ${descriptorType}    SOL006
 ${check_multiple_instances}    0
 
 ${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute
-${tosca_type_VNF}    tosca.nodes.nfv.VNF
+${tosca_type_VNF}    tst010.vnf.simple    # custom tosca type defined in the descriptor vnfd_SOL001.yaml in descriptors folder
 ${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
 ${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
 ${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage
diff --git a/SOL003/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml b/SOL003/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
index e9159106a..fdcf741de 100644
--- a/SOL003/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
+++ b/SOL003/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
@@ -1,19 +1,70 @@
 tosca_definitions_version: tosca_simple_yaml_1_2
 description: "TST010 reference VNF-B"
+
+imports:
+  - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.7.1/etsi_nfv_sol001_vnfd_types.yaml
+
 metadata:
   descriptor_id: "VNF-B"
   vendor: "ETSI TST WG"
   version: "2.0"
+
+node_types:
+  tst010.vnf.simple:
+    derived_from: tosca.nodes.nfv.VNF
+    properties:
+      descriptor_id:
+        type: string
+        default: VNF-B
+      descriptor_version:
+        type: string
+        default: '1.0'
+      provider:
+        type: string
+        default: ETSI TST WG
+      product_name:
+        type: string
+        default: VNF-B
+      software_version:
+        type: string
+        default: '1.0'
+      product_info_name:
+        type: string
+        default: VNF-B
+      product_info_description:
+        type: string
+        default: TST010 reference VNF-B
+      flavour_id:
+        type: string
+        default: VNF-B_flavor
+      flavour_description:
+        type: string
+        default: "VNF-B flavor"
+      vnfm_info:
+        type: list
+        entry_schema:
+          type: string
+          default: [ 'etsivnfm:v2.3.1' ]
+    interfaces:
+      Vnflcm:
+        type: "tosca.interfaces.nfv.Vnflcm"
+        scale:
+          description: Invoked upon receipt of a Scale VNF request
+        terminate:
+          description: Invoked upon receipt Terminate VNF request
+        operate:
+          description: Invoked upon receipt of an Operate VNF request
+
 topology_template:
   substitution_mappings:
-    node_type: "tosca.nodes.nfv.VNF"
+    node_type: "tst010.vnf.simple"
     requirements:
+      virtual_link_right:
+        [right, virtual_link_right]
       virtual_link_management:
         [management, virtual_link_management]
       virtual_link_left:
         [left, virtual_link_left]
-      virtual_link_right:
-        [right, virtual_link_right]
   node_templates:
     right:
       type: "tosca.nodes.nfv.VduCp"
@@ -21,49 +72,22 @@ topology_template:
         order: 1
       requirements:
         virtual_link_right:
-        virtual_binding: VDU-B-2
+        virtual_binding: VDU-B
     management:
       type: "tosca.nodes.nfv.VduCp"
       properties:
         order: 0
       requirements:
         virtual_link_management:
-        virtual_binding: VDU-B-1
+        virtual_binding: VDU-B
     left:
       type: "tosca.nodes.nfv.VduCp"
       properties:
         order: 2
       requirements:
         virtual_link_left:
-        virtual_binding: VDU-B-1
-    internal_vl:
-      type: "tosca.nodes.nfv.VnfVirtualLink"
-      properties:
-        connectivity_type:
-          layer_protocols: [ ipv4 ]
-        description: Internal Virtual link in the VNF
-        vl_profile:
-          max_bitrate_requirements:
-            root: 100000
-            leaf: 20000
-          min_bitrate_requirements:
-            root: 10000
-            leaf: 10000
-    internal_vdu_b_1_cp:
-      type: "tosca.nodes.nfv.VduCp"
-      properties:
-        order: 2
-      requirements:
-        - virtual_binding: VDU-B-1
-        - virtual_link: internal_vl
-    internal_vdu_b_2_cp:
-      type: "tosca.nodes.nfv.VduCp"
-      properties:
-        order: 0
-      requirements:
-        - virtual_binding: VDU-B-2
-        - virtual_link: internal_vl
-    vdu_b_1_vsd:
+        virtual_binding: VDU-B
+    vdu-b-1-vsd:
       type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
       properties:
         virtual_block_storage_data:
@@ -80,55 +104,7 @@ topology_template:
           min-disk: '1'
           min-ram: '2'
           size: '1'
-      artifacts:
-        sw_image:
-          type: "tosca.artifacts.nfv.SwImage"
-          file: vdu-b-1.qcow2
-    vdu_b_2_vsd:
-      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
-      properties:
-        virtual_block_storage_data:
-          size_of_storage: 20
-          rdma_enabled: false
-        sw_image_data:
-          name: "vdu-b-2 image"
-          version: "1.1"
-          checksum: 
-            algorithm: "sha-224"
-            hash: "somehashfortst010"
-          container_format: "bare"
-          disk-format: qcow2
-          min-disk: '1'
-          min-ram: '2'
-          size: '1'
-      artifacts:
-        sw_image:
-          type: tosca.artifacts.nfv.SwImage
-          file: vdu-b-2.qcow2
-    vnf_b_1_VNF:
-      type: "tosca.nodes.nfv.VNF"
-      properties:
-        descriptor_id: "VNF-B-2VDUs"
-        descriptor_version: "2.0"
-        provider: "ETSI TST WG"
-        product_name: "VNF-B-2VDUs"
-        software_version: "2.0"
-        product_info_name: "VNF-B-2VDUs"
-        product_info_description: "TST010 reference VNF-B with 2 VDUs"
-        flavour_id: "VNF-B-2VDU_flavor"
-        flavour_description: "VNF-B with 2 VDUs flavor"
-        vnfm_info: 
-          etsivnfm: 
-          - v2.3.1 
-        interfaces:
-            Vnflcm:
-              scale:
-                implementation: scale-example.yaml
-              terminate:
-                implementation: terminate-example.yaml
-              operate:
-                implementation: operate-example.yaml
-    VDU_B_1:
+    VDU-B:
       type: "tosca.nodes.nfv.Vdu.Compute"
       properties:
         name: "vdu-b-1-vcd"
@@ -147,22 +123,27 @@ topology_template:
       requirements:
         virtual_storage:
         - "vdu-b-1-vsd"
-    VDU_B_2:
-      type: "tosca.nodes.nfv.Vdu.Compute"
+    vnf-b-1_VNF:
+      type: "tst010.vnf.simple"
       properties:
-        name: "vdu-b-2-vcd"
-        descriptor: "Description of VDU-B-2"
-        vdu_profile:
-          min_number_of_instances: 1
-          max_number_of_instances: 4
-      capabilities:
-        virtual_compute:
-          properties:
-            virtual_memory:
-              virtual_mem_size: 6144
-              numa_enabled: false
-            virtual_cpu:
-              num_virtual_cpu: 2
-      requirements:
-        virtual_storage:
-        - "vdu-b-2-vsd"                
\ No newline at end of file
+        descriptor_id: "VNF-B"
+        descriptor_version: "2.0"
+        provider: "ETSI TST WG"
+        product_name: "VDU_VNF-B"
+        software_version: "2.0"
+        product_info_name: "VDU_VNF-B"
+        product_info_description: "TST010 reference VNF-A"
+        flavour_id: "VNF-B_flavor"
+        flavour_description: "VNF-B flavor"
+        vnfm_info: 
+          - etsivnfm:v2.3.1 
+      interfaces:
+        Vnflcm:
+          type: "tosca.interfaces.nfv.Vnflcm"
+          scale:
+            implementation: scale-example.yaml
+          terminate:
+            implementation: terminate-example.yaml
+          operate:
+            implementation: operate-example.yaml
+
diff --git a/SOL003/VNFLifecycleManagement-API/environment/variables.txt b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
index 116c942ab..d8e12f693 100644
--- a/SOL003/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
@@ -108,7 +108,7 @@ ${descriptorType}    SOL001
 ${check_descriptors}	1
 
 ${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute
-${tosca_type_VNF}    tosca.nodes.nfv.VNF
+${tosca_type_VNF}    tst010.vnf.simple    # custom tosca type defined in the descriptor vnfd_SOL001.yaml in descriptors folder
 ${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
 ${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
 ${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage
diff --git a/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml b/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
index e9159106a..fdcf741de 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
+++ b/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
@@ -1,19 +1,70 @@
 tosca_definitions_version: tosca_simple_yaml_1_2
 description: "TST010 reference VNF-B"
+
+imports:
+  - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.7.1/etsi_nfv_sol001_vnfd_types.yaml
+
 metadata:
   descriptor_id: "VNF-B"
   vendor: "ETSI TST WG"
   version: "2.0"
+
+node_types:
+  tst010.vnf.simple:
+    derived_from: tosca.nodes.nfv.VNF
+    properties:
+      descriptor_id:
+        type: string
+        default: VNF-B
+      descriptor_version:
+        type: string
+        default: '1.0'
+      provider:
+        type: string
+        default: ETSI TST WG
+      product_name:
+        type: string
+        default: VNF-B
+      software_version:
+        type: string
+        default: '1.0'
+      product_info_name:
+        type: string
+        default: VNF-B
+      product_info_description:
+        type: string
+        default: TST010 reference VNF-B
+      flavour_id:
+        type: string
+        default: VNF-B_flavor
+      flavour_description:
+        type: string
+        default: "VNF-B flavor"
+      vnfm_info:
+        type: list
+        entry_schema:
+          type: string
+          default: [ 'etsivnfm:v2.3.1' ]
+    interfaces:
+      Vnflcm:
+        type: "tosca.interfaces.nfv.Vnflcm"
+        scale:
+          description: Invoked upon receipt of a Scale VNF request
+        terminate:
+          description: Invoked upon receipt Terminate VNF request
+        operate:
+          description: Invoked upon receipt of an Operate VNF request
+
 topology_template:
   substitution_mappings:
-    node_type: "tosca.nodes.nfv.VNF"
+    node_type: "tst010.vnf.simple"
     requirements:
+      virtual_link_right:
+        [right, virtual_link_right]
       virtual_link_management:
         [management, virtual_link_management]
       virtual_link_left:
         [left, virtual_link_left]
-      virtual_link_right:
-        [right, virtual_link_right]
   node_templates:
     right:
       type: "tosca.nodes.nfv.VduCp"
@@ -21,49 +72,22 @@ topology_template:
         order: 1
       requirements:
         virtual_link_right:
-        virtual_binding: VDU-B-2
+        virtual_binding: VDU-B
     management:
       type: "tosca.nodes.nfv.VduCp"
       properties:
         order: 0
       requirements:
         virtual_link_management:
-        virtual_binding: VDU-B-1
+        virtual_binding: VDU-B
     left:
       type: "tosca.nodes.nfv.VduCp"
       properties:
         order: 2
       requirements:
         virtual_link_left:
-        virtual_binding: VDU-B-1
-    internal_vl:
-      type: "tosca.nodes.nfv.VnfVirtualLink"
-      properties:
-        connectivity_type:
-          layer_protocols: [ ipv4 ]
-        description: Internal Virtual link in the VNF
-        vl_profile:
-          max_bitrate_requirements:
-            root: 100000
-            leaf: 20000
-          min_bitrate_requirements:
-            root: 10000
-            leaf: 10000
-    internal_vdu_b_1_cp:
-      type: "tosca.nodes.nfv.VduCp"
-      properties:
-        order: 2
-      requirements:
-        - virtual_binding: VDU-B-1
-        - virtual_link: internal_vl
-    internal_vdu_b_2_cp:
-      type: "tosca.nodes.nfv.VduCp"
-      properties:
-        order: 0
-      requirements:
-        - virtual_binding: VDU-B-2
-        - virtual_link: internal_vl
-    vdu_b_1_vsd:
+        virtual_binding: VDU-B
+    vdu-b-1-vsd:
       type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
       properties:
         virtual_block_storage_data:
@@ -80,55 +104,7 @@ topology_template:
           min-disk: '1'
           min-ram: '2'
           size: '1'
-      artifacts:
-        sw_image:
-          type: "tosca.artifacts.nfv.SwImage"
-          file: vdu-b-1.qcow2
-    vdu_b_2_vsd:
-      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
-      properties:
-        virtual_block_storage_data:
-          size_of_storage: 20
-          rdma_enabled: false
-        sw_image_data:
-          name: "vdu-b-2 image"
-          version: "1.1"
-          checksum: 
-            algorithm: "sha-224"
-            hash: "somehashfortst010"
-          container_format: "bare"
-          disk-format: qcow2
-          min-disk: '1'
-          min-ram: '2'
-          size: '1'
-      artifacts:
-        sw_image:
-          type: tosca.artifacts.nfv.SwImage
-          file: vdu-b-2.qcow2
-    vnf_b_1_VNF:
-      type: "tosca.nodes.nfv.VNF"
-      properties:
-        descriptor_id: "VNF-B-2VDUs"
-        descriptor_version: "2.0"
-        provider: "ETSI TST WG"
-        product_name: "VNF-B-2VDUs"
-        software_version: "2.0"
-        product_info_name: "VNF-B-2VDUs"
-        product_info_description: "TST010 reference VNF-B with 2 VDUs"
-        flavour_id: "VNF-B-2VDU_flavor"
-        flavour_description: "VNF-B with 2 VDUs flavor"
-        vnfm_info: 
-          etsivnfm: 
-          - v2.3.1 
-        interfaces:
-            Vnflcm:
-              scale:
-                implementation: scale-example.yaml
-              terminate:
-                implementation: terminate-example.yaml
-              operate:
-                implementation: operate-example.yaml
-    VDU_B_1:
+    VDU-B:
       type: "tosca.nodes.nfv.Vdu.Compute"
       properties:
         name: "vdu-b-1-vcd"
@@ -147,22 +123,27 @@ topology_template:
       requirements:
         virtual_storage:
         - "vdu-b-1-vsd"
-    VDU_B_2:
-      type: "tosca.nodes.nfv.Vdu.Compute"
+    vnf-b-1_VNF:
+      type: "tst010.vnf.simple"
       properties:
-        name: "vdu-b-2-vcd"
-        descriptor: "Description of VDU-B-2"
-        vdu_profile:
-          min_number_of_instances: 1
-          max_number_of_instances: 4
-      capabilities:
-        virtual_compute:
-          properties:
-            virtual_memory:
-              virtual_mem_size: 6144
-              numa_enabled: false
-            virtual_cpu:
-              num_virtual_cpu: 2
-      requirements:
-        virtual_storage:
-        - "vdu-b-2-vsd"                
\ No newline at end of file
+        descriptor_id: "VNF-B"
+        descriptor_version: "2.0"
+        provider: "ETSI TST WG"
+        product_name: "VDU_VNF-B"
+        software_version: "2.0"
+        product_info_name: "VDU_VNF-B"
+        product_info_description: "TST010 reference VNF-A"
+        flavour_id: "VNF-B_flavor"
+        flavour_description: "VNF-B flavor"
+        vnfm_info: 
+          - etsivnfm:v2.3.1 
+      interfaces:
+        Vnflcm:
+          type: "tosca.interfaces.nfv.Vnflcm"
+          scale:
+            implementation: scale-example.yaml
+          terminate:
+            implementation: terminate-example.yaml
+          operate:
+            implementation: operate-example.yaml
+
diff --git a/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt b/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
index dbbedb4bf..1355aa159 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
+++ b/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
@@ -47,6 +47,7 @@ ${flavourId}    string
 ${descriptorType}    SOL001
 ${check_descriptors}	1
 
+${tosca_type_VNF}    tst010.vnf.simple    # custom tosca type defined in the descriptor vnfd_SOL001.yaml in descriptors folder
 ${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute
 ${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
 ${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
diff --git a/SOL003/VNFPackageManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml b/SOL003/VNFPackageManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
index e9159106a..fdcf741de 100644
--- a/SOL003/VNFPackageManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
+++ b/SOL003/VNFPackageManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
@@ -1,19 +1,70 @@
 tosca_definitions_version: tosca_simple_yaml_1_2
 description: "TST010 reference VNF-B"
+
+imports:
+  - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.7.1/etsi_nfv_sol001_vnfd_types.yaml
+
 metadata:
   descriptor_id: "VNF-B"
   vendor: "ETSI TST WG"
   version: "2.0"
+
+node_types:
+  tst010.vnf.simple:
+    derived_from: tosca.nodes.nfv.VNF
+    properties:
+      descriptor_id:
+        type: string
+        default: VNF-B
+      descriptor_version:
+        type: string
+        default: '1.0'
+      provider:
+        type: string
+        default: ETSI TST WG
+      product_name:
+        type: string
+        default: VNF-B
+      software_version:
+        type: string
+        default: '1.0'
+      product_info_name:
+        type: string
+        default: VNF-B
+      product_info_description:
+        type: string
+        default: TST010 reference VNF-B
+      flavour_id:
+        type: string
+        default: VNF-B_flavor
+      flavour_description:
+        type: string
+        default: "VNF-B flavor"
+      vnfm_info:
+        type: list
+        entry_schema:
+          type: string
+          default: [ 'etsivnfm:v2.3.1' ]
+    interfaces:
+      Vnflcm:
+        type: "tosca.interfaces.nfv.Vnflcm"
+        scale:
+          description: Invoked upon receipt of a Scale VNF request
+        terminate:
+          description: Invoked upon receipt Terminate VNF request
+        operate:
+          description: Invoked upon receipt of an Operate VNF request
+
 topology_template:
   substitution_mappings:
-    node_type: "tosca.nodes.nfv.VNF"
+    node_type: "tst010.vnf.simple"
     requirements:
+      virtual_link_right:
+        [right, virtual_link_right]
       virtual_link_management:
         [management, virtual_link_management]
       virtual_link_left:
         [left, virtual_link_left]
-      virtual_link_right:
-        [right, virtual_link_right]
   node_templates:
     right:
       type: "tosca.nodes.nfv.VduCp"
@@ -21,49 +72,22 @@ topology_template:
         order: 1
       requirements:
         virtual_link_right:
-        virtual_binding: VDU-B-2
+        virtual_binding: VDU-B
     management:
       type: "tosca.nodes.nfv.VduCp"
       properties:
         order: 0
       requirements:
         virtual_link_management:
-        virtual_binding: VDU-B-1
+        virtual_binding: VDU-B
     left:
       type: "tosca.nodes.nfv.VduCp"
       properties:
         order: 2
       requirements:
         virtual_link_left:
-        virtual_binding: VDU-B-1
-    internal_vl:
-      type: "tosca.nodes.nfv.VnfVirtualLink"
-      properties:
-        connectivity_type:
-          layer_protocols: [ ipv4 ]
-        description: Internal Virtual link in the VNF
-        vl_profile:
-          max_bitrate_requirements:
-            root: 100000
-            leaf: 20000
-          min_bitrate_requirements:
-            root: 10000
-            leaf: 10000
-    internal_vdu_b_1_cp:
-      type: "tosca.nodes.nfv.VduCp"
-      properties:
-        order: 2
-      requirements:
-        - virtual_binding: VDU-B-1
-        - virtual_link: internal_vl
-    internal_vdu_b_2_cp:
-      type: "tosca.nodes.nfv.VduCp"
-      properties:
-        order: 0
-      requirements:
-        - virtual_binding: VDU-B-2
-        - virtual_link: internal_vl
-    vdu_b_1_vsd:
+        virtual_binding: VDU-B
+    vdu-b-1-vsd:
       type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
       properties:
         virtual_block_storage_data:
@@ -80,55 +104,7 @@ topology_template:
           min-disk: '1'
           min-ram: '2'
           size: '1'
-      artifacts:
-        sw_image:
-          type: "tosca.artifacts.nfv.SwImage"
-          file: vdu-b-1.qcow2
-    vdu_b_2_vsd:
-      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
-      properties:
-        virtual_block_storage_data:
-          size_of_storage: 20
-          rdma_enabled: false
-        sw_image_data:
-          name: "vdu-b-2 image"
-          version: "1.1"
-          checksum: 
-            algorithm: "sha-224"
-            hash: "somehashfortst010"
-          container_format: "bare"
-          disk-format: qcow2
-          min-disk: '1'
-          min-ram: '2'
-          size: '1'
-      artifacts:
-        sw_image:
-          type: tosca.artifacts.nfv.SwImage
-          file: vdu-b-2.qcow2
-    vnf_b_1_VNF:
-      type: "tosca.nodes.nfv.VNF"
-      properties:
-        descriptor_id: "VNF-B-2VDUs"
-        descriptor_version: "2.0"
-        provider: "ETSI TST WG"
-        product_name: "VNF-B-2VDUs"
-        software_version: "2.0"
-        product_info_name: "VNF-B-2VDUs"
-        product_info_description: "TST010 reference VNF-B with 2 VDUs"
-        flavour_id: "VNF-B-2VDU_flavor"
-        flavour_description: "VNF-B with 2 VDUs flavor"
-        vnfm_info: 
-          etsivnfm: 
-          - v2.3.1 
-        interfaces:
-            Vnflcm:
-              scale:
-                implementation: scale-example.yaml
-              terminate:
-                implementation: terminate-example.yaml
-              operate:
-                implementation: operate-example.yaml
-    VDU_B_1:
+    VDU-B:
       type: "tosca.nodes.nfv.Vdu.Compute"
       properties:
         name: "vdu-b-1-vcd"
@@ -147,22 +123,27 @@ topology_template:
       requirements:
         virtual_storage:
         - "vdu-b-1-vsd"
-    VDU_B_2:
-      type: "tosca.nodes.nfv.Vdu.Compute"
+    vnf-b-1_VNF:
+      type: "tst010.vnf.simple"
       properties:
-        name: "vdu-b-2-vcd"
-        descriptor: "Description of VDU-B-2"
-        vdu_profile:
-          min_number_of_instances: 1
-          max_number_of_instances: 4
-      capabilities:
-        virtual_compute:
-          properties:
-            virtual_memory:
-              virtual_mem_size: 6144
-              numa_enabled: false
-            virtual_cpu:
-              num_virtual_cpu: 2
-      requirements:
-        virtual_storage:
-        - "vdu-b-2-vsd"                
\ No newline at end of file
+        descriptor_id: "VNF-B"
+        descriptor_version: "2.0"
+        provider: "ETSI TST WG"
+        product_name: "VDU_VNF-B"
+        software_version: "2.0"
+        product_info_name: "VDU_VNF-B"
+        product_info_description: "TST010 reference VNF-A"
+        flavour_id: "VNF-B_flavor"
+        flavour_description: "VNF-B flavor"
+        vnfm_info: 
+          - etsivnfm:v2.3.1 
+      interfaces:
+        Vnflcm:
+          type: "tosca.interfaces.nfv.Vnflcm"
+          scale:
+            implementation: scale-example.yaml
+          terminate:
+            implementation: terminate-example.yaml
+          operate:
+            implementation: operate-example.yaml
+
diff --git a/SOL003/VNFPackageManagement-API/environment/variables.txt b/SOL003/VNFPackageManagement-API/environment/variables.txt
index 2e85f19b4..18ab0c53a 100644
--- a/SOL003/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL003/VNFPackageManagement-API/environment/variables.txt
@@ -92,6 +92,8 @@ ${callbackResp}    localhost
 ${descriptorType}    SOL001
 ${check_descriptors}	1
 
+${tosca_type_VNF}    tst010.vnf.simple    # custom tosca type defined in the descriptor vnfd_SOL001.yaml in descriptors folder
+
 ${Descriptor_ID}
 ${Provider}
 ${Product_Name}
diff --git a/SOL005/NSDManagement-API/descriptors/SOL001/NSD/nsd_SOL001.yaml b/SOL005/NSDManagement-API/descriptors/SOL001/NSD/nsd_SOL001.yaml
index a2a363b27..a1c3a8d51 100644
--- a/SOL005/NSDManagement-API/descriptors/SOL001/NSD/nsd_SOL001.yaml
+++ b/SOL005/NSDManagement-API/descriptors/SOL001/NSD/nsd_SOL001.yaml
@@ -1,6 +1,10 @@
 tosca_definitions_version: "tosca_simple_yaml_1_2"
 tosca_default_namespace: "toscanfv"
 description: "Referenxce NSD descriptor "
+
+imports:
+  - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.7.1/etsi_nfv_sol001_nsd_types.yaml
+
 metadata:
   descriptor_id: "NSD_WITH_2_VNF"
   vendor: "ETSI"
diff --git a/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot b/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
index 7fdf881d8..e168b373e 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
@@ -81,7 +81,7 @@ DELETE Individual NSInstance Conflict
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: Check Postcondition NS Instance is not deleted
-    DELETE IndividualNSInstance
+    DELETE IndividualNSInstance Conflict
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
-    Check Postcondition NS Instance is not deleted
\ No newline at end of file
+    Check Postcondition NS Conflict Instance is not deleted
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index a2b3db706..5147f3733 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -224,7 +224,14 @@ Check Postcondition NS Instance is not deleted
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId} 
     Integer    response status    200
-    
+
+Check Postcondition NS Conflict Instance is not deleted
+    Set Headers    {"Accept":"${ACCEPT}"}  
+    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${ConflictNsInstanceId} 
+    Integer    response status    200
+
 Check HTTP Response Header ContentType is
     [Arguments]    ${expected_contentType}
     Log    Validate content type
diff --git a/SOL005/NSLifecycleManagement-API/descriptors/SOL001/NSD/nsd_SOL001.yaml b/SOL005/NSLifecycleManagement-API/descriptors/SOL001/NSD/nsd_SOL001.yaml
index 484f96376..ee6a14946 100644
--- a/SOL005/NSLifecycleManagement-API/descriptors/SOL001/NSD/nsd_SOL001.yaml
+++ b/SOL005/NSLifecycleManagement-API/descriptors/SOL001/NSD/nsd_SOL001.yaml
@@ -1,6 +1,10 @@
 tosca_definitions_version: "tosca_simple_yaml_1_2"
 tosca_default_namespace: "toscanfv"
 description: "Referenxce NSD descriptor "
+
+imports:
+  - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.7.1/etsi_nfv_sol001_nsd_types.yaml
+
 metadata:
   descriptor_id: "NSD_WITH_1_VNF"
   vendor: "ETSI"
diff --git a/SOL005/NSLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml b/SOL005/NSLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
index 3a90f45bf..fdcf741de 100644
--- a/SOL005/NSLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
+++ b/SOL005/NSLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
@@ -1,19 +1,70 @@
 tosca_definitions_version: tosca_simple_yaml_1_2
 description: "TST010 reference VNF-B"
+
+imports:
+  - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.7.1/etsi_nfv_sol001_vnfd_types.yaml
+
 metadata:
   descriptor_id: "VNF-B"
   vendor: "ETSI TST WG"
   version: "2.0"
+
+node_types:
+  tst010.vnf.simple:
+    derived_from: tosca.nodes.nfv.VNF
+    properties:
+      descriptor_id:
+        type: string
+        default: VNF-B
+      descriptor_version:
+        type: string
+        default: '1.0'
+      provider:
+        type: string
+        default: ETSI TST WG
+      product_name:
+        type: string
+        default: VNF-B
+      software_version:
+        type: string
+        default: '1.0'
+      product_info_name:
+        type: string
+        default: VNF-B
+      product_info_description:
+        type: string
+        default: TST010 reference VNF-B
+      flavour_id:
+        type: string
+        default: VNF-B_flavor
+      flavour_description:
+        type: string
+        default: "VNF-B flavor"
+      vnfm_info:
+        type: list
+        entry_schema:
+          type: string
+          default: [ 'etsivnfm:v2.3.1' ]
+    interfaces:
+      Vnflcm:
+        type: "tosca.interfaces.nfv.Vnflcm"
+        scale:
+          description: Invoked upon receipt of a Scale VNF request
+        terminate:
+          description: Invoked upon receipt Terminate VNF request
+        operate:
+          description: Invoked upon receipt of an Operate VNF request
+
 topology_template:
   substitution_mappings:
-    node_type: "tosca.nodes.nfv.VNF"
+    node_type: "tst010.vnf.simple"
     requirements:
+      virtual_link_right:
+        [right, virtual_link_right]
       virtual_link_management:
         [management, virtual_link_management]
       virtual_link_left:
         [left, virtual_link_left]
-      virtual_link_right:
-        [right, virtual_link_right]
   node_templates:
     right:
       type: "tosca.nodes.nfv.VduCp"
@@ -21,49 +72,22 @@ topology_template:
         order: 1
       requirements:
         virtual_link_right:
-        virtual_binding: VDU-B-2
+        virtual_binding: VDU-B
     management:
       type: "tosca.nodes.nfv.VduCp"
       properties:
         order: 0
       requirements:
         virtual_link_management:
-        virtual_binding: VDU-B-1
+        virtual_binding: VDU-B
     left:
       type: "tosca.nodes.nfv.VduCp"
       properties:
         order: 2
       requirements:
         virtual_link_left:
-        virtual_binding: VDU-B-1
-    internal_vl:
-      type: "tosca.nodes.nfv.VnfVirtualLink"
-      properties:
-        connectivity_type:
-          layer_protocols: [ ipv4 ]
-        description: Internal Virtual link in the VNF
-        vl_profile:
-          max_bitrate_requirements:
-            root: 100000
-            leaf: 20000
-          min_bitrate_requirements:
-            root: 10000
-            leaf: 10000
-    internal_vdu_b_1_cp:
-      type: "tosca.nodes.nfv.VduCp"
-      properties:
-        order: 2
-      requirements:
-        - virtual_binding: VDU-B-1
-        - virtual_link: internal_vl
-    internal_vdu_b_2_cp:
-      type: "tosca.nodes.nfv.VduCp"
-      properties:
-        order: 0
-      requirements:
-        - virtual_binding: VDU-B-2
-        - virtual_link: internal_vl
-    vdu_b_1_vsd:
+        virtual_binding: VDU-B
+    vdu-b-1-vsd:
       type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
       properties:
         virtual_block_storage_data:
@@ -80,55 +104,7 @@ topology_template:
           min-disk: '1'
           min-ram: '2'
           size: '1'
-      artifacts:
-        sw_image:
-          type: "tosca.artifacts.nfv.SwImage"
-          file: vdu-b-1.qcow2
-    vdu_b_2_vsd:
-      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
-      properties:
-        virtual_block_storage_data:
-          size_of_storage: 20
-          rdma_enabled: false
-        sw_image_data:
-          name: "vdu-b-2 image"
-          version: "1.1"
-          checksum: 
-            algorithm: "sha-224"
-            hash: "somehashfortst010"
-          container_format: "bare"
-          disk-format: qcow2
-          min-disk: '1'
-          min-ram: '2'
-          size: '1'
-      artifacts:
-        sw_image:
-          type: tosca.artifacts.nfv.SwImage
-          file: vdu-b-2.qcow2
-    VNF_B:
-      type: "tosca.nodes.nfv.VNF"
-      properties:
-        descriptor_id: "VNF_B"
-        descriptor_version: "2.0"
-        provider: "ETSI TST WG"
-        product_name: "VNF-B-2VDUs"
-        software_version: "2.0"
-        product_info_name: "VNF-B-2VDUs"
-        product_info_description: "TST010 reference VNF-B with 2 VDUs"
-        flavour_id: "VNF-B-2VDU_flavor"
-        flavour_description: "VNF-B with 2 VDUs flavor"
-        vnfm_info: 
-          etsivnfm: 
-          - v2.3.1 
-        interfaces:
-            Vnflcm:
-              scale:
-                implementation: scale-example.yaml
-              terminate:
-                implementation: terminate-example.yaml
-              operate:
-                implementation: operate-example.yaml
-    VDU_B_1:
+    VDU-B:
       type: "tosca.nodes.nfv.Vdu.Compute"
       properties:
         name: "vdu-b-1-vcd"
@@ -147,22 +123,27 @@ topology_template:
       requirements:
         virtual_storage:
         - "vdu-b-1-vsd"
-    VDU_B_2:
-      type: "tosca.nodes.nfv.Vdu.Compute"
+    vnf-b-1_VNF:
+      type: "tst010.vnf.simple"
       properties:
-        name: "vdu-b-2-vcd"
-        descriptor: "Description of VDU-B-2"
-        vdu_profile:
-          min_number_of_instances: 1
-          max_number_of_instances: 4
-      capabilities:
-        virtual_compute:
-          properties:
-            virtual_memory:
-              virtual_mem_size: 6144
-              numa_enabled: false
-            virtual_cpu:
-              num_virtual_cpu: 2
-      requirements:
-        virtual_storage:
-        - "vdu-b-2-vsd"                
\ No newline at end of file
+        descriptor_id: "VNF-B"
+        descriptor_version: "2.0"
+        provider: "ETSI TST WG"
+        product_name: "VDU_VNF-B"
+        software_version: "2.0"
+        product_info_name: "VDU_VNF-B"
+        product_info_description: "TST010 reference VNF-A"
+        flavour_id: "VNF-B_flavor"
+        flavour_description: "VNF-B flavor"
+        vnfm_info: 
+          - etsivnfm:v2.3.1 
+      interfaces:
+        Vnflcm:
+          type: "tosca.interfaces.nfv.Vnflcm"
+          scale:
+            implementation: scale-example.yaml
+          terminate:
+            implementation: terminate-example.yaml
+          operate:
+            implementation: operate-example.yaml
+
diff --git a/SOL005/NSLifecycleManagement-API/environment/variables.txt b/SOL005/NSLifecycleManagement-API/environment/variables.txt
index dd923a049..6cb07cd18 100644
--- a/SOL005/NSLifecycleManagement-API/environment/variables.txt
+++ b/SOL005/NSLifecycleManagement-API/environment/variables.txt
@@ -83,7 +83,7 @@ ${check_descriptors}    1
 ${descriptorType}    SOL006
 
 ${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute
-${tosca_type_VNF}    tosca.nodes.nfv.VNF
+${tosca_type_VNF}    tst010.vnf.simple    # custom tosca type defined in the descriptor vnfd_SOL001.yaml in descriptors folder
 ${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
 ${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
 ${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage
diff --git a/SOL005/VNFPackageManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml b/SOL005/VNFPackageManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
index e9159106a..fdcf741de 100644
--- a/SOL005/VNFPackageManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
+++ b/SOL005/VNFPackageManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
@@ -1,19 +1,70 @@
 tosca_definitions_version: tosca_simple_yaml_1_2
 description: "TST010 reference VNF-B"
+
+imports:
+  - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.7.1/etsi_nfv_sol001_vnfd_types.yaml
+
 metadata:
   descriptor_id: "VNF-B"
   vendor: "ETSI TST WG"
   version: "2.0"
+
+node_types:
+  tst010.vnf.simple:
+    derived_from: tosca.nodes.nfv.VNF
+    properties:
+      descriptor_id:
+        type: string
+        default: VNF-B
+      descriptor_version:
+        type: string
+        default: '1.0'
+      provider:
+        type: string
+        default: ETSI TST WG
+      product_name:
+        type: string
+        default: VNF-B
+      software_version:
+        type: string
+        default: '1.0'
+      product_info_name:
+        type: string
+        default: VNF-B
+      product_info_description:
+        type: string
+        default: TST010 reference VNF-B
+      flavour_id:
+        type: string
+        default: VNF-B_flavor
+      flavour_description:
+        type: string
+        default: "VNF-B flavor"
+      vnfm_info:
+        type: list
+        entry_schema:
+          type: string
+          default: [ 'etsivnfm:v2.3.1' ]
+    interfaces:
+      Vnflcm:
+        type: "tosca.interfaces.nfv.Vnflcm"
+        scale:
+          description: Invoked upon receipt of a Scale VNF request
+        terminate:
+          description: Invoked upon receipt Terminate VNF request
+        operate:
+          description: Invoked upon receipt of an Operate VNF request
+
 topology_template:
   substitution_mappings:
-    node_type: "tosca.nodes.nfv.VNF"
+    node_type: "tst010.vnf.simple"
     requirements:
+      virtual_link_right:
+        [right, virtual_link_right]
       virtual_link_management:
         [management, virtual_link_management]
       virtual_link_left:
         [left, virtual_link_left]
-      virtual_link_right:
-        [right, virtual_link_right]
   node_templates:
     right:
       type: "tosca.nodes.nfv.VduCp"
@@ -21,49 +72,22 @@ topology_template:
         order: 1
       requirements:
         virtual_link_right:
-        virtual_binding: VDU-B-2
+        virtual_binding: VDU-B
     management:
       type: "tosca.nodes.nfv.VduCp"
       properties:
         order: 0
       requirements:
         virtual_link_management:
-        virtual_binding: VDU-B-1
+        virtual_binding: VDU-B
     left:
       type: "tosca.nodes.nfv.VduCp"
       properties:
         order: 2
       requirements:
         virtual_link_left:
-        virtual_binding: VDU-B-1
-    internal_vl:
-      type: "tosca.nodes.nfv.VnfVirtualLink"
-      properties:
-        connectivity_type:
-          layer_protocols: [ ipv4 ]
-        description: Internal Virtual link in the VNF
-        vl_profile:
-          max_bitrate_requirements:
-            root: 100000
-            leaf: 20000
-          min_bitrate_requirements:
-            root: 10000
-            leaf: 10000
-    internal_vdu_b_1_cp:
-      type: "tosca.nodes.nfv.VduCp"
-      properties:
-        order: 2
-      requirements:
-        - virtual_binding: VDU-B-1
-        - virtual_link: internal_vl
-    internal_vdu_b_2_cp:
-      type: "tosca.nodes.nfv.VduCp"
-      properties:
-        order: 0
-      requirements:
-        - virtual_binding: VDU-B-2
-        - virtual_link: internal_vl
-    vdu_b_1_vsd:
+        virtual_binding: VDU-B
+    vdu-b-1-vsd:
       type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
       properties:
         virtual_block_storage_data:
@@ -80,55 +104,7 @@ topology_template:
           min-disk: '1'
           min-ram: '2'
           size: '1'
-      artifacts:
-        sw_image:
-          type: "tosca.artifacts.nfv.SwImage"
-          file: vdu-b-1.qcow2
-    vdu_b_2_vsd:
-      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
-      properties:
-        virtual_block_storage_data:
-          size_of_storage: 20
-          rdma_enabled: false
-        sw_image_data:
-          name: "vdu-b-2 image"
-          version: "1.1"
-          checksum: 
-            algorithm: "sha-224"
-            hash: "somehashfortst010"
-          container_format: "bare"
-          disk-format: qcow2
-          min-disk: '1'
-          min-ram: '2'
-          size: '1'
-      artifacts:
-        sw_image:
-          type: tosca.artifacts.nfv.SwImage
-          file: vdu-b-2.qcow2
-    vnf_b_1_VNF:
-      type: "tosca.nodes.nfv.VNF"
-      properties:
-        descriptor_id: "VNF-B-2VDUs"
-        descriptor_version: "2.0"
-        provider: "ETSI TST WG"
-        product_name: "VNF-B-2VDUs"
-        software_version: "2.0"
-        product_info_name: "VNF-B-2VDUs"
-        product_info_description: "TST010 reference VNF-B with 2 VDUs"
-        flavour_id: "VNF-B-2VDU_flavor"
-        flavour_description: "VNF-B with 2 VDUs flavor"
-        vnfm_info: 
-          etsivnfm: 
-          - v2.3.1 
-        interfaces:
-            Vnflcm:
-              scale:
-                implementation: scale-example.yaml
-              terminate:
-                implementation: terminate-example.yaml
-              operate:
-                implementation: operate-example.yaml
-    VDU_B_1:
+    VDU-B:
       type: "tosca.nodes.nfv.Vdu.Compute"
       properties:
         name: "vdu-b-1-vcd"
@@ -147,22 +123,27 @@ topology_template:
       requirements:
         virtual_storage:
         - "vdu-b-1-vsd"
-    VDU_B_2:
-      type: "tosca.nodes.nfv.Vdu.Compute"
+    vnf-b-1_VNF:
+      type: "tst010.vnf.simple"
       properties:
-        name: "vdu-b-2-vcd"
-        descriptor: "Description of VDU-B-2"
-        vdu_profile:
-          min_number_of_instances: 1
-          max_number_of_instances: 4
-      capabilities:
-        virtual_compute:
-          properties:
-            virtual_memory:
-              virtual_mem_size: 6144
-              numa_enabled: false
-            virtual_cpu:
-              num_virtual_cpu: 2
-      requirements:
-        virtual_storage:
-        - "vdu-b-2-vsd"                
\ No newline at end of file
+        descriptor_id: "VNF-B"
+        descriptor_version: "2.0"
+        provider: "ETSI TST WG"
+        product_name: "VDU_VNF-B"
+        software_version: "2.0"
+        product_info_name: "VDU_VNF-B"
+        product_info_description: "TST010 reference VNF-A"
+        flavour_id: "VNF-B_flavor"
+        flavour_description: "VNF-B flavor"
+        vnfm_info: 
+          - etsivnfm:v2.3.1 
+      interfaces:
+        Vnflcm:
+          type: "tosca.interfaces.nfv.Vnflcm"
+          scale:
+            implementation: scale-example.yaml
+          terminate:
+            implementation: terminate-example.yaml
+          operate:
+            implementation: operate-example.yaml
+
diff --git a/SOL005/VNFPackageManagement-API/environment/variables.txt b/SOL005/VNFPackageManagement-API/environment/variables.txt
index afa29254f..f6dd5c0e8 100644
--- a/SOL005/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFPackageManagement-API/environment/variables.txt
@@ -94,7 +94,7 @@ ${check_descriptors}    1
 ${descriptorType}    SOL006
 
 ${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute
-${tosca_type_VNF}    tosca.nodes.nfv.VNF
+${tosca_type_VNF}    tst010.vnf.simple    # custom tosca type defined in the descriptor vnfd_SOL001.yaml in descriptors folder
 ${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
 ${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
 ${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage
-- 
GitLab


From 3bd1a5f2e0dcc9ada10783f9b58eee4c075112c9 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Wed, 3 Mar 2021 09:41:31 +0100
Subject: [PATCH 305/322] fix of issue #169 v2.7.1

---
 SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot | 4 ++--
 SOL005/NSLifecycleManagement-API/environment/variables.txt    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index 5147f3733..b99b64ef5 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -229,7 +229,7 @@ Check Postcondition NS Conflict Instance is not deleted
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${ConflictNsInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${conflictNsInstanceId} 
     Integer    response status    200
 
 Check HTTP Response Header ContentType is
@@ -540,7 +540,7 @@ DELETE IndividualNSInstance
 DELETE IndividualNSInstance Conflict
     log    Trying to delete an individual VNF instance
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${ConflictNsInstanceId}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${conflictNsInstanceId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 
diff --git a/SOL005/NSLifecycleManagement-API/environment/variables.txt b/SOL005/NSLifecycleManagement-API/environment/variables.txt
index 6cb07cd18..4820efc00 100644
--- a/SOL005/NSLifecycleManagement-API/environment/variables.txt
+++ b/SOL005/NSLifecycleManagement-API/environment/variables.txt
@@ -21,7 +21,7 @@ ${nsInstanceId}       6fc3539c-e602-4afa-8e13-962fb5a7d81f
 ${nsdId}                58a7beb6-aa89-405e-bd90-7d276b967c03
 ${disabledNsdId}        fca7c896-a7d0-4ff8-865e-f5c8ee2fd1c3
 ${nonExistentNsId}      nonExistent
-${ConflictNsInstanceId}    007c111c-e602-4afa-8e13-962fb5a7d81d
+${conflictNsInstanceId}    007c111c-e602-4afa-8e13-962fb5a7d81d
 ${nsInstanceName}    Test-nsInstance
 ${nsInstanceDescription}    description ns
 ${nsInstanceDescription_Update}    Updated description ns
-- 
GitLab


From be03403c234f13b99d4b6baefd72c27c0428142d Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Wed, 3 Mar 2021 09:45:52 +0100
Subject: [PATCH 306/322] upd

---
 SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot | 4 ++--
 SOL005/NSLifecycleManagement-API/environment/variables.txt    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index b99b64ef5..5147f3733 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -229,7 +229,7 @@ Check Postcondition NS Conflict Instance is not deleted
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${conflictNsInstanceId} 
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${ConflictNsInstanceId} 
     Integer    response status    200
 
 Check HTTP Response Header ContentType is
@@ -540,7 +540,7 @@ DELETE IndividualNSInstance
 DELETE IndividualNSInstance Conflict
     log    Trying to delete an individual VNF instance
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${conflictNsInstanceId}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${ConflictNsInstanceId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 
diff --git a/SOL005/NSLifecycleManagement-API/environment/variables.txt b/SOL005/NSLifecycleManagement-API/environment/variables.txt
index 4820efc00..6cb07cd18 100644
--- a/SOL005/NSLifecycleManagement-API/environment/variables.txt
+++ b/SOL005/NSLifecycleManagement-API/environment/variables.txt
@@ -21,7 +21,7 @@ ${nsInstanceId}       6fc3539c-e602-4afa-8e13-962fb5a7d81f
 ${nsdId}                58a7beb6-aa89-405e-bd90-7d276b967c03
 ${disabledNsdId}        fca7c896-a7d0-4ff8-865e-f5c8ee2fd1c3
 ${nonExistentNsId}      nonExistent
-${conflictNsInstanceId}    007c111c-e602-4afa-8e13-962fb5a7d81d
+${ConflictNsInstanceId}    007c111c-e602-4afa-8e13-962fb5a7d81d
 ${nsInstanceName}    Test-nsInstance
 ${nsInstanceDescription}    description ns
 ${nsInstanceDescription_Update}    Updated description ns
-- 
GitLab


From 69c9dcdd6be1165003224c6f2fd61ed45676704c Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Wed, 3 Mar 2021 17:50:19 +0100
Subject: [PATCH 307/322] tentative update of importing variables for
 descriptors

---
 .../NSLCMOperationKeywords.robot              | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index 5147f3733..1e4f02baf 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -8,10 +8,10 @@ Library    OperatingSystem
 Library    MockServerLibrary
 Library    Collections
 Library    String
-Variables  descriptors/SOL006/VNFD/vnfd_SOL006.yaml
-Variables  descriptors/SOL006/NSD/nsd_SOL006.yaml
-Variables  descriptors/SOL001/VNFD/vnfd_SOL001.yaml
-Variables  descriptors/SOL001/NSD/nsd_SOL001.yaml
+#Variables  descriptors/SOL006/VNFD/vnfd_SOL006.yaml
+#Variables  descriptors/SOL006/NSD/nsd_SOL006.yaml
+#Variables  descriptors/SOL001/VNFD/vnfd_SOL001.yaml
+#Variables  descriptors/SOL001/NSD/nsd_SOL001.yaml
 
 *** Keywords ***
 Initialize System
@@ -262,6 +262,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  descriptors/SOL001/VNFD/vnfd_SOL001.yaml
     @{VDU_labels}=    Create List
     @{VNF_labels}=    Create List
     @{VirtualLink_labels}=    Create List
@@ -289,6 +290,7 @@ Fetch Information from SOL001 descriptor file
 
 Get VNF Attributes from SOL001
     [Arguments]    ${VNF_label}
+    Import Variables  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}
@@ -304,6 +306,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']}
@@ -330,7 +333,8 @@ Fetch Information from SOL006 descriptor file
     Set Global Variable    ${Descriptor_Version}    ${descriptor_version}
 
 Get VDU IDs
-    [Arguments]    ${count}    
+    [Arguments]    ${count}
+    Import Variables    ${CURDIR}/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
     @{VDU_labels}=    Create List
     ${Storage_labels}=    Create List
     FOR    ${i}    IN RANGE    ${count}
@@ -343,6 +347,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}
@@ -352,6 +357,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']} 
@@ -360,6 +366,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']} 
@@ -368,6 +375,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']} 
@@ -1337,6 +1345,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
     @{NsVirtualLink_labels}=    Create List
     @{NsCP_labels}=    Create List
     FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
@@ -1353,6 +1362,7 @@ Fetch Information from SOL001 NS descriptor file
 
 Get NS Attributes from SOL001
     [Arguments]    ${NS_label}
+    Import Variables    ${CURDIR}/descriptors/SOL001/NSD/nsd_SOL001.yaml
     ${ns_descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${NS_label}.properties.descriptorId}
     ${designer}=    Get Variable Value    ${topology_template.node_templates.${NS_label}.properties.designer}
     ${version}=    Get Variable Value    ${topology_template.node_templates.${NS_label}.properties.version}
@@ -1366,6 +1376,7 @@ Get NS Attributes from SOL001
     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}
     ${VNFcount}=    Get Length    ${nfv.vnfd}
     ${SAPcount}=    Get Length    ${nfv.nsd[0].sapd}
@@ -1382,6 +1393,7 @@ Fetch Information from SOL006 NS descriptor file
     
 Get SAP IDs
     [Arguments]    ${count}
+    Import Variables    ${CURDIR}/descriptors/SOL006/NSD/nsd_SOL006.yaml
     @{SAPlabels}=    Create List
     FOR    ${i}    IN RANGE    ${count}
         Append To List    ${SAPlabels}    ${nfv.nsd[0].sapd[${i}]['id']}
@@ -1389,6 +1401,7 @@ Get SAP IDs
     Set Global Variable    ${SAP_IDs}    ${SAPlabels}
     
 Get NS Virtual Link IDs
+    Import Variables    ${CURDIR}/descriptors/SOL006/NSD/nsd_SOL006.yaml
     [Arguments]    ${count}
     @{NsVirtualLink_labels}=    Create List
     FOR    ${i}    IN RANGE    ${count}
-- 
GitLab


From 0df8078aaf88e6b74669285380e7919746e5536b Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Wed, 3 Mar 2021 19:16:24 +0100
Subject: [PATCH 308/322] update of importing variables for descriptors

---
 .../VnfLcmOperationKeywords.robot             | 18 ++++++++++++-----
 .../VnfLcmMntOperationKeywords.robot          | 20 +++++++++++++------
 .../Grants.robot                              |  6 ++++--
 .../IndividualGrant.robot                     | 15 +++++++++-----
 .../VNFPackageManagementKeywords.robot        |  6 ++++--
 .../NSDManagementKeywords.robot               |  6 ++++--
 .../VNFPackageManagementKeywords.robot        |  6 ++++--
 7 files changed, 53 insertions(+), 24 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index 08dc46e9b..fc8f22215 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -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 
@@ -1099,6 +1099,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
@@ -1125,6 +1126,7 @@ Fetch Information from SOL001 descriptor file
     Set Global Variable    @{Storage_IDs}    @{Storage_labels}
 
 Get VNF Attributes from SOL001
+    Import Variables    ${CURDIR}/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
     [Arguments]    ${VNF_label}
     ${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}
@@ -1141,6 +1143,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']}
@@ -1167,7 +1170,8 @@ Fetch Information from SOL006 descriptor file
     Set Global Variable    ${Descriptor_Version}    ${descriptor_version}
 
 Get VDU IDs
-    [Arguments]    ${count}    
+    [Arguments]    ${count}
+    Import Variables    ${CURDIR}/descriptors/SOL006/VNFD/vnfd_SOL006.yaml    
     @{VDU_labels}=    Create List
     ${Storage_labels}=    Create List
     FOR    ${i}    IN RANGE    ${count}
@@ -1180,6 +1184,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}
@@ -1188,7 +1193,8 @@ Get Internal CPs for each VDU
     Set Global Variable    ${internalCP_IDs}    ${internal_CPs}
     
 Get External CP IDs
-    [Arguments]    ${count}    
+    [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']} 
@@ -1196,7 +1202,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']} 
@@ -1205,6 +1212,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']} 
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index 3103050dd..aa04c1b31 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -9,8 +9,8 @@ Library    JSONLibrary
 Library    Collections
 Library    Process
 Library    JSONSchemaLibrary    schemas/
-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   
@@ -1464,6 +1464,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
@@ -1490,7 +1491,8 @@ Fetch Information from SOL001 descriptor file
     Set Global Variable    @{Storage_IDs}    @{Storage_labels}
 
 Get VNF Attributes from SOL001
-     [Arguments]    ${VNF_label}
+    [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}
@@ -1507,6 +1509,7 @@ Get VNF Attributes from SOL001
 
 
 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']}
@@ -1533,7 +1536,8 @@ Fetch Information from SOL006 descriptor file
     Set Global Variable    ${Descriptor_Version}    ${descriptor_version}
     
 Get VDU IDs
-    [Arguments]    ${count}    
+    [Arguments]    ${count}
+    Import Variables    ${CURDIR}/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
     @{VDU_labels}=    Create List
     ${Storage_labels}=    Create List
     FOR    ${i}    IN RANGE    ${count}
@@ -1546,6 +1550,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}
@@ -1554,7 +1559,8 @@ Get Internal CPs for each VDU
     Set Global Variable    ${internalCP_IDs}    ${internal_CPs}
     
 Get External CP IDs
-    [Arguments]    ${count}    
+    [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} 
@@ -1562,7 +1568,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']} 
@@ -1571,6 +1578,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']} 
diff --git a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
index f4c920df2..31cde48e9 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
@@ -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.
 
@@ -216,6 +216,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 +231,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']}
diff --git a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
index a52f60300..77235ac63 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
@@ -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.
@@ -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}
@@ -217,7 +220,8 @@ Get VDU IDs
     Set Global Variable    ${Compute_IDs}    ${Compute_labels}
                 
 Get External CP IDs
-    [Arguments]    ${count}    
+    [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']} 
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index ec065374b..c2475eff0 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -9,8 +9,8 @@ Library    Collections
 Library    JSONSchemaLibrary    schemas/
 Library    Process
 Library    String
-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 ***
 Get all VNF Packages
@@ -1562,6 +1562,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}
@@ -1574,6 +1575,7 @@ Fetch Information from SOL001 descriptor file
     Set Global Variable    ${Descriptor_Version}    ${descriptor_version}
     
 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']}
diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index 5b427e837..9eeb0abdf 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -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
@@ -1343,6 +1343,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}
@@ -1356,6 +1357,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}
 
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 8fcb2b1cf..b04c333b5 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -10,8 +10,8 @@ Library           MockServerLibrary
 Library           String
 Library           Collections
 Library           String
-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 ***
 Get all VNF Packages
@@ -196,6 +196,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}
@@ -209,6 +210,7 @@ Fetch Information from SOL001 descriptor file
     Set Global Variable    ${Descriptor_Version}    ${descriptor_version}
 
 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}
-- 
GitLab


From 3c0cff0fdab3f79d6d8e7e99ab9b47a4f21eeeac Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Wed, 10 Mar 2021 17:48:54 +0100
Subject: [PATCH 309/322] updated exmples of SOL001 VNFDs

---
 .../descriptors/SOL001/VNFD/vnfd_SOL001.yaml  | 52 ++++++++++++------
 .../descriptors/SOL001/VNFD/vnfd_SOL001.yaml  | 54 ++++++++++++-------
 .../descriptors/SOL001/VNFD/vnfd_SOL001.yaml  | 54 ++++++++++++-------
 .../descriptors/SOL001/VNFD/vnfd_SOL001.yaml  | 54 ++++++++++++-------
 .../descriptors/SOL001/VNFD/vnfd_SOL001.yaml  | 54 ++++++++++++-------
 .../descriptors/SOL001/VNFD/vnfd_SOL001.yaml  | 54 ++++++++++++-------
 6 files changed, 215 insertions(+), 107 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml b/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
index fdcf741de..7f25ee910 100644
--- a/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
+++ b/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_yaml_1_2
 description: "TST010 reference VNF-B"
 
 imports:
-  - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.7.1/etsi_nfv_sol001_vnfd_types.yaml
+  - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.7.1/etsi_nfv_sol001_vnfd_types.yaml  
 
 metadata:
   descriptor_id: "VNF-B"
@@ -44,7 +44,7 @@ node_types:
         type: list
         entry_schema:
           type: string
-          default: [ 'etsivnfm:v2.3.1' ]
+        default: [ 'etsivnfm:v2.3.1' ]
     interfaces:
       Vnflcm:
         type: "tosca.interfaces.nfv.Vnflcm"
@@ -54,6 +54,23 @@ node_types:
           description: Invoked upon receipt Terminate VNF request
         operate:
           description: Invoked upon receipt of an Operate VNF request
+    requirements:
+      - virtual_link_right:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [0, 1]
+      - virtual_link_left:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [0, 1]
+      - virtual_link_management:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [0, 1]
+      - virtual_link:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [0, 0]
 
 topology_template:
   substitution_mappings:
@@ -69,29 +86,31 @@ topology_template:
     right:
       type: "tosca.nodes.nfv.VduCp"
       properties:
+        layer_protocols: [ ipv4 ]
         order: 1
       requirements:
-        virtual_link_right:
-        virtual_binding: VDU-B
+        - virtual_binding: VDU-B
+    vdu-b-1-vsd:
     management:
       type: "tosca.nodes.nfv.VduCp"
       properties:
+        layer_protocols: [ ipv4 ]
         order: 0
       requirements:
-        virtual_link_management:
-        virtual_binding: VDU-B
+        - virtual_binding: VDU-B
+    vdu-b-1-vsd:
     left:
       type: "tosca.nodes.nfv.VduCp"
       properties:
+        layer_protocols: [ ipv4 ]
         order: 2
       requirements:
-        virtual_link_left:
-        virtual_binding: VDU-B
+        - virtual_binding: VDU-B
     vdu-b-1-vsd:
       type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
       properties:
         virtual_block_storage_data:
-          size_of_storage: 20
+          size_of_storage: 20 GB
           rdma_enabled: false
         sw_image_data:
           name: "vdu-b-1 image"
@@ -100,15 +119,15 @@ topology_template:
             algorithm: "sha-224"
             hash: "somehashfortst010"
           container_format: "bare"
-          disk-format: qcow2
-          min-disk: '1'
-          min-ram: '2'
+          disk_format: qcow2
+          min_disk: '1'
+          min_ram: '2'
           size: '1'
     VDU-B:
       type: "tosca.nodes.nfv.Vdu.Compute"
       properties:
         name: "vdu-b-1-vcd"
-        descriptor: "Description of VDU-B-1"
+        description: "Description of VDU-B-1"
         vdu_profile:
           min_number_of_instances: 1
           max_number_of_instances: 2
@@ -116,13 +135,13 @@ topology_template:
         virtual_compute:
           properties:
             virtual_memory:
-              virtual_mem_size: 4096
+              virtual_mem_size: 4096 MB
               numa_enabled: false
             virtual_cpu:
               num_virtual_cpu: 2
       requirements:
-        virtual_storage:
-        - "vdu-b-1-vsd"
+        - virtual_storage: vdu-b-1-vsd
+        
     vnf-b-1_VNF:
       type: "tst010.vnf.simple"
       properties:
@@ -146,4 +165,3 @@ topology_template:
             implementation: terminate-example.yaml
           operate:
             implementation: operate-example.yaml
-
diff --git a/SOL003/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml b/SOL003/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
index fdcf741de..413d76def 100644
--- a/SOL003/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
+++ b/SOL003/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_yaml_1_2
 description: "TST010 reference VNF-B"
 
 imports:
-  - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.7.1/etsi_nfv_sol001_vnfd_types.yaml
+  - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.7.1/etsi_nfv_sol001_vnfd_types.yaml  
 
 metadata:
   descriptor_id: "VNF-B"
@@ -44,7 +44,7 @@ node_types:
         type: list
         entry_schema:
           type: string
-          default: [ 'etsivnfm:v2.3.1' ]
+        default: [ 'etsivnfm:v2.3.1' ]
     interfaces:
       Vnflcm:
         type: "tosca.interfaces.nfv.Vnflcm"
@@ -54,6 +54,23 @@ node_types:
           description: Invoked upon receipt Terminate VNF request
         operate:
           description: Invoked upon receipt of an Operate VNF request
+    requirements:
+      - virtual_link_right:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [0, 1]
+      - virtual_link_left:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [0, 1]
+      - virtual_link_management:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [0, 1]
+      - virtual_link:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [0, 0]
 
 topology_template:
   substitution_mappings:
@@ -69,29 +86,31 @@ topology_template:
     right:
       type: "tosca.nodes.nfv.VduCp"
       properties:
+        layer_protocols: [ ipv4 ]
         order: 1
       requirements:
-        virtual_link_right:
-        virtual_binding: VDU-B
+        - virtual_binding: VDU-B
+    vdu-b-1-vsd:
     management:
       type: "tosca.nodes.nfv.VduCp"
       properties:
+        layer_protocols: [ ipv4 ]
         order: 0
       requirements:
-        virtual_link_management:
-        virtual_binding: VDU-B
+        - virtual_binding: VDU-B
+    vdu-b-1-vsd:
     left:
       type: "tosca.nodes.nfv.VduCp"
       properties:
+        layer_protocols: [ ipv4 ]
         order: 2
       requirements:
-        virtual_link_left:
-        virtual_binding: VDU-B
+        - virtual_binding: VDU-B
     vdu-b-1-vsd:
       type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
       properties:
         virtual_block_storage_data:
-          size_of_storage: 20
+          size_of_storage: 20 GB
           rdma_enabled: false
         sw_image_data:
           name: "vdu-b-1 image"
@@ -100,15 +119,15 @@ topology_template:
             algorithm: "sha-224"
             hash: "somehashfortst010"
           container_format: "bare"
-          disk-format: qcow2
-          min-disk: '1'
-          min-ram: '2'
+          disk_format: qcow2
+          min_disk: '1'
+          min_ram: '2'
           size: '1'
     VDU-B:
       type: "tosca.nodes.nfv.Vdu.Compute"
       properties:
         name: "vdu-b-1-vcd"
-        descriptor: "Description of VDU-B-1"
+        description: "Description of VDU-B-1"
         vdu_profile:
           min_number_of_instances: 1
           max_number_of_instances: 2
@@ -116,13 +135,13 @@ topology_template:
         virtual_compute:
           properties:
             virtual_memory:
-              virtual_mem_size: 4096
+              virtual_mem_size: 4096 MB
               numa_enabled: false
             virtual_cpu:
               num_virtual_cpu: 2
       requirements:
-        virtual_storage:
-        - "vdu-b-1-vsd"
+        - virtual_storage: vdu-b-1-vsd
+        
     vnf-b-1_VNF:
       type: "tst010.vnf.simple"
       properties:
@@ -145,5 +164,4 @@ topology_template:
           terminate:
             implementation: terminate-example.yaml
           operate:
-            implementation: operate-example.yaml
-
+            implementation: operate-example.yaml
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml b/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
index fdcf741de..413d76def 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
+++ b/SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_yaml_1_2
 description: "TST010 reference VNF-B"
 
 imports:
-  - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.7.1/etsi_nfv_sol001_vnfd_types.yaml
+  - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.7.1/etsi_nfv_sol001_vnfd_types.yaml  
 
 metadata:
   descriptor_id: "VNF-B"
@@ -44,7 +44,7 @@ node_types:
         type: list
         entry_schema:
           type: string
-          default: [ 'etsivnfm:v2.3.1' ]
+        default: [ 'etsivnfm:v2.3.1' ]
     interfaces:
       Vnflcm:
         type: "tosca.interfaces.nfv.Vnflcm"
@@ -54,6 +54,23 @@ node_types:
           description: Invoked upon receipt Terminate VNF request
         operate:
           description: Invoked upon receipt of an Operate VNF request
+    requirements:
+      - virtual_link_right:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [0, 1]
+      - virtual_link_left:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [0, 1]
+      - virtual_link_management:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [0, 1]
+      - virtual_link:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [0, 0]
 
 topology_template:
   substitution_mappings:
@@ -69,29 +86,31 @@ topology_template:
     right:
       type: "tosca.nodes.nfv.VduCp"
       properties:
+        layer_protocols: [ ipv4 ]
         order: 1
       requirements:
-        virtual_link_right:
-        virtual_binding: VDU-B
+        - virtual_binding: VDU-B
+    vdu-b-1-vsd:
     management:
       type: "tosca.nodes.nfv.VduCp"
       properties:
+        layer_protocols: [ ipv4 ]
         order: 0
       requirements:
-        virtual_link_management:
-        virtual_binding: VDU-B
+        - virtual_binding: VDU-B
+    vdu-b-1-vsd:
     left:
       type: "tosca.nodes.nfv.VduCp"
       properties:
+        layer_protocols: [ ipv4 ]
         order: 2
       requirements:
-        virtual_link_left:
-        virtual_binding: VDU-B
+        - virtual_binding: VDU-B
     vdu-b-1-vsd:
       type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
       properties:
         virtual_block_storage_data:
-          size_of_storage: 20
+          size_of_storage: 20 GB
           rdma_enabled: false
         sw_image_data:
           name: "vdu-b-1 image"
@@ -100,15 +119,15 @@ topology_template:
             algorithm: "sha-224"
             hash: "somehashfortst010"
           container_format: "bare"
-          disk-format: qcow2
-          min-disk: '1'
-          min-ram: '2'
+          disk_format: qcow2
+          min_disk: '1'
+          min_ram: '2'
           size: '1'
     VDU-B:
       type: "tosca.nodes.nfv.Vdu.Compute"
       properties:
         name: "vdu-b-1-vcd"
-        descriptor: "Description of VDU-B-1"
+        description: "Description of VDU-B-1"
         vdu_profile:
           min_number_of_instances: 1
           max_number_of_instances: 2
@@ -116,13 +135,13 @@ topology_template:
         virtual_compute:
           properties:
             virtual_memory:
-              virtual_mem_size: 4096
+              virtual_mem_size: 4096 MB
               numa_enabled: false
             virtual_cpu:
               num_virtual_cpu: 2
       requirements:
-        virtual_storage:
-        - "vdu-b-1-vsd"
+        - virtual_storage: vdu-b-1-vsd
+        
     vnf-b-1_VNF:
       type: "tst010.vnf.simple"
       properties:
@@ -145,5 +164,4 @@ topology_template:
           terminate:
             implementation: terminate-example.yaml
           operate:
-            implementation: operate-example.yaml
-
+            implementation: operate-example.yaml
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml b/SOL003/VNFPackageManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
index fdcf741de..413d76def 100644
--- a/SOL003/VNFPackageManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
+++ b/SOL003/VNFPackageManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_yaml_1_2
 description: "TST010 reference VNF-B"
 
 imports:
-  - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.7.1/etsi_nfv_sol001_vnfd_types.yaml
+  - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.7.1/etsi_nfv_sol001_vnfd_types.yaml  
 
 metadata:
   descriptor_id: "VNF-B"
@@ -44,7 +44,7 @@ node_types:
         type: list
         entry_schema:
           type: string
-          default: [ 'etsivnfm:v2.3.1' ]
+        default: [ 'etsivnfm:v2.3.1' ]
     interfaces:
       Vnflcm:
         type: "tosca.interfaces.nfv.Vnflcm"
@@ -54,6 +54,23 @@ node_types:
           description: Invoked upon receipt Terminate VNF request
         operate:
           description: Invoked upon receipt of an Operate VNF request
+    requirements:
+      - virtual_link_right:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [0, 1]
+      - virtual_link_left:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [0, 1]
+      - virtual_link_management:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [0, 1]
+      - virtual_link:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [0, 0]
 
 topology_template:
   substitution_mappings:
@@ -69,29 +86,31 @@ topology_template:
     right:
       type: "tosca.nodes.nfv.VduCp"
       properties:
+        layer_protocols: [ ipv4 ]
         order: 1
       requirements:
-        virtual_link_right:
-        virtual_binding: VDU-B
+        - virtual_binding: VDU-B
+    vdu-b-1-vsd:
     management:
       type: "tosca.nodes.nfv.VduCp"
       properties:
+        layer_protocols: [ ipv4 ]
         order: 0
       requirements:
-        virtual_link_management:
-        virtual_binding: VDU-B
+        - virtual_binding: VDU-B
+    vdu-b-1-vsd:
     left:
       type: "tosca.nodes.nfv.VduCp"
       properties:
+        layer_protocols: [ ipv4 ]
         order: 2
       requirements:
-        virtual_link_left:
-        virtual_binding: VDU-B
+        - virtual_binding: VDU-B
     vdu-b-1-vsd:
       type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
       properties:
         virtual_block_storage_data:
-          size_of_storage: 20
+          size_of_storage: 20 GB
           rdma_enabled: false
         sw_image_data:
           name: "vdu-b-1 image"
@@ -100,15 +119,15 @@ topology_template:
             algorithm: "sha-224"
             hash: "somehashfortst010"
           container_format: "bare"
-          disk-format: qcow2
-          min-disk: '1'
-          min-ram: '2'
+          disk_format: qcow2
+          min_disk: '1'
+          min_ram: '2'
           size: '1'
     VDU-B:
       type: "tosca.nodes.nfv.Vdu.Compute"
       properties:
         name: "vdu-b-1-vcd"
-        descriptor: "Description of VDU-B-1"
+        description: "Description of VDU-B-1"
         vdu_profile:
           min_number_of_instances: 1
           max_number_of_instances: 2
@@ -116,13 +135,13 @@ topology_template:
         virtual_compute:
           properties:
             virtual_memory:
-              virtual_mem_size: 4096
+              virtual_mem_size: 4096 MB
               numa_enabled: false
             virtual_cpu:
               num_virtual_cpu: 2
       requirements:
-        virtual_storage:
-        - "vdu-b-1-vsd"
+        - virtual_storage: vdu-b-1-vsd
+        
     vnf-b-1_VNF:
       type: "tst010.vnf.simple"
       properties:
@@ -145,5 +164,4 @@ topology_template:
           terminate:
             implementation: terminate-example.yaml
           operate:
-            implementation: operate-example.yaml
-
+            implementation: operate-example.yaml
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml b/SOL005/NSLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
index fdcf741de..413d76def 100644
--- a/SOL005/NSLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
+++ b/SOL005/NSLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_yaml_1_2
 description: "TST010 reference VNF-B"
 
 imports:
-  - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.7.1/etsi_nfv_sol001_vnfd_types.yaml
+  - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.7.1/etsi_nfv_sol001_vnfd_types.yaml  
 
 metadata:
   descriptor_id: "VNF-B"
@@ -44,7 +44,7 @@ node_types:
         type: list
         entry_schema:
           type: string
-          default: [ 'etsivnfm:v2.3.1' ]
+        default: [ 'etsivnfm:v2.3.1' ]
     interfaces:
       Vnflcm:
         type: "tosca.interfaces.nfv.Vnflcm"
@@ -54,6 +54,23 @@ node_types:
           description: Invoked upon receipt Terminate VNF request
         operate:
           description: Invoked upon receipt of an Operate VNF request
+    requirements:
+      - virtual_link_right:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [0, 1]
+      - virtual_link_left:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [0, 1]
+      - virtual_link_management:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [0, 1]
+      - virtual_link:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [0, 0]
 
 topology_template:
   substitution_mappings:
@@ -69,29 +86,31 @@ topology_template:
     right:
       type: "tosca.nodes.nfv.VduCp"
       properties:
+        layer_protocols: [ ipv4 ]
         order: 1
       requirements:
-        virtual_link_right:
-        virtual_binding: VDU-B
+        - virtual_binding: VDU-B
+    vdu-b-1-vsd:
     management:
       type: "tosca.nodes.nfv.VduCp"
       properties:
+        layer_protocols: [ ipv4 ]
         order: 0
       requirements:
-        virtual_link_management:
-        virtual_binding: VDU-B
+        - virtual_binding: VDU-B
+    vdu-b-1-vsd:
     left:
       type: "tosca.nodes.nfv.VduCp"
       properties:
+        layer_protocols: [ ipv4 ]
         order: 2
       requirements:
-        virtual_link_left:
-        virtual_binding: VDU-B
+        - virtual_binding: VDU-B
     vdu-b-1-vsd:
       type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
       properties:
         virtual_block_storage_data:
-          size_of_storage: 20
+          size_of_storage: 20 GB
           rdma_enabled: false
         sw_image_data:
           name: "vdu-b-1 image"
@@ -100,15 +119,15 @@ topology_template:
             algorithm: "sha-224"
             hash: "somehashfortst010"
           container_format: "bare"
-          disk-format: qcow2
-          min-disk: '1'
-          min-ram: '2'
+          disk_format: qcow2
+          min_disk: '1'
+          min_ram: '2'
           size: '1'
     VDU-B:
       type: "tosca.nodes.nfv.Vdu.Compute"
       properties:
         name: "vdu-b-1-vcd"
-        descriptor: "Description of VDU-B-1"
+        description: "Description of VDU-B-1"
         vdu_profile:
           min_number_of_instances: 1
           max_number_of_instances: 2
@@ -116,13 +135,13 @@ topology_template:
         virtual_compute:
           properties:
             virtual_memory:
-              virtual_mem_size: 4096
+              virtual_mem_size: 4096 MB
               numa_enabled: false
             virtual_cpu:
               num_virtual_cpu: 2
       requirements:
-        virtual_storage:
-        - "vdu-b-1-vsd"
+        - virtual_storage: vdu-b-1-vsd
+        
     vnf-b-1_VNF:
       type: "tst010.vnf.simple"
       properties:
@@ -145,5 +164,4 @@ topology_template:
           terminate:
             implementation: terminate-example.yaml
           operate:
-            implementation: operate-example.yaml
-
+            implementation: operate-example.yaml
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml b/SOL005/VNFPackageManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
index fdcf741de..413d76def 100644
--- a/SOL005/VNFPackageManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
+++ b/SOL005/VNFPackageManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_yaml_1_2
 description: "TST010 reference VNF-B"
 
 imports:
-  - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.7.1/etsi_nfv_sol001_vnfd_types.yaml
+  - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.7.1/etsi_nfv_sol001_vnfd_types.yaml  
 
 metadata:
   descriptor_id: "VNF-B"
@@ -44,7 +44,7 @@ node_types:
         type: list
         entry_schema:
           type: string
-          default: [ 'etsivnfm:v2.3.1' ]
+        default: [ 'etsivnfm:v2.3.1' ]
     interfaces:
       Vnflcm:
         type: "tosca.interfaces.nfv.Vnflcm"
@@ -54,6 +54,23 @@ node_types:
           description: Invoked upon receipt Terminate VNF request
         operate:
           description: Invoked upon receipt of an Operate VNF request
+    requirements:
+      - virtual_link_right:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [0, 1]
+      - virtual_link_left:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [0, 1]
+      - virtual_link_management:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [0, 1]
+      - virtual_link:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          occurrences: [0, 0]
 
 topology_template:
   substitution_mappings:
@@ -69,29 +86,31 @@ topology_template:
     right:
       type: "tosca.nodes.nfv.VduCp"
       properties:
+        layer_protocols: [ ipv4 ]
         order: 1
       requirements:
-        virtual_link_right:
-        virtual_binding: VDU-B
+        - virtual_binding: VDU-B
+    vdu-b-1-vsd:
     management:
       type: "tosca.nodes.nfv.VduCp"
       properties:
+        layer_protocols: [ ipv4 ]
         order: 0
       requirements:
-        virtual_link_management:
-        virtual_binding: VDU-B
+        - virtual_binding: VDU-B
+    vdu-b-1-vsd:
     left:
       type: "tosca.nodes.nfv.VduCp"
       properties:
+        layer_protocols: [ ipv4 ]
         order: 2
       requirements:
-        virtual_link_left:
-        virtual_binding: VDU-B
+        - virtual_binding: VDU-B
     vdu-b-1-vsd:
       type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
       properties:
         virtual_block_storage_data:
-          size_of_storage: 20
+          size_of_storage: 20 GB
           rdma_enabled: false
         sw_image_data:
           name: "vdu-b-1 image"
@@ -100,15 +119,15 @@ topology_template:
             algorithm: "sha-224"
             hash: "somehashfortst010"
           container_format: "bare"
-          disk-format: qcow2
-          min-disk: '1'
-          min-ram: '2'
+          disk_format: qcow2
+          min_disk: '1'
+          min_ram: '2'
           size: '1'
     VDU-B:
       type: "tosca.nodes.nfv.Vdu.Compute"
       properties:
         name: "vdu-b-1-vcd"
-        descriptor: "Description of VDU-B-1"
+        description: "Description of VDU-B-1"
         vdu_profile:
           min_number_of_instances: 1
           max_number_of_instances: 2
@@ -116,13 +135,13 @@ topology_template:
         virtual_compute:
           properties:
             virtual_memory:
-              virtual_mem_size: 4096
+              virtual_mem_size: 4096 MB
               numa_enabled: false
             virtual_cpu:
               num_virtual_cpu: 2
       requirements:
-        virtual_storage:
-        - "vdu-b-1-vsd"
+        - virtual_storage: vdu-b-1-vsd
+        
     vnf-b-1_VNF:
       type: "tst010.vnf.simple"
       properties:
@@ -145,5 +164,4 @@ topology_template:
           terminate:
             implementation: terminate-example.yaml
           operate:
-            implementation: operate-example.yaml
-
+            implementation: operate-example.yaml
\ No newline at end of file
-- 
GitLab


From ec0b6ef85d9815b02564b84d9d6236817f8a81d1 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Fri, 19 Mar 2021 09:26:15 +0100
Subject: [PATCH 310/322] minor updates

---
 SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot  | 2 +-
 .../{vnfLcmOpOcc.schema.json => VnfLcmOpOcc.schema.json}        | 0
 .../{vnfLcmOpOccs.schema.json => VnfLcmOpOccs.schema.json}      | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename SOL002/VNFLifecycleManagement-API/schemas/{vnfLcmOpOcc.schema.json => VnfLcmOpOcc.schema.json} (100%)
 rename SOL002/VNFLifecycleManagement-API/schemas/{vnfLcmOpOccs.schema.json => VnfLcmOpOccs.schema.json} (100%)

diff --git a/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot b/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot
index 03e5e173b..ba1bf1f81 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot
@@ -29,7 +29,7 @@ GET Individual Subscription
     ...    Post-Conditions: none 
     Get Individual Subscription
     Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    Subscription
+    Check HTTP Response Body Json Schema Is    subscription
 
 PUT an individual subscription - Method not implemented
     [Documentation]    Test ID: 6.3.5.18.3
diff --git a/SOL002/VNFLifecycleManagement-API/schemas/vnfLcmOpOcc.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/VnfLcmOpOcc.schema.json
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API/schemas/vnfLcmOpOcc.schema.json
rename to SOL002/VNFLifecycleManagement-API/schemas/VnfLcmOpOcc.schema.json
diff --git a/SOL002/VNFLifecycleManagement-API/schemas/vnfLcmOpOccs.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/VnfLcmOpOccs.schema.json
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API/schemas/vnfLcmOpOccs.schema.json
rename to SOL002/VNFLifecycleManagement-API/schemas/VnfLcmOpOccs.schema.json
-- 
GitLab


From 3a2f3cf9292c1df8b4814a36af3c83600a037cad Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Sat, 20 Mar 2021 19:38:52 +0100
Subject: [PATCH 311/322] fixed issue #174

---
 SOL002/VNFLifecycleManagement-API/FailOperationTask.robot | 2 +-
 SOL003/VNFLifecycleManagement-API/FailOperationTask.robot | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot b/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
index 071e57c71..cd45637c6 100644
--- a/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
@@ -17,7 +17,7 @@ POST Fail operation task
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post Fail operation
-    Check HTTP Response Status Code Is    202
+    Check HTTP Response Status Code Is    200
     Check Operation Occurrence Id
     Check operation resource state is FINALLY_FAILED
 
diff --git a/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot b/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
index 3d3cb5877..646a2ab3c 100644
--- a/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
@@ -17,7 +17,7 @@ POST Fail operation task
     ...    Applicability: none
     ...    Post-Conditions: VNF resource state is FINALLY_FAILED
     Post Fail operation
-    Check HTTP Response Status Code Is    202
+    Check HTTP Response Status Code Is    200
     Check Operation Occurrence Id existence
     Check operation resource state is FINALLY_FAILED
 
-- 
GitLab


From 2dfe635c265ec39c68702e359dc8001b599848d4 Mon Sep 17 00:00:00 2001
From: hammad zafar <hammad.zafar@xflowresearch.com>
Date: Wed, 24 Mar 2021 13:00:29 +0500
Subject: [PATCH 312/322] NotificationEndpoint.robot resource updated

---
 .../NotificationEndpoint.robot                | 115 +++++-------
 .../environment/variables.txt                 |   3 +
 .../jsons/VrQuotaAvailNotification.json       |   1 -
 .../VrQuotaAvailNotification.schema.json      |   8 +
 .../VrQuotaAvailSubscription.schema.json      |  84 ++++++++-
 .../VrQuotaAvailSubscriptions.schema.json     | 168 +++++++++---------
 .../vrQuotaAvailNotification.schema.json      |   0
 7 files changed, 225 insertions(+), 154 deletions(-)
 create mode 100644 SOL003/VirtualisedResourcesQuotaAvailableNotification-API/schemas/VrQuotaAvailNotification.schema.json
 delete mode 100644 SOL003/VirtualisedResourcesQuotaAvailableNotification-API/schemas/vrQuotaAvailNotification.schema.json

diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot
index 9d81b4580..60af974de 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot
@@ -1,83 +1,62 @@
 *** Settings ***
 Resource    environment/variables.txt 
-Resource    VRQANOperationKeywords.robot 
 Suite Setup    Create Sessions
 Suite Teardown    Terminate All Processes    kill=true
 Library    MockServerLibrary
 Library    Process
 Library    OperatingSystem
-
-*** Variables ***
-
+Library    Collections
 
 *** Test Cases ***
-Deliver a notification - Vr Quota Availibility
-    [Documentation]    Test ID: 11.4.4.1
-    ...    Test title: Deliver a notification - Vr Quota Availibility
-    ...    Test objective: The objective is to notify related to the availability of the virtualised resources quota.
-    ...    Pre-conditions: The VNF has subscribed to the Vr Quota Availibility resource
-    ...    Reference: Clause 11.4.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
+Virtual Quota Available Notification
+    [Documentation]    Test ID: 7.3.7.5.1
+    ...    Test title: Virtual Quota Available Notification
+    ...    Test objective: The objective is to test the dispatch of Virtual Quota Available Notification, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
+    ...    Pre-conditions: A subscription for Virtual Quota Available Notification is available in the VNFM.
+    ...    Reference: Clause 11.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions:  
-    log    The POST method delivers a notification from the server to the client.
-    ${json}=	Get File	schemas/VrQuotaAvailNotification.schema.json
-    ${BODY}=	evaluate	json.loads('''${json}''')	json
-    Log  Creating mock request and response to handle Vr Quota AvailibilityNotification
-    &{req}=  Create Mock Request Matcher	POST  ${callback_endpoint}  body_type="JSON_SCHEMA"    body=${BODY}
-    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
-    Create Mock Expectation  ${req}  ${rsp}
-    Sleep  ${sleep_interval}
-    Log  Verifying results
-    Verify Mock Expectation  ${req}
-    Log  Cleaning the endpoint
-    Clear Requests  ${callback_endpoint}
-
-Test a notification end point
-    log    The GET method allows the server to test the notification endpoint
-    &{req}=  Create Mock Request Matcher	GET  ${callback_endpoint}    
-    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
-    Create Mock Expectation  ${req}  ${rsp}
-    Sleep  ${sleep_interval}
-    Verify Mock Expectation  ${req}
-    Clear Requests  ${callback_endpoint}
-
-PUT notification - Method not implemented
-    Log  PUT Method not implemented
-    &{req}=  Create Mock Request Matcher	PUT  ${callback_endpoint}
-    &{rsp}=  Create Mock Response  status_code=405
-    Create Mock Expectation  ${req}  ${rsp}
-    Sleep  ${sleep_interval}
-    Log  Verifying results
-    Verify Mock Expectation  ${req}
-    Log  Cleaning the endpoint
-    Clear Requests  ${callback_endpoint}
-
-PATCH subscriptions - Method not implemented
-    Log  PATCH Method not implemented
-    &{req}=  Create Mock Request Matcher	PATCH  ${callback_endpoint}
-    &{rsp}=  Create Mock Response  status_code=405
-    Create Mock Expectation  ${req}  ${rsp}
-    Sleep  ${sleep_interval}
-    Log  Verifying results
-    Verify Mock Expectation  ${req}
-    Log  Cleaning the endpoint
-    Clear Requests  ${callback_endpoint}
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Trigger a dispatch of virtual quota available notification (external action) 
+    Check Virtual Quota Available Notification Http POST Request Body Json Schema Is    VrQuotaAvailNotification
+    Check Virtual Quota Available Notification Http POST Request Body notificationType attribute Is    VrQuotaAvailNotification
+   
+*** Keywords ***
 
-DELETE subscriptions - Method not implemented
-    Log  DELETE Method not implemented
-    &{req}=  Create Mock Request Matcher	DELETE  ${callback_endpoint}
-    &{rsp}=  Create Mock Response  status_code=405
-    Create Mock Expectation  ${req}  ${rsp}
-    Sleep  ${sleep_interval}
-    Log  Verifying results
-    Verify Mock Expectation  ${req}
-    Log  Cleaning the endpoint
-    Clear Requests  ${callback_endpoint}
+Trigger a dispatch of virtual quota available notification (external action) 
+    #do nothing
+    Log    do nothing  
+    
+Check Virtual Quota Available Notification Http POST Request Body Json Schema Is  
+    [Arguments]    ${element}
+    ${schema}=	Get File	schemas/${element}.schema.json
+    Configure Notification Forward    ${schema}    ${callback_endpoint}    ${callback_endpoint_fwd}
+
+Check Virtual Quota Available Notification Http POST Request Body notificationType attribute Is
+    [Arguments]    ${type}
+    Configure Virtual Quota Available Notification Handler    ${callback_endpoint_fwd}    ${type}
+    Wait Until Keyword Succeeds    2 min   10 sec   Verify Mock Expectation    ${notification_request}
+    Clear Requests    ${callback_endpoint}
+    Clear Requests    ${callback_endpoint_fwd}
+    
+Configure Virtual Quota Available Notification Handler
+    [Arguments]    ${endpoint}    ${type}
+    ${json}=    evaluate    {}
+    set to dictionary   ${json}    notificationType    ${type}
+    ${BODY}=    evaluate    json.dumps(${json})    json
+    Log  Creating mock request and response to handle status notification
+    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    Create Mock Expectation  ${notification_request}  ${notification_response}
+    
+Configure Notification Forward
+    [Arguments]    ${schema}    ${endpoint}    ${endpoint_fwd}    
+    Log  Creating mock Http POST forward to handle ${schema}
+    &{notification_tmp}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON_SCHEMA"    body=${schema}
+    &{notification_fwd}=  Create Mock Http Forward	${endpoint_fwd}
+    Create Mock Expectation With Http Forward  ${notification_tmp}  ${notification_fwd}
 
-*** Keywords ***
 Create Sessions
     Start Process  java  -jar  ${MOCK_SERVER_JAR}  -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
-    Create Mock Session  ${callback_uri}:${callback_port} 
-
+    Create Mock Session  ${callback_uri}:${callback_port}
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt
index a705ad751..3a90362a0 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt
@@ -15,11 +15,14 @@ ${sub_filter}    filter
 ${sub_filter_invalid}    filter_invalid
 
 ${callback_endpoint}    /notification
+${callback_endpoint_fwd}    /endpoint/check
 ${callback_subscribe}    /subscribe
 ${callback_port}    9091
 ${callback_uri}     http://localhost
 ${sleep_interval}    20s
 
+${notification_request}    []
+${notification_response}    []
 
 ${apiRoot}        /
 ${apiName}        vrqan
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/jsons/VrQuotaAvailNotification.json b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/jsons/VrQuotaAvailNotification.json
index e24fb8108..7cab6f283 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/jsons/VrQuotaAvailNotification.json
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/jsons/VrQuotaAvailNotification.json
@@ -1,4 +1,3 @@
- 
 {{
 	"id":"",
 	"notificationType":"VrQuotaAvailNotification",
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/schemas/VrQuotaAvailNotification.schema.json b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/schemas/VrQuotaAvailNotification.schema.json
new file mode 100644
index 000000000..31a1800bb
--- /dev/null
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/schemas/VrQuotaAvailNotification.schema.json
@@ -0,0 +1,8 @@
+{
+	"id":"",
+	"notificationType":"VrQuotaAvailNotification",
+	"subscriptionId": "",
+	"timeStamp":"",
+	"resourceGroupId":"",
+	"_links": ""
+}
\ No newline at end of file
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/schemas/VrQuotaAvailSubscription.schema.json b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/schemas/VrQuotaAvailSubscription.schema.json
index aaa9c5405..8f37c51c1 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/schemas/VrQuotaAvailSubscription.schema.json
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/schemas/VrQuotaAvailSubscription.schema.json
@@ -1 +1,83 @@
-{  "description": "This type represents a subscription related to notifications related to the availability of the virtualised resources quotas.\n",  "type": "object",  "required": [    "id",    "callbackUri",    "_links"  ],  "properties": {    "id": {      "description": "An identifier with the intention of being globally unique.\n",      "type": "string"    },    "filter": {      "description": "This type represents a subscription filter related to notifications about the availability of the virtualised resources quotas. At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n",      "type": "object",      "properties": {        "vimIds": {          "description": "Match VIMs that were created the quota for a consumer of the virtualised resources. This attribute shall only be supported when VNF-related Resource Management in direct mode is applicable.\n",          "type": "array",          "items": {            "description": "An identifier with the intention of being globally unique.\n",            "type": "string"          }        },        "resourceProviderIds": {          "description": "Match the entities responsible for the management of the virtualised resources that were allocated by the NFVO. This attribute shall only be supported when VNF-related Resource Management in indirect mode is applicable. The identification scheme is outside the scope of the present document.\n",          "type": "array",          "items": {            "description": "An identifier with the intention of being globally unique.\n",            "type": "string"          }        },        "resourceTypes": {          "description": "Match particular resource types.\n",          "type": "array",          "items": {            "type": "string",            "enum": [              "COMPUTE",              "STORAGE",              "NETWORK"            ]          }        },        "resourceGroupIds": {          "description": "Match the \"infrastructure resource groups\" that are logical groupings of the virtualised resources assigned to a tenant within an infrastructure Domain.\n",          "type": "array",          "items": {            "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",            "type": "string"          }        }      }    },    "callbackUri": {      "description": "String formatted according to IETF RFC 3986.\n",      "type": "string"    },    "_links": {      "description": "Links for this resource\n",      "type": "object",      "required": [        "self"      ],      "properties": {        "self": {          "description": "This type represents a link to a resource.\n",          "type": "object",          "required": [            "href"          ],          "properties": {            "href": {              "description": "URI of the referenced resource.\n",              "type": "string",              "format": "url"            }          }        }      }    }  }}
\ No newline at end of file
+{
+	"description": "This type represents a subscription related to notifications related to the availability of the virtualised resources quotas.\n",
+	"type": "object",
+	"required": [
+		"id",
+		"callbackUri",
+		"_links"
+	],
+	"properties": {
+		"id": {
+			"description": "An identifier with the intention of being globally unique.\n",
+			"type": "string"
+		},
+		"filter": {
+			"description": "This type represents a subscription filter related to notifications about the availability of the virtualised resources quotas. At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n",
+			"type": "object",
+			"properties": {
+				"vimIds": {
+					"description": "Match VIMs that were created the quota for a consumer of the virtualised resources. This attribute shall only be supported when VNF-related Resource Management in direct mode is applicable.\n",
+					"type": "array",
+					"items": {
+						"description": "An identifier with the intention of being globally unique.\n",
+						"type": "string"
+					}
+				},
+				"resourceProviderIds": {
+					"description": "Match the entities responsible for the management of the virtualised resources that were allocated by the NFVO. This attribute shall only be supported when VNF-related Resource Management in indirect mode is applicable. The identification scheme is outside the scope of the present document.\n",
+					"type": "array",
+					"items": {
+						"description": "An identifier with the intention of being globally unique.\n",
+						"type": "string"
+					}
+				},
+				"resourceTypes": {
+					"description": "Match particular resource types.\n",
+					"type": "array",
+					"items": {
+						"type": "string",
+						"enum": [
+							"COMPUTE",
+							"STORAGE",
+							"NETWORK"
+						]
+					}
+				},
+				"resourceGroupIds": {
+					"description": "Match the \"infrastructure resource groups\" that are logical groupings of the virtualised resources assigned to a tenant within an infrastructure Domain.\n",
+					"type": "array",
+					"items": {
+						"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+						"type": "string"
+					}
+				}
+			}
+		},
+		"callbackUri": {
+			"description": "String formatted according to IETF RFC 3986.\n",
+			"type": "string"
+		},
+		"_links": {
+			"description": "Links for this resource\n",
+			"type": "object",
+			"required": [
+				"self"
+			],
+			"properties": {
+				"self": {
+					"description": "This type represents a link to a resource using an absolute URI.\n",
+					"type": "object",
+					"required": [
+						"href"
+					],
+					"properties": {
+						"href": {
+							"description": "String formatted according to IETF RFC 3986.\n",
+							"type": "string"
+						}
+					}
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/schemas/VrQuotaAvailSubscriptions.schema.json b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/schemas/VrQuotaAvailSubscriptions.schema.json
index 8bab3d157..9ad57bc21 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/schemas/VrQuotaAvailSubscriptions.schema.json
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/schemas/VrQuotaAvailSubscriptions.schema.json
@@ -1,87 +1,87 @@
 {
   "type": "array",
-  "items": {
-    "description": "This type represents a subscription related to notifications related to the availability of the virtualised resources quotas.\n",
-    "type": "object",
-    "required": [
-      "id",
-      "callbackUri",
-      "_links"
-    ],
-    "properties": {
-      "id": {
-        "description": "An identifier with the intention of being globally unique.\n",
-        "type": "string"
-      },
-      "filter": {
-        "description": "This type represents a subscription filter related to notifications about the availability of the virtualised resources quotas. At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n",
-        "type": "object",
-        "properties": {
-          "vimIds": {
-            "description": "Match VIMs that were created the quota for a consumer of the virtualised resources. This attribute shall only be supported when VNF-related Resource Management in direct mode is applicable.\n",
-            "type": "array",
-            "items": {
-              "description": "An identifier with the intention of being globally unique.\n",
-              "type": "string"
-            }
-          },
-          "resourceProviderIds": {
-            "description": "Match the entities responsible for the management of the virtualised resources that were allocated by the NFVO. This attribute shall only be supported when VNF-related Resource Management in indirect mode is applicable. The identification scheme is outside the scope of the present document.\n",
-            "type": "array",
-            "items": {
-              "description": "An identifier with the intention of being globally unique.\n",
-              "type": "string"
-            }
-          },
-          "resourceTypes": {
-            "description": "Match particular resource types.\n",
-            "type": "array",
-            "items": {
-              "type": "string",
-              "enum": [
-                "COMPUTE",
-                "STORAGE",
-                "NETWORK"
-              ]
-            }
-          },
-          "resourceGroupIds": {
-            "description": "Match the \"infrastructure resource groups\" that are logical groupings of the virtualised resources assigned to a tenant within an infrastructure Domain.\n",
-            "type": "array",
-            "items": {
-              "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-              "type": "string"
-            }
-          }
-        }
-      },
-      "callbackUri": {
-        "description": "String formatted according to IETF RFC 3986.\n",
-        "type": "string"
-      },
-      "_links": {
-        "description": "Links for this resource\n",
-        "type": "object",
-        "required": [
-          "self"
-        ],
-        "properties": {
-          "self": {
-            "description": "This type represents a link to a resource.\n",
-            "type": "object",
-            "required": [
-              "href"
-            ],
-            "properties": {
-              "href": {
-                "description": "URI of the referenced resource.\n",
-                "type": "string",
-                "format": "url"
-              }
-            }
-          }
-        }
-      }
-    }
+  "items":
+  {
+	"description": "This type represents a subscription related to notifications related to the availability of the virtualised resources quotas.\n",
+	"type": "object",
+	"required": [
+		"id",
+		"callbackUri",
+		"_links"
+	],
+	"properties": {
+		"id": {
+			"description": "An identifier with the intention of being globally unique.\n",
+			"type": "string"
+		},
+		"filter": {
+			"description": "This type represents a subscription filter related to notifications about the availability of the virtualised resources quotas. At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n",
+			"type": "object",
+			"properties": {
+				"vimIds": {
+					"description": "Match VIMs that were created the quota for a consumer of the virtualised resources. This attribute shall only be supported when VNF-related Resource Management in direct mode is applicable.\n",
+					"type": "array",
+					"items": {
+						"description": "An identifier with the intention of being globally unique.\n",
+						"type": "string"
+					}
+				},
+				"resourceProviderIds": {
+					"description": "Match the entities responsible for the management of the virtualised resources that were allocated by the NFVO. This attribute shall only be supported when VNF-related Resource Management in indirect mode is applicable. The identification scheme is outside the scope of the present document.\n",
+					"type": "array",
+					"items": {
+						"description": "An identifier with the intention of being globally unique.\n",
+						"type": "string"
+					}
+				},
+				"resourceTypes": {
+					"description": "Match particular resource types.\n",
+					"type": "array",
+					"items": {
+						"type": "string",
+						"enum": [
+							"COMPUTE",
+							"STORAGE",
+							"NETWORK"
+						]
+					}
+				},
+				"resourceGroupIds": {
+					"description": "Match the \"infrastructure resource groups\" that are logical groupings of the virtualised resources assigned to a tenant within an infrastructure Domain.\n",
+					"type": "array",
+					"items": {
+						"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+						"type": "string"
+					}
+				}
+			}
+		},
+		"callbackUri": {
+			"description": "String formatted according to IETF RFC 3986.\n",
+			"type": "string"
+		},
+		"_links": {
+			"description": "Links for this resource\n",
+			"type": "object",
+			"required": [
+				"self"
+			],
+			"properties": {
+				"self": {
+					"description": "This type represents a link to a resource using an absolute URI.\n",
+					"type": "object",
+					"required": [
+						"href"
+					],
+					"properties": {
+						"href": {
+							"description": "String formatted according to IETF RFC 3986.\n",
+							"type": "string"
+						}
+					}
+				}
+			}
+		}
+	}
   }
-}
+}
\ No newline at end of file
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/schemas/vrQuotaAvailNotification.schema.json b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/schemas/vrQuotaAvailNotification.schema.json
deleted file mode 100644
index e69de29bb..000000000
-- 
GitLab


From 3c9a10ec2243ff7831318d499849764d3a76e7b8 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Wed, 24 Mar 2021 10:10:57 +0100
Subject: [PATCH 313/322] upd to notification

---
 .../NotificationEndpoint.robot                | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot
index 60af974de..d1a1a3272 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot
@@ -8,31 +8,31 @@ Library    OperatingSystem
 Library    Collections
 
 *** Test Cases ***
-Virtual Quota Available Notification
+Virtualised Resource Quota Available Notification
     [Documentation]    Test ID: 7.3.7.5.1
-    ...    Test title: Virtual Quota Available Notification
-    ...    Test objective: The objective is to test the dispatch of Virtual Quota Available Notification, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
-    ...    Pre-conditions: A subscription for Virtual Quota Available Notification is available in the VNFM.
+    ...    Test title: Virtualised Resource Quota Available Notification
+    ...    Test objective: The objective is to test the dispatch of Virtualised Resource Quota Available Notification, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
+    ...    Pre-conditions: A subscription for Virtualised Resource Quota Available Notification is available in the VNFM.
     ...    Reference: Clause 11.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Trigger a dispatch of virtual quota available notification (external action) 
-    Check Virtual Quota Available Notification Http POST Request Body Json Schema Is    VrQuotaAvailNotification
-    Check Virtual Quota Available Notification Http POST Request Body notificationType attribute Is    VrQuotaAvailNotification
+    Trigger a dispatch of virtualised resource quota available notification (external action) 
+    Check Virtualised Resource Quota Available Notification Http POST Request Body Json Schema Is    VrQuotaAvailNotification
+    Check Virtualised Resource Quota Available Notification Http POST Request Body notificationType attribute Is    VrQuotaAvailNotification
    
 *** Keywords ***
 
-Trigger a dispatch of virtual quota available notification (external action) 
+Trigger a dispatch of virtualised resource quota available notification (external action) 
     #do nothing
     Log    do nothing  
     
-Check Virtual Quota Available Notification Http POST Request Body Json Schema Is  
+Check Virtualised Resource Quota Available Notification Http POST Request Body Json Schema Is  
     [Arguments]    ${element}
     ${schema}=	Get File	schemas/${element}.schema.json
     Configure Notification Forward    ${schema}    ${callback_endpoint}    ${callback_endpoint_fwd}
 
-Check Virtual Quota Available Notification Http POST Request Body notificationType attribute Is
+Check Virtualised Resource Quota Available Notification Http POST Request Body notificationType attribute Is
     [Arguments]    ${type}
     Configure Virtual Quota Available Notification Handler    ${callback_endpoint_fwd}    ${type}
     Wait Until Keyword Succeeds    2 min   10 sec   Verify Mock Expectation    ${notification_request}
@@ -45,8 +45,9 @@ Configure Virtual Quota Available Notification Handler
     set to dictionary   ${json}    notificationType    ${type}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{notification_response}=  Create Mock Response    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
     
 Configure Notification Forward
-- 
GitLab


From f45d1816cbe6cfd971ae055a3c72a2caa9501389 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Tue, 30 Mar 2021 13:02:47 +0200
Subject: [PATCH 314/322] updated notification file names and csv indexes as
 agreed in TST#161

---
 ...tionEndpoint.robot => Notifications.robot} |  0
 ...sumer.robot => NotificationConsumer.robot} |  0
 ...Notification.robot => Notifications.robot} |  0
 ...tionEndpoint.robot => Notifications.robot} |  0
 ...Notification.robot => Notifications.robot} |  0
 ...tionEndpoint.robot => Notifications.robot} |  0
 ...Notification.robot => Notifications.robot} |  0
 ...tionEndpoint.robot => Notifications.robot} |  0
 ...Notification.robot => Notifications.robot} |  0
 ...Notification.robot => Notifications.robot} |  0
 ...tionEndpoint.robot => Notifications.robot} |  0
 ...Notification.robot => Notifications.robot} |  0
 ...tionEndpoint.robot => Notifications.robot} |  0
 ...tionEndpoint.robot => Notifications.robot} |  0
 indexes/sol_002_index.csv                     | 17 +++++++-------
 indexes/sol_003_index.csv                     | 23 ++++++++++---------
 indexes/sol_005_index.csv                     | 20 ++++++++--------
 17 files changed, 31 insertions(+), 29 deletions(-)
 rename SOL002/VNFFaultManagement-API/{NotificationEndpoint.robot => Notifications.robot} (100%)
 rename SOL002/VNFIndicator-API/{NoificationConsumer.robot => NotificationConsumer.robot} (100%)
 rename SOL002/VNFIndicatorNotification-API/{VnfIndicatorNotification.robot => Notifications.robot} (100%)
 rename SOL002/VNFLifecycleManagement-API/{NotificationEndpoint.robot => Notifications.robot} (100%)
 rename SOL002/VNFPerformanceManagementNotification-API/{PerformanceManagementNotification.robot => Notifications.robot} (100%)
 rename SOL003/VNFFaultManagementNotification-API/{NotificationEndpoint.robot => Notifications.robot} (100%)
 rename SOL003/VNFIndicator-API/{VnfIndicatorNotification.robot => Notifications.robot} (100%)
 rename SOL003/VNFLifecycleManagement-API/{NotificationEndpoint.robot => Notifications.robot} (100%)
 rename SOL003/VNFPackageManagement-API/{PackageManagementNotification.robot => Notifications.robot} (100%)
 rename SOL003/VNFPerformanceManagement-API/{PerformanceManagementNotification.robot => Notifications.robot} (100%)
 rename SOL003/VirtualisedResourcesQuotaAvailableNotification-API/{NotificationEndpoint.robot => Notifications.robot} (100%)
 rename SOL005/NSDManagement-API/{NSDManagementNotification.robot => Notifications.robot} (100%)
 rename SOL005/NSFaultManagement-API/{NotificationEndpoint.robot => Notifications.robot} (100%)
 rename SOL005/NSLifecycleManagement-API/{NotificationEndpoint.robot => Notifications.robot} (100%)

diff --git a/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot b/SOL002/VNFFaultManagement-API/Notifications.robot
similarity index 100%
rename from SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
rename to SOL002/VNFFaultManagement-API/Notifications.robot
diff --git a/SOL002/VNFIndicator-API/NoificationConsumer.robot b/SOL002/VNFIndicator-API/NotificationConsumer.robot
similarity index 100%
rename from SOL002/VNFIndicator-API/NoificationConsumer.robot
rename to SOL002/VNFIndicator-API/NotificationConsumer.robot
diff --git a/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot b/SOL002/VNFIndicatorNotification-API/Notifications.robot
similarity index 100%
rename from SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
rename to SOL002/VNFIndicatorNotification-API/Notifications.robot
diff --git a/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot b/SOL002/VNFLifecycleManagement-API/Notifications.robot
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
rename to SOL002/VNFLifecycleManagement-API/Notifications.robot
diff --git a/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot b/SOL002/VNFPerformanceManagementNotification-API/Notifications.robot
similarity index 100%
rename from SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
rename to SOL002/VNFPerformanceManagementNotification-API/Notifications.robot
diff --git a/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot b/SOL003/VNFFaultManagementNotification-API/Notifications.robot
similarity index 100%
rename from SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot
rename to SOL003/VNFFaultManagementNotification-API/Notifications.robot
diff --git a/SOL003/VNFIndicator-API/VnfIndicatorNotification.robot b/SOL003/VNFIndicator-API/Notifications.robot
similarity index 100%
rename from SOL003/VNFIndicator-API/VnfIndicatorNotification.robot
rename to SOL003/VNFIndicator-API/Notifications.robot
diff --git a/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot b/SOL003/VNFLifecycleManagement-API/Notifications.robot
similarity index 100%
rename from SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot
rename to SOL003/VNFLifecycleManagement-API/Notifications.robot
diff --git a/SOL003/VNFPackageManagement-API/PackageManagementNotification.robot b/SOL003/VNFPackageManagement-API/Notifications.robot
similarity index 100%
rename from SOL003/VNFPackageManagement-API/PackageManagementNotification.robot
rename to SOL003/VNFPackageManagement-API/Notifications.robot
diff --git a/SOL003/VNFPerformanceManagement-API/PerformanceManagementNotification.robot b/SOL003/VNFPerformanceManagement-API/Notifications.robot
similarity index 100%
rename from SOL003/VNFPerformanceManagement-API/PerformanceManagementNotification.robot
rename to SOL003/VNFPerformanceManagement-API/Notifications.robot
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/Notifications.robot
similarity index 100%
rename from SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot
rename to SOL003/VirtualisedResourcesQuotaAvailableNotification-API/Notifications.robot
diff --git a/SOL005/NSDManagement-API/NSDManagementNotification.robot b/SOL005/NSDManagement-API/Notifications.robot
similarity index 100%
rename from SOL005/NSDManagement-API/NSDManagementNotification.robot
rename to SOL005/NSDManagement-API/Notifications.robot
diff --git a/SOL005/NSFaultManagement-API/NotificationEndpoint.robot b/SOL005/NSFaultManagement-API/Notifications.robot
similarity index 100%
rename from SOL005/NSFaultManagement-API/NotificationEndpoint.robot
rename to SOL005/NSFaultManagement-API/Notifications.robot
diff --git a/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot b/SOL005/NSLifecycleManagement-API/Notifications.robot
similarity index 100%
rename from SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot
rename to SOL005/NSLifecycleManagement-API/Notifications.robot
diff --git a/indexes/sol_002_index.csv b/indexes/sol_002_index.csv
index f3f3a78f3..e35038e7b 100644
--- a/indexes/sol_002_index.csv
+++ b/indexes/sol_002_index.csv
@@ -2,32 +2,33 @@
 6.3.1,VNF Configuration Interface,VNFConfiguration-API
 6.3.1.1,Configuration Resource Endpoint,Configuration.robot
 6.3.1.2,API Version Resource Endpoint,ApiVersion.robot
-6.3.2,	VNF Indicator Interface,VNFIndicator-API
+"6.3.2,	VNF Indicator Interface,VNFIndicator-API"
 6.3.2.1,VNF Indicators Resource Endpoint,VNFIndicators.robot
 6.3.2.2,VNF Indicators related to a VNF Instance Resource Endpoint,VnfIndicatorsInVnfInstanceId.robot 
 6.3.2.3,Individual VNF Indicator Resource Endpoit,IndividualVNFindicator.robot
 6.3.2.4,Subscriptions Resource Endpoint,Subscriptions.robot
 6.3.2.5,Individual Subscription Resource Endpoint,IndividualSubscription.robot
-6.3.2.6,Notification Endpoint,../VNFIndicatorNotification-API/VnfIndicatorNotification.robot
+6.3.2.6,Notifications,../VNFIndicatorNotification-API/Notifications.robot
 6.3.2.7,API Version Resource Endpoint,ApiVersion.robot
+6.3.2.8,Notification Consumer,NotificationConsumer.robot
 6.3.3,VNF Performance Management Interface,VNFPerformanceManagement-API
 6.3.3.1,PM Jobs Resource Endpoint,PMJobs.robot   
 6.3.3.2,Individual PM Job Resource Endpoint,IndividualPmJob.robot 
 6.3.3.3,Individual Performance Report Resource Endpoint,IndividualReport.robot
 6.3.3.4,Thresholds Resource Endpoint,Thresholds.robot
 6.3.3.5,Individual Threshold Resource Endpoint,IndividualThreshold.robot  
-6.3.3.8,Notification Endpoint,../VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot    
+6.3.3.8,Notification Endpoint,../VNFPerformanceManagementNotification-API/Notifications.robot    
 6.3.3.9,API Version Resource Endpoint,ApiVersion.robot
-6.3.3.10, Notification Consumer Endpoint,../VNFPerformanceManagement-API/NotificationConsumer.robot
+6.3.3.10, Notification Consumer,NotificationConsumer.robot
 6.3.4,VNF Fault Management interface,VNFFaultManagement-API
 6.3.4.1,Alarms,Alarms.robot  
 6.3.4.2,Individual Alarm,IndividualAlarm.robot
 6.3.4.3,Escalate the perceived severity,EscalatePerceivedSeverityTask.robot
 6.3.4.4,Subscriptions,Subscriptions.robot
 6.3.4.5,Individual Subscription,IndividualSubscription.robot
-6.3.4.6,Notification Endpoint,NotificationEndpoint.robot
+6.3.4.6,Notifications,Notifications.robot
 6.3.4.7,API Version Resource Endpoint,ApiVersion.robot
-6.3.4.8,Notification Consumer Endpoint,NotificationConsumer.robot
+6.3.4.8,Notification Consumer,NotificationConsumer.robot
 6.3.5,VNF Lifecycle Management interface,VNFLifecycleManagement-API
 6.3.5.1,VNF Instances,VNFInstances.robot
 6.3.5.2,Individual VNFInstance,IndividualVNFInstance.robot 
@@ -47,6 +48,6 @@
 6.3.5.16,Cancel operation task,CancelOperationTask.robot
 6.3.5.17,Subscriptions,Subscriptions.robot
 6.3.5.18,Individual Subscription,IndividualSubscription.robot
-6.3.5.19,Notification Endpoint,NotificationEndpoint.robot
+6.3.5.19,Notifications,Notifications.robot
 6.3.5.20,API Version Resource Endpoint,ApiVersion.robot
-6.3.5.21,Notification Consumer Endpoint,NotificationConsumer.robot
+6.3.5.21,Notification Consumer,NotificationConsumer.robot
diff --git a/indexes/sol_003_index.csv b/indexes/sol_003_index.csv
index 5b4e3ab92..9693dc97c 100644
--- a/indexes/sol_003_index.csv
+++ b/indexes/sol_003_index.csv
@@ -33,9 +33,9 @@
 7.3.1.31,VNF Instance Scale To Level, ScaleVNFToLevelWorkflow.robot
 7.3.1.32,VNF Instance Scale Out, ScaleVNFWorkflow.robot
 7.3.1.33,Terminate a VNF Instance, TerminateVNFWorkflow.robot
-7.3.1.34,Notification Endpoint, NotificationEndpoint.robot
+7.3.1.34,Notifications, Notifications.robot
 7.3.1.35,API Version Resource Endpoint, ApiVersion.robot
-7.3.1.36,Notification Consumer Endpoint, NotificationConsumer.robot
+7.3.1.36,Notification Consumer, NotificationConsumer.robot
 7.3.2,VNF Lifecycle Operation Granting Interface, VNFLifecycleOperationGranting-API
 7.3.2.1,Grants, Grants.robot
 7.3.2.2,Individual Grant, IndividualGrant.robot
@@ -48,37 +48,38 @@
 7.3.3.5,Individual VNF Package Artifact Resource Endpoint, VNFPackageArtifacts.robot
 7.3.3.6,Subscriptions Resource Endpoint, Subscriptions.robot
 7.3.3.7,Individual Subscription Resource Endpoint, IndividualSubscription.robot
-7.3.3.8,Notification Endpoint, PackageManagementNotification.robot
+7.3.3.8,Notifications, Notifications.robot
 7.3.3.9,API Version Resource Endpoint, ApiVersion.robot
-7.3.3.10,Notification Consumer Endpoint, NotificationConsumer.robot
+7.3.3.10,Notification Consumer, NotificationConsumer.robot
 7.3.4,VNF Performance Management Interface, VNFPerformanceManagement-API
 7.3.4.1,PM Jobs Resource Endpoint, PMJobs.robot
 7.3.4.2,Individual Pm Job Resource Endpoint, IndividualPmJob.robot
 7.3.4.3,Individual Performance Report Resource Endpoint, IndividualReport.robot
 7.3.4.4,Thresholds Resource Endpoint, Thresholds.robot
 7.3.4.5,Individual Threshold Resource Endpoint, IndividualThreshold.robot
-7.3.4.8,Notification Endpoint,  PerformanceManagementNotification.robot 
+7.3.4.8,Notifications,Notifications.robot 
 7.3.4.9,API Version Resource Endpoint, ApiVersion.robot
-7.3.4.10,Notification Consumer Endpoint,  NotificationConsumer.robot 
+7.3.4.10,Notification Consumer,NotificationConsumer.robot 
 7.3.5,VNF Fault Management interface, VNFFaultManagement-API
 7.3.5.1,Alarms, Alarms.robot
 7.3.5.2,Individual Alarm, IndividualAlarm.robot 
 7.3.5.3,Subscriptions, Subscriptions.robot
 7.3.5.4,Individual Subscription, IndividualSubscription.robot
-7.3.5.5,Notification Endpoint, ../VNFFaultManagementNotification-API/NotificationEndpoint.robot
+7.3.5.5,Notifications, ../VNFFaultManagementNotification-API/Notifications.robot
 7.3.5.6,API Version Resource Endpoint, ApiVersion.robot
-7.3.5.7,Notification Consumer Endpoint, NotificationConsumer.robot
+7.3.5.7,Notification Consumer,NotificationConsumer.robot
 7.3.6,VNF Indicator Interface, VNFIndicator-API
 7.3.6.1,VNF Indicators Resource Endpoint, VNFIndicators.robot
 7.3.6.2,VNF Indicators Related to a VNF Instance Resource Endpoint, VnfIndicatorsInVnfInstanceId.robot
 7.3.6.3,Individual VNF Indicator Resource Endpoint, IndividualVNFindicator.robot
 7.3.6.4,Subscriptions Resource Endpoint, Subscriptions.robot
 7.3.6.5,Individual Subscription Resource Endpoint, IndividualSubscription.robot
-7.3.6.6,Notification Endpoint, VnfIndicatorNotification.robot
+7.3.6.6,Notifications,Notifications.robot
 7.3.6.7,API Version Resource Endpoint, ApiVersion.robot
-7.3.6.8,Notification Endpoint, NotificationConsumer.robot
+7.3.6.8,Notification Consumer, NotificationConsumer.robot
 7.3.7,Virtualised Resources Quota Available Notification interface, VirtualisedResourcesQuotaAvailableNotification-API
 7.3.7.1,Subscriptions, Subscriptions.robot
 7.3.7.2,Individual Subscription, IndividualSubscription.robot
 7.3.7.3,API Version Resource Endpoint, ApiVersion.robot
-7.3.7.4,Notification Consumer Endpoint, NotificationConsumer.robot
+7.3.7.4,Notification Consumer, NotificationConsumer.robot
+7.3.7.5,Notifications, Notifications.robot
diff --git a/indexes/sol_005_index.csv b/indexes/sol_005_index.csv
index 02b0ff9bf..67f118825 100644
--- a/indexes/sol_005_index.csv
+++ b/indexes/sol_005_index.csv
@@ -8,13 +8,13 @@
 5.3.1.6,PNFD Content Resource Endpoint, PNFDArchiveContent.robot
 5.3.1.7,Subscriptions Resource Endpoint, Subscriptions.robot
 5.3.1.8,Individual Subscription Resource Endpoint, IndividualSubscription.robot
-5.3.1.9,Notifications Endpoint, NSDManagementNotification.robot
+5.3.1.9,Notifications, Notifications.robot
 5.3.1.10,API Version Resource Endpoint, ApiVersion.robot
 5.3.1.11,NSD Resource Endpoint, NSD.robot
 5.3.1.12,NSD Archive Manifest Resource Endpoint, NSDArchiveManifest.robot
 5.3.1.13,PNFD Resource Endpoint, PNFD.robot
 5.3.1.14,PNFD Archive Manifest Resource Endpoint, PNFDArchiveManifest.robot
-5.3.1.15,Notifications Consumer Endpoint, NotificationConsumer.robot
+5.3.1.15,Notifications Consumer, NotificationConsumer.robot
 5.3.2,NS Lifecycle Management interface, NSLifecycleManagement-API
 5.3.2.1,NsInstances, NSInstances.robot
 5.3.2.2,Individual NSInstance, IndividualNSInstance.robot
@@ -32,7 +32,7 @@
 5.3.2.14,Cancel operation task, CancelOperationTask.robot
 5.3.2.15,Subscriptions, Subscriptions.robot
 5.3.2.16,Individual Subscription, IndividualSubscription.robot
-5.3.2.17,Notification Endpoint, NotificationEndpoint.robot
+5.3.2.17,Notifications, Notifications.robot
 5.3.2.18,NS Instance Creation Workflow, CreateNSInstanceWorkflow.robot
 5.3.2.19, NS Instance Deletion, DeleteNSInstanceWorkflow.robot
 5.3.2.20, Heal Flow of NS lifecycle management operations, HealNSTaskWorkflow.robot
@@ -41,24 +41,24 @@
 5.3.2.23, Terminate Flow of NS lifecycle management operations, TerminateNSTaskWorkflow.robot
 5.3.2.24, Update Flow of NS lifecycle management operations, UpdateNSTaskWorkflow.robot
 5.3.2.25,API Version Resource Endpoint, ApiVersion.robot
-5.3.2.26,Notification Consumer Endpoint, NotificationConsumer.robot
+5.3.2.26,Notification Consumer, NotificationConsumer.robot
 5.3.3,NS Fault Management interface, NSFaultManagement-API
 5.3.3.1,Alarms, Alarms.robot
 5.3.3.2,Individual Alarm, IndividualAlarm.robot
 5.3.3.3,Subscriptions, Subscriptions.robot
 5.3.3.4,Individual Subscription, IndividualSubscription.robot
-5.3.3.5,Notification Endpoint, NotificationEndpoint.robot
+5.3.3.5,Notifications, Notifications.robot
 5.3.3.6,API Version Resource Endpoint, ApiVersion.robot
-5.3.3.7,Notification Consumer Endpoint, NotificationConsumer.robot
+5.3.3.7,Notification Consumer, NotificationConsumer.robot
 5.3.4,NS Performance Management interface, NSPerformanceManagement-API
 5.3.4.1,PM Jobs Resource Endpoint, PMJobs.robot
 5.3.4.2,Individual PM Job Resource Endpoint, IndividualPmJob.robot
 5.3.4.3,Individual Performance Report Resource Endpoint, IndividualReport.robot
 5.3.4.4,Thresholds Resource Endpoint, Thresholds.robot
 5.3.4.5,Individual Threshold Resource Endpoint, IndividualThreshold.robot
-5.3.4.8,Notifications Endpoint, Notifications.robot
+5.3.4.8,Notifications, Notifications.robot
 5.3.4.9,API Version Resource Endpoint, ApiVersion.robot
-5.3.4.10,Notifications Consumer Endpoint, NotificationConsumer.robot
+5.3.4.10,Notifications Consumer, NotificationConsumer.robot
 5.3.5,VNF Package Management interface, VNFPackageManagement-API
 5.3.5.1,VNF Packages Resource Endpoint, VNFPackages.robot
 5.3.5.2,Individual VNF Package Resource Endpoint, IndividualVNFPackage.robot
@@ -68,6 +68,6 @@
 5.3.5.6,Individual VNF Package Artifact Resource Endpoint, VNFPackageArtifacts.robot
 5.3.5.7,Subscriptions Resource Endpoint, Subscriptions.robot
 5.3.5.8,Individual Subscription Resource Endpoint, IndividualSubscription.robot
-5.3.5.9,Notifications Endpoint, Notifications.robot
+5.3.5.9,Notifications, Notifications.robot
 5.3.5.10,API Version Resource Endpoint, ApiVersion.robot
-5.3.5.11,Notifications Consumer Endpoint, NotificationConsumer.robot
+5.3.5.11,Notifications Consumer, NotificationConsumer.robot
-- 
GitLab


From f8bc7a56300dc00db05f7e1ac2930b49066135e7 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Tue, 30 Mar 2021 13:12:39 +0200
Subject: [PATCH 315/322] fix indexes

---
 indexes/sol_002_index.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indexes/sol_002_index.csv b/indexes/sol_002_index.csv
index e35038e7b..ae88df195 100644
--- a/indexes/sol_002_index.csv
+++ b/indexes/sol_002_index.csv
@@ -2,7 +2,7 @@
 6.3.1,VNF Configuration Interface,VNFConfiguration-API
 6.3.1.1,Configuration Resource Endpoint,Configuration.robot
 6.3.1.2,API Version Resource Endpoint,ApiVersion.robot
-"6.3.2,	VNF Indicator Interface,VNFIndicator-API"
+"6.3.2,	VNF Indicator Interface,VNFIndicator-AI"
 6.3.2.1,VNF Indicators Resource Endpoint,VNFIndicators.robot
 6.3.2.2,VNF Indicators related to a VNF Instance Resource Endpoint,VnfIndicatorsInVnfInstanceId.robot 
 6.3.2.3,Individual VNF Indicator Resource Endpoit,IndividualVNFindicator.robot
-- 
GitLab


From d48fe7492a22f9a7dea8ec38e17328593eec12c0 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Tue, 30 Mar 2021 13:17:22 +0200
Subject: [PATCH 316/322] fix indexes

---
 indexes/sol_002_index.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indexes/sol_002_index.csv b/indexes/sol_002_index.csv
index ae88df195..a1b8af423 100644
--- a/indexes/sol_002_index.csv
+++ b/indexes/sol_002_index.csv
@@ -2,7 +2,7 @@
 6.3.1,VNF Configuration Interface,VNFConfiguration-API
 6.3.1.1,Configuration Resource Endpoint,Configuration.robot
 6.3.1.2,API Version Resource Endpoint,ApiVersion.robot
-"6.3.2,	VNF Indicator Interface,VNFIndicator-AI"
+6.3.2, VNF Indicator Interface,VNFIndicator-API
 6.3.2.1,VNF Indicators Resource Endpoint,VNFIndicators.robot
 6.3.2.2,VNF Indicators related to a VNF Instance Resource Endpoint,VnfIndicatorsInVnfInstanceId.robot 
 6.3.2.3,Individual VNF Indicator Resource Endpoit,IndividualVNFindicator.robot
-- 
GitLab


From 19bd439e2abce99a3d69ccd9e324b71aaa00f544 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Tue, 30 Mar 2021 13:30:32 +0200
Subject: [PATCH 317/322] fixed config id for notification consumer tests

---
 SOL002/VNFIndicator-API/NotificationConsumer.robot          | 4 ++--
 SOL003/VNFFaultManagement-API/NotificationConsumer.robot    | 6 +++---
 SOL003/VNFIndicator-API/NotificationConsumer.robot          | 2 +-
 .../VNFLifecycleManagement-API/NotificationConsumer.robot   | 6 +++---
 SOL003/VNFPackageManagement-API/NotificationConsumer.robot  | 4 ++--
 .../VNFPerformanceManagement-API/NotificationConsumer.robot | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/SOL002/VNFIndicator-API/NotificationConsumer.robot b/SOL002/VNFIndicator-API/NotificationConsumer.robot
index cb11aa11e..98f6a11cd 100644
--- a/SOL002/VNFIndicator-API/NotificationConsumer.robot
+++ b/SOL002/VNFIndicator-API/NotificationConsumer.robot
@@ -8,12 +8,12 @@ Suite Setup    Check resource existence and get CallbackUri
 
 *** Test Cases ***
 VNF Indicator Value Change Notification
-    [Documentation]    Test ID: 6.3.2.7.1
+    [Documentation]    Test ID: 6.3.2.8.1
     ...    Test title: VNF Indicator Value Change Notification
     ...    Test objective: The objective is to test that the POST request triggers VNF Indicator Value Change Notification .
     ...    Pre-conditions: A VNF is instantiated, and a subscription for indicator value change notifications is available in the VNF.
     ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNF
+    ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post Value Change Notification
diff --git a/SOL003/VNFFaultManagement-API/NotificationConsumer.robot b/SOL003/VNFFaultManagement-API/NotificationConsumer.robot
index 17ea2227b..697648da3 100644
--- a/SOL003/VNFFaultManagement-API/NotificationConsumer.robot
+++ b/SOL003/VNFFaultManagement-API/NotificationConsumer.robot
@@ -14,7 +14,7 @@ VNF Fault Alarm Notification
     ...    Test objective: The objective is to test that the POST request triggers VNF Fault Alarm Notification.
     ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm notifications is available in the VNFM.
     ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_VNFM
+    ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post Alarm Notification
@@ -26,7 +26,7 @@ VNF Fault Alarm Cleared Notification
     ...    Test objective: The objective is to test that the POST request triggers VNF Fault Alarm Cleared Notification.
     ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm cleared notifications is available in the VNFM.
     ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_VNFM
+    ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post Alarm Cleared Notification
@@ -38,7 +38,7 @@ VNF Fault Alarm List Reulit Notification
     ...    Test objective: The objective is to test that the POST request triggers VNF Fault Alarm List Rebuilt Notification.
     ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm list rebuilt notifications is available in the VNFM.
     ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_VNFM
+    ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post Alarm List Rebuilt Notification
diff --git a/SOL003/VNFIndicator-API/NotificationConsumer.robot b/SOL003/VNFIndicator-API/NotificationConsumer.robot
index cf3822562..5e7e69d7b 100644
--- a/SOL003/VNFIndicator-API/NotificationConsumer.robot
+++ b/SOL003/VNFIndicator-API/NotificationConsumer.robot
@@ -13,7 +13,7 @@ VNF Indicator Value Change Notification
     ...    Test objective: The objective is to test that the POST request triggers VNF Indicator Value Change Notification.
     ...    Pre-conditions: A VNF is instantiated, and a subscription for indicator value change notifications is available in the VNFM.
     ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_VNFM
+    ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post VNF Indicator Value Change Notification
diff --git a/SOL003/VNFLifecycleManagement-API/NotificationConsumer.robot b/SOL003/VNFLifecycleManagement-API/NotificationConsumer.robot
index 8310ce197..194606709 100644
--- a/SOL003/VNFLifecycleManagement-API/NotificationConsumer.robot
+++ b/SOL003/VNFLifecycleManagement-API/NotificationConsumer.robot
@@ -14,7 +14,7 @@ VNF LCM Operation Occurrence Notification
     ...    Test objective: The objective is to test that the POST request triggers VNF LCM Operation Occurrence Notification.
     ...    Pre-conditions: A subscription for VNF LCM Operation Occurrence notifications is available in the VNFM.
     ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_VNFM
+    ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post VNF LCM Operation Occurrence Notification
@@ -26,7 +26,7 @@ VNF Identifier Creation Notification
     ...    Test objective: The objective is to test that the POST request triggers VNF Identifier Creation Notification.
     ...    Pre-conditions: A subscription for VNF identifier creation cotification is available in the VNFM.
     ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_VNFM
+    ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post VNF Identifier Creation Notification
@@ -38,7 +38,7 @@ VNF Identifier Deletion Notification
     ...    Test objective: The objective is to test that the POST request triggers VNF Identifier Deletion Notification.
     ...    Pre-conditions: A subscription for VNF identifier deletion notifications is available in the VNFM.
     ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_VNFM
+    ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post VNF LCM Operation Occurrence Notification
diff --git a/SOL003/VNFPackageManagement-API/NotificationConsumer.robot b/SOL003/VNFPackageManagement-API/NotificationConsumer.robot
index 0cc88c3de..bc6a26684 100644
--- a/SOL003/VNFPackageManagement-API/NotificationConsumer.robot
+++ b/SOL003/VNFPackageManagement-API/NotificationConsumer.robot
@@ -14,7 +14,7 @@ VNF Package Onboarding Notification
     ...    Test objective: The objective is to test that the POST request triggers VNF Package Onboarding notification.
     ...    Pre-conditions: A VNF package subscription for onboarding notifications is available in the NFVO.
     ...    Reference: Clause 10.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
+    ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post VNF Package Onboarding Notification
@@ -26,7 +26,7 @@ VNF Package Change Notification
     ...    Test objective: The objective is to test that the POST request triggers VNF Package Change notification.
     ...    Pre-conditions: A VNF package subscription for change notifications is available in the NFVO.
     ...    Reference: Clause 10.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_NFVO
+    ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post VNF Package Change Notification
diff --git a/SOL003/VNFPerformanceManagement-API/NotificationConsumer.robot b/SOL003/VNFPerformanceManagement-API/NotificationConsumer.robot
index ea8f9283a..0fa6b98c5 100644
--- a/SOL003/VNFPerformanceManagement-API/NotificationConsumer.robot
+++ b/SOL003/VNFPerformanceManagement-API/NotificationConsumer.robot
@@ -14,7 +14,7 @@ Performance Information Available Notification
     ...    Test objective: The objective is to test that the POST request triggers Performance Information Available Notification.
     ...    Pre-conditions: A VNF performance job is created, and a subscription for performance information available notification is available in the VNFM.
     ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_VNFM
+    ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post Performance Information Available Notification
@@ -26,7 +26,7 @@ Threshold Crossed Notification
     ...    Test objective: The objective is to test that the POST request triggers Threshold Crossed Notification
     ...    Pre-conditions: A VNF performance job is created, and a subscription for threshold crossed notification is available in the VNFM.
     ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
-    ...    Config ID: Config_prod_VNFM
+    ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post Threshold Crossed Notification
-- 
GitLab


From 191e0cb43fa686e65a3ffb4f382e7dfb778efcba Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Tue, 30 Mar 2021 13:43:37 +0200
Subject: [PATCH 318/322] fixed test ids

---
 .../Subscriptions.robot                       | 31 +-----------------
 .../NSFaultManagement-API/Subscriptions.robot | 32 ++-----------------
 2 files changed, 3 insertions(+), 60 deletions(-)

diff --git a/SOL002/VNFFaultManagement-API/Subscriptions.robot b/SOL002/VNFFaultManagement-API/Subscriptions.robot
index a03299db3..33f084573 100644
--- a/SOL002/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL002/VNFFaultManagement-API/Subscriptions.robot
@@ -26,36 +26,8 @@ Create a new subscription
     Check HTTP Response Header Contain Link
     Check Postcondition resource exists
 
-# Create a new Subscription - DUPLICATION
-     # [Documentation]    Test ID: 6.3.4.4.2
-    # ...    Test title: Create a new Subscription - DUPLICATION
-    # ...    Test objective: The objective is to create a duplicate subscription.
-    # ...    Pre-conditions: subscription with the same filter and callbackUri exists
-    # ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    # ...    Config ID: Config_prod_VNFM
-    # ...    Applicability: the VNFM does not allow creation of a subscription resource if another subscription resource with the same filter and callbackUri already exists
-    # ...    Post-Conditions: duplicated subscription is created
-    # Post Create subscription - DUPLICATION
-    # Check HTTP Response Status Code Is    201
-    # Check HTTP Response Body Json Schema Is    FmSubscription
-    # Check HTTP Response Header Contain Link
-    # Check Postcondition Duplicate Subscription exsist
-    
-# Create a new Subscription - NO-DUPLICATION
-    # [Documentation]    Test ID: 6.3.4.4.3
-    # ...    Test title: Create a new Subscription - NO-DUPLICATION
-    # ...    Test objective: The objective is to create a subscription in case of not allowed DUPLICATION.
-    # ...    Pre-conditions: subscription with the same filter and callbackUri exists
-    # ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    # ...    Config ID: Config_prod_VNFM
-    # ...    Applicability: the VNFM does not allow creation of a duplicate subscription resource 
-    # ...    Post-Conditions: duplicated subscription is not created
-    # Post Create subscription - DUPLICATION
-    # Check HTTP Response Status Code Is    303
-    # Check HTTP Response Header Contain Link
-
 Create a duplicated Subscription
-     [Documentation]    Test ID: 6.3.4.4.2a
+     [Documentation]    Test ID: 6.3.4.4.2
     ...    Test title: Create a duplicated Subscription
     ...    Test objective: The objective is to create a duplicate subscription.
     ...    Pre-conditions: subscription with the same filter and callbackUri exists
@@ -66,7 +38,6 @@ Create a duplicated Subscription
     Post Create subscription
     Check Response for duplicated subscription
 
-
 GET Subscriptions
     [Documentation]    Test ID: 6.3.4.4.4
     ...    Test title: GET Subscriptions
diff --git a/SOL005/NSFaultManagement-API/Subscriptions.robot b/SOL005/NSFaultManagement-API/Subscriptions.robot
index 4850c4b07..ca32011da 100644
--- a/SOL005/NSFaultManagement-API/Subscriptions.robot
+++ b/SOL005/NSFaultManagement-API/Subscriptions.robot
@@ -24,36 +24,9 @@ Create a new alarm subscription
     Check HTTP Response Status Code Is    201
     Check Operation Occurrence Id
     Check HTTP Response Body Json Schema Is  FmSubscription
-  
-# Create a new alarm subscription - DUPLICATION
-     # [Documentation]    Test ID: 5.3.3.3.2
-    # ...    Test title: Create a new alarm subscription - DUPLICATION
-    # ...    Test objective: The objective is to create a new subscription with the NFV allowing duplication and perform a JSON schema and content validation of the returned fault management alarms subscription data structure..
-    # ...    Pre-conditions: subscription with the same filter and callbackUri exists
-    # ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    # ...    Config ID: Config_prod_NFVO 
-    # ...    Applicability: the NFVO allows creating a subscription resource if another subscription resource with the same filter and callbackUri already exists
-    # ...    Post-Conditions: none
-    # Post Create subscription - DUPLICATION
-    # Check HTTP Response Status Code Is    201
-    # Check Operation Occurrence Id
-    # Check HTTP Response Body Json Schema Is  FmSubscription
 
-# Create a new alarm subscription - NO DUPLICATION
-    # [Documentation]    Test ID: 5.3.3.3.3
-    # ...    Test title: Create a new alarm subscription - NO DUPLICATION
-    # ...    Test objective: The objective is to create a new subscription with the NFV not allowing duplication and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
-    # ...    Pre-conditions: subscription with the same filter and callbackUri exists
-    # ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.7.1
-    # ...    Config ID: Config_prod_NFVO 
-    # ...    Applicability: the NFVO decides to not create a duplicate subscription resource 
-    # ...    Post-Conditions: none
-    # Post Create subscription - NO-DUPLICATION
-    # Check HTTP Response Status Code Is    303
-    # Check Operation Occurrence Id
-    
 Create a duplicated Subscription
-     [Documentation]    Test ID: 5.3.3.3.2a
+     [Documentation]    Test ID: 5.3.3.3.2
     ...    Test title: Create a duplicated alarm subscription
     ...    Test objective: The objective is to create a new subscription with the NFV allowing duplication and perform a JSON schema and content validation of the returned fault management alarms subscription data structure..
     ...    Pre-conditions: subscription with the same filter and callbackUri exists
@@ -64,8 +37,7 @@ Create a duplicated Subscription
     POST Subscription
     Check Response for duplicated subscription
     Check Operation Occurrence Id
-
-
+    
 Retrieve a list of alarm subscriptions
     [Documentation]    Test ID: 5.3.3.3.4
     ...    Test title: Retrieve a list of alarm subscriptions
-- 
GitLab


From ffdbb3b7c459079b85610e082978aa72b743db76 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Wed, 31 Mar 2021 18:14:56 +0200
Subject: [PATCH 319/322] renamed notification endpoint tests (and indexes)

---
 ...tionConsumer.robot => NotificationEndpoint.robot} |  0
 ...tionConsumer.robot => NotificationEndpoint.robot} |  0
 ...tionConsumer.robot => NotificationEndpoint.robot} |  0
 ...tionConsumer.robot => NotificationEndpoint.robot} |  0
 ...tionConsumer.robot => NotificationEndpoint.robot} |  0
 ...tionConsumer.robot => NotificationEndpoint.robot} |  0
 ...tionConsumer.robot => NotificationEndpoint.robot} |  0
 ...tionConsumer.robot => NotificationEndpoint.robot} |  0
 ...tionConsumer.robot => NotificationEndpoint.robot} |  0
 ...tionConsumer.robot => NotificationEndpoint.robot} |  0
 ...tionConsumer.robot => NotificationEndpoint.robot} |  0
 ...tionConsumer.robot => NotificationEndpoint.robot} |  0
 ...tionConsumer.robot => NotificationEndpoint.robot} |  0
 ...tionConsumer.robot => NotificationEndpoint.robot} |  0
 ...tionConsumer.robot => NotificationEndpoint.robot} |  0
 indexes/sol_002_index.csv                            |  8 ++++----
 indexes/sol_003_index.csv                            | 12 ++++++------
 indexes/sol_005_index.csv                            | 10 +++++-----
 18 files changed, 15 insertions(+), 15 deletions(-)
 rename SOL002/VNFFaultManagement-API/{NotificationConsumer.robot => NotificationEndpoint.robot} (100%)
 rename SOL002/VNFIndicator-API/{NotificationConsumer.robot => NotificationEndpoint.robot} (100%)
 rename SOL002/VNFLifecycleManagement-API/{NotificationConsumer.robot => NotificationEndpoint.robot} (100%)
 rename SOL002/VNFPerformanceManagement-API/{NotificationConsumer.robot => NotificationEndpoint.robot} (100%)
 rename SOL003/VNFFaultManagement-API/{NotificationConsumer.robot => NotificationEndpoint.robot} (100%)
 rename SOL003/VNFIndicator-API/{NotificationConsumer.robot => NotificationEndpoint.robot} (100%)
 rename SOL003/VNFLifecycleManagement-API/{NotificationConsumer.robot => NotificationEndpoint.robot} (100%)
 rename SOL003/VNFPackageManagement-API/{NotificationConsumer.robot => NotificationEndpoint.robot} (100%)
 rename SOL003/VNFPerformanceManagement-API/{NotificationConsumer.robot => NotificationEndpoint.robot} (100%)
 rename SOL003/VirtualisedResourcesQuotaAvailableNotification-API/{NotificationConsumer.robot => NotificationEndpoint.robot} (100%)
 rename SOL005/NSDManagement-API/{NotificationConsumer.robot => NotificationEndpoint.robot} (100%)
 rename SOL005/NSFaultManagement-API/{NotificationConsumer.robot => NotificationEndpoint.robot} (100%)
 rename SOL005/NSLifecycleManagement-API/{NotificationConsumer.robot => NotificationEndpoint.robot} (100%)
 rename SOL005/NSPerformanceManagement-API/{NotificationConsumer.robot => NotificationEndpoint.robot} (100%)
 rename SOL005/VNFPackageManagement-API/{NotificationConsumer.robot => NotificationEndpoint.robot} (100%)

diff --git a/SOL002/VNFFaultManagement-API/NotificationConsumer.robot b/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
similarity index 100%
rename from SOL002/VNFFaultManagement-API/NotificationConsumer.robot
rename to SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
diff --git a/SOL002/VNFIndicator-API/NotificationConsumer.robot b/SOL002/VNFIndicator-API/NotificationEndpoint.robot
similarity index 100%
rename from SOL002/VNFIndicator-API/NotificationConsumer.robot
rename to SOL002/VNFIndicator-API/NotificationEndpoint.robot
diff --git a/SOL002/VNFLifecycleManagement-API/NotificationConsumer.robot b/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API/NotificationConsumer.robot
rename to SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
diff --git a/SOL002/VNFPerformanceManagement-API/NotificationConsumer.robot b/SOL002/VNFPerformanceManagement-API/NotificationEndpoint.robot
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API/NotificationConsumer.robot
rename to SOL002/VNFPerformanceManagement-API/NotificationEndpoint.robot
diff --git a/SOL003/VNFFaultManagement-API/NotificationConsumer.robot b/SOL003/VNFFaultManagement-API/NotificationEndpoint.robot
similarity index 100%
rename from SOL003/VNFFaultManagement-API/NotificationConsumer.robot
rename to SOL003/VNFFaultManagement-API/NotificationEndpoint.robot
diff --git a/SOL003/VNFIndicator-API/NotificationConsumer.robot b/SOL003/VNFIndicator-API/NotificationEndpoint.robot
similarity index 100%
rename from SOL003/VNFIndicator-API/NotificationConsumer.robot
rename to SOL003/VNFIndicator-API/NotificationEndpoint.robot
diff --git a/SOL003/VNFLifecycleManagement-API/NotificationConsumer.robot b/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot
similarity index 100%
rename from SOL003/VNFLifecycleManagement-API/NotificationConsumer.robot
rename to SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot
diff --git a/SOL003/VNFPackageManagement-API/NotificationConsumer.robot b/SOL003/VNFPackageManagement-API/NotificationEndpoint.robot
similarity index 100%
rename from SOL003/VNFPackageManagement-API/NotificationConsumer.robot
rename to SOL003/VNFPackageManagement-API/NotificationEndpoint.robot
diff --git a/SOL003/VNFPerformanceManagement-API/NotificationConsumer.robot b/SOL003/VNFPerformanceManagement-API/NotificationEndpoint.robot
similarity index 100%
rename from SOL003/VNFPerformanceManagement-API/NotificationConsumer.robot
rename to SOL003/VNFPerformanceManagement-API/NotificationEndpoint.robot
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationConsumer.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot
similarity index 100%
rename from SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationConsumer.robot
rename to SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot
diff --git a/SOL005/NSDManagement-API/NotificationConsumer.robot b/SOL005/NSDManagement-API/NotificationEndpoint.robot
similarity index 100%
rename from SOL005/NSDManagement-API/NotificationConsumer.robot
rename to SOL005/NSDManagement-API/NotificationEndpoint.robot
diff --git a/SOL005/NSFaultManagement-API/NotificationConsumer.robot b/SOL005/NSFaultManagement-API/NotificationEndpoint.robot
similarity index 100%
rename from SOL005/NSFaultManagement-API/NotificationConsumer.robot
rename to SOL005/NSFaultManagement-API/NotificationEndpoint.robot
diff --git a/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot b/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot
similarity index 100%
rename from SOL005/NSLifecycleManagement-API/NotificationConsumer.robot
rename to SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot
diff --git a/SOL005/NSPerformanceManagement-API/NotificationConsumer.robot b/SOL005/NSPerformanceManagement-API/NotificationEndpoint.robot
similarity index 100%
rename from SOL005/NSPerformanceManagement-API/NotificationConsumer.robot
rename to SOL005/NSPerformanceManagement-API/NotificationEndpoint.robot
diff --git a/SOL005/VNFPackageManagement-API/NotificationConsumer.robot b/SOL005/VNFPackageManagement-API/NotificationEndpoint.robot
similarity index 100%
rename from SOL005/VNFPackageManagement-API/NotificationConsumer.robot
rename to SOL005/VNFPackageManagement-API/NotificationEndpoint.robot
diff --git a/indexes/sol_002_index.csv b/indexes/sol_002_index.csv
index a1b8af423..9cfc3bb62 100644
--- a/indexes/sol_002_index.csv
+++ b/indexes/sol_002_index.csv
@@ -10,7 +10,7 @@
 6.3.2.5,Individual Subscription Resource Endpoint,IndividualSubscription.robot
 6.3.2.6,Notifications,../VNFIndicatorNotification-API/Notifications.robot
 6.3.2.7,API Version Resource Endpoint,ApiVersion.robot
-6.3.2.8,Notification Consumer,NotificationConsumer.robot
+6.3.2.8,Notification Endpoint,NotificationEndpoint.robot
 6.3.3,VNF Performance Management Interface,VNFPerformanceManagement-API
 6.3.3.1,PM Jobs Resource Endpoint,PMJobs.robot   
 6.3.3.2,Individual PM Job Resource Endpoint,IndividualPmJob.robot 
@@ -19,7 +19,7 @@
 6.3.3.5,Individual Threshold Resource Endpoint,IndividualThreshold.robot  
 6.3.3.8,Notification Endpoint,../VNFPerformanceManagementNotification-API/Notifications.robot    
 6.3.3.9,API Version Resource Endpoint,ApiVersion.robot
-6.3.3.10, Notification Consumer,NotificationConsumer.robot
+6.3.3.10, Notification Endpoint,NotificationEndpoint.robot
 6.3.4,VNF Fault Management interface,VNFFaultManagement-API
 6.3.4.1,Alarms,Alarms.robot  
 6.3.4.2,Individual Alarm,IndividualAlarm.robot
@@ -28,7 +28,7 @@
 6.3.4.5,Individual Subscription,IndividualSubscription.robot
 6.3.4.6,Notifications,Notifications.robot
 6.3.4.7,API Version Resource Endpoint,ApiVersion.robot
-6.3.4.8,Notification Consumer,NotificationConsumer.robot
+6.3.4.8,Notification Endpoint,NotificationEndpoint.robot
 6.3.5,VNF Lifecycle Management interface,VNFLifecycleManagement-API
 6.3.5.1,VNF Instances,VNFInstances.robot
 6.3.5.2,Individual VNFInstance,IndividualVNFInstance.robot 
@@ -50,4 +50,4 @@
 6.3.5.18,Individual Subscription,IndividualSubscription.robot
 6.3.5.19,Notifications,Notifications.robot
 6.3.5.20,API Version Resource Endpoint,ApiVersion.robot
-6.3.5.21,Notification Consumer,NotificationConsumer.robot
+6.3.5.21,Notification Endpoint,NotificationEndpoint.robot
diff --git a/indexes/sol_003_index.csv b/indexes/sol_003_index.csv
index 9693dc97c..450768234 100644
--- a/indexes/sol_003_index.csv
+++ b/indexes/sol_003_index.csv
@@ -35,7 +35,7 @@
 7.3.1.33,Terminate a VNF Instance, TerminateVNFWorkflow.robot
 7.3.1.34,Notifications, Notifications.robot
 7.3.1.35,API Version Resource Endpoint, ApiVersion.robot
-7.3.1.36,Notification Consumer, NotificationConsumer.robot
+7.3.1.36,Notification Endpoint,NotificationEndpoint.robot
 7.3.2,VNF Lifecycle Operation Granting Interface, VNFLifecycleOperationGranting-API
 7.3.2.1,Grants, Grants.robot
 7.3.2.2,Individual Grant, IndividualGrant.robot
@@ -50,7 +50,7 @@
 7.3.3.7,Individual Subscription Resource Endpoint, IndividualSubscription.robot
 7.3.3.8,Notifications, Notifications.robot
 7.3.3.9,API Version Resource Endpoint, ApiVersion.robot
-7.3.3.10,Notification Consumer, NotificationConsumer.robot
+7.3.3.10,Notification Endpoint,NotificationEndpoint.robot
 7.3.4,VNF Performance Management Interface, VNFPerformanceManagement-API
 7.3.4.1,PM Jobs Resource Endpoint, PMJobs.robot
 7.3.4.2,Individual Pm Job Resource Endpoint, IndividualPmJob.robot
@@ -59,7 +59,7 @@
 7.3.4.5,Individual Threshold Resource Endpoint, IndividualThreshold.robot
 7.3.4.8,Notifications,Notifications.robot 
 7.3.4.9,API Version Resource Endpoint, ApiVersion.robot
-7.3.4.10,Notification Consumer,NotificationConsumer.robot 
+7.3.4.10,Notification Endpoint,NotificationEndpoint.robot
 7.3.5,VNF Fault Management interface, VNFFaultManagement-API
 7.3.5.1,Alarms, Alarms.robot
 7.3.5.2,Individual Alarm, IndividualAlarm.robot 
@@ -67,7 +67,7 @@
 7.3.5.4,Individual Subscription, IndividualSubscription.robot
 7.3.5.5,Notifications, ../VNFFaultManagementNotification-API/Notifications.robot
 7.3.5.6,API Version Resource Endpoint, ApiVersion.robot
-7.3.5.7,Notification Consumer,NotificationConsumer.robot
+7.3.5.7,Notification Endpoint,NotificationEndpoint.robot
 7.3.6,VNF Indicator Interface, VNFIndicator-API
 7.3.6.1,VNF Indicators Resource Endpoint, VNFIndicators.robot
 7.3.6.2,VNF Indicators Related to a VNF Instance Resource Endpoint, VnfIndicatorsInVnfInstanceId.robot
@@ -76,10 +76,10 @@
 7.3.6.5,Individual Subscription Resource Endpoint, IndividualSubscription.robot
 7.3.6.6,Notifications,Notifications.robot
 7.3.6.7,API Version Resource Endpoint, ApiVersion.robot
-7.3.6.8,Notification Consumer, NotificationConsumer.robot
+7.3.6.8,Notification Endpoint,NotificationEndpoint.robot
 7.3.7,Virtualised Resources Quota Available Notification interface, VirtualisedResourcesQuotaAvailableNotification-API
 7.3.7.1,Subscriptions, Subscriptions.robot
 7.3.7.2,Individual Subscription, IndividualSubscription.robot
 7.3.7.3,API Version Resource Endpoint, ApiVersion.robot
-7.3.7.4,Notification Consumer, NotificationConsumer.robot
+7.3.7.4,Notification Endpoint,NotificationEndpoint.robot
 7.3.7.5,Notifications, Notifications.robot
diff --git a/indexes/sol_005_index.csv b/indexes/sol_005_index.csv
index 67f118825..97409f6c6 100644
--- a/indexes/sol_005_index.csv
+++ b/indexes/sol_005_index.csv
@@ -14,7 +14,7 @@
 5.3.1.12,NSD Archive Manifest Resource Endpoint, NSDArchiveManifest.robot
 5.3.1.13,PNFD Resource Endpoint, PNFD.robot
 5.3.1.14,PNFD Archive Manifest Resource Endpoint, PNFDArchiveManifest.robot
-5.3.1.15,Notifications Consumer, NotificationConsumer.robot
+5.3.1.15,Notification Endpoint,NotificationEndpoint.robot
 5.3.2,NS Lifecycle Management interface, NSLifecycleManagement-API
 5.3.2.1,NsInstances, NSInstances.robot
 5.3.2.2,Individual NSInstance, IndividualNSInstance.robot
@@ -41,7 +41,7 @@
 5.3.2.23, Terminate Flow of NS lifecycle management operations, TerminateNSTaskWorkflow.robot
 5.3.2.24, Update Flow of NS lifecycle management operations, UpdateNSTaskWorkflow.robot
 5.3.2.25,API Version Resource Endpoint, ApiVersion.robot
-5.3.2.26,Notification Consumer, NotificationConsumer.robot
+5.3.2.26,Notification Endpoint,NotificationEndpoint.robot
 5.3.3,NS Fault Management interface, NSFaultManagement-API
 5.3.3.1,Alarms, Alarms.robot
 5.3.3.2,Individual Alarm, IndividualAlarm.robot
@@ -49,7 +49,7 @@
 5.3.3.4,Individual Subscription, IndividualSubscription.robot
 5.3.3.5,Notifications, Notifications.robot
 5.3.3.6,API Version Resource Endpoint, ApiVersion.robot
-5.3.3.7,Notification Consumer, NotificationConsumer.robot
+5.3.3.7,Notification Endpoint,NotificationEndpoint.robot
 5.3.4,NS Performance Management interface, NSPerformanceManagement-API
 5.3.4.1,PM Jobs Resource Endpoint, PMJobs.robot
 5.3.4.2,Individual PM Job Resource Endpoint, IndividualPmJob.robot
@@ -58,7 +58,7 @@
 5.3.4.5,Individual Threshold Resource Endpoint, IndividualThreshold.robot
 5.3.4.8,Notifications, Notifications.robot
 5.3.4.9,API Version Resource Endpoint, ApiVersion.robot
-5.3.4.10,Notifications Consumer, NotificationConsumer.robot
+5.3.4.10,Notification Endpoint,NotificationEndpoint.robot
 5.3.5,VNF Package Management interface, VNFPackageManagement-API
 5.3.5.1,VNF Packages Resource Endpoint, VNFPackages.robot
 5.3.5.2,Individual VNF Package Resource Endpoint, IndividualVNFPackage.robot
@@ -70,4 +70,4 @@
 5.3.5.8,Individual Subscription Resource Endpoint, IndividualSubscription.robot
 5.3.5.9,Notifications, Notifications.robot
 5.3.5.10,API Version Resource Endpoint, ApiVersion.robot
-5.3.5.11,Notifications Consumer, NotificationConsumer.robot
+5.3.5.11,Notification Endpoint,NotificationEndpoint.robot
-- 
GitLab


From 97bd54029baa24cb0f437f993dbdc1e4a6c37db9 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Tue, 6 Apr 2021 14:01:08 +0200
Subject: [PATCH 320/322] fixed test ids

---
 .../VnfLcmOperationOccurences.robot                           | 2 +-
 .../IndividualSubscription.robot                              | 2 +-
 SOL005/NSPerformanceManagement-API/ApiVersion.robot           | 2 +-
 indexes/sol_003_index.csv                                     | 4 +++-
 indexes/sol_005_index.csv                                     | 4 +++-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
index 65458896a..c5bb08b03 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
@@ -172,7 +172,7 @@ GET status information about multiple VNF LCM Operation OCC - Bad Request Respon
     Check HTTP Response Body Json Schema Is    ProblemDetails
     
 GET status information about multiple VNF LCM Operation OCC with "exclude_default" and "fields"   
-    [Documentation]    Test ID: 7.3.1.11.13
+    [Documentation]    Test ID: 7.3.1.11.14
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "exclude_default" and "fields"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/IndividualSubscription.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/IndividualSubscription.robot
index e1de22b87..a7e95f99c 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/IndividualSubscription.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/IndividualSubscription.robot
@@ -73,7 +73,7 @@ DELETE an individual subscription
     Check Postcondition VNF Virtualised Resources Quota Available Notification individual Subscriptions is Deleted
     
 Get Information about an individual subscription - Not Found
-    [Documentation]    Test ID: 7.3.7.2.2
+    [Documentation]    Test ID: 7.3.7.2.6
     ...    Test title: Get Information about an individual subscription - Not Found
     ...    Test objective: The objective is to test that the retrieval of an individual Virtualised Resources Quota Available Notification subscription subscribed by the client fils when resource is not present 
     ...    Pre-conditions: The subscription with the given id does not exists
diff --git a/SOL005/NSPerformanceManagement-API/ApiVersion.robot b/SOL005/NSPerformanceManagement-API/ApiVersion.robot
index a0ca7d926..e9fba6908 100644
--- a/SOL005/NSPerformanceManagement-API/ApiVersion.robot
+++ b/SOL005/NSPerformanceManagement-API/ApiVersion.robot
@@ -9,7 +9,7 @@ Library    JSONSchemaLibrary    schemas/
 
 *** Test Cases ***
 POST API Version - Method not implemented
-    [Documentation]    Test ID: 5.3.4.10.1
+    [Documentation]    Test ID: 5.3.4.9.1
     ...    Test title: POST API version - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
diff --git a/indexes/sol_003_index.csv b/indexes/sol_003_index.csv
index 450768234..49acbd530 100644
--- a/indexes/sol_003_index.csv
+++ b/indexes/sol_003_index.csv
@@ -50,7 +50,9 @@
 7.3.3.7,Individual Subscription Resource Endpoint, IndividualSubscription.robot
 7.3.3.8,Notifications, Notifications.robot
 7.3.3.9,API Version Resource Endpoint, ApiVersion.robot
-7.3.3.10,Notification Endpoint,NotificationEndpoint.robot
+7.3.3.10,Manifest In Individual VNF Package Endpoint,ManifestInIndividualVNFPackage.robot
+7.3.3.11,VNF Package Artifacts Endpoint,VNFPackageArtifacts.robot
+7.3.3.12,Notification Endpoint,NotificationEndpoint.robot
 7.3.4,VNF Performance Management Interface, VNFPerformanceManagement-API
 7.3.4.1,PM Jobs Resource Endpoint, PMJobs.robot
 7.3.4.2,Individual Pm Job Resource Endpoint, IndividualPmJob.robot
diff --git a/indexes/sol_005_index.csv b/indexes/sol_005_index.csv
index 97409f6c6..a8ea6aa16 100644
--- a/indexes/sol_005_index.csv
+++ b/indexes/sol_005_index.csv
@@ -70,4 +70,6 @@
 5.3.5.8,Individual Subscription Resource Endpoint, IndividualSubscription.robot
 5.3.5.9,Notifications, Notifications.robot
 5.3.5.10,API Version Resource Endpoint, ApiVersion.robot
-5.3.5.11,Notification Endpoint,NotificationEndpoint.robot
+5.3.5.11,Manifest In Individual VNF Package Endpoint,ManifestInIndividualVNFPackage.robot
+5.3.5.11,VNF Package Artifacts Endpoint,VNFPackageArtifacts.robot
+5.3.5.13,Notification Endpoint,NotificationEndpoint.robot
-- 
GitLab


From b474d5d942e4988b7806c38767e77830ce30551c Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Tue, 6 Apr 2021 14:21:46 +0200
Subject: [PATCH 321/322] fixed test ids and added void

---
 .../Subscriptions.robot                       | 17 +++-
 .../VNFDInIndividualVNFPackage.robot          | 29 ++++++-
 .../IndividualNSDescriptor.robot              | 16 ++++
 .../NSDManagement-API/NSDArchiveContent.robot | 80 ++++++++++++++++++-
 SOL005/NSFaultManagement-API/Alarms.robot     | 26 +++---
 .../NSFaultManagement-API/Subscriptions.robot | 20 ++++-
 .../TerminateNSTask.robot                     |  2 +-
 .../VNFDInIndividualVNFPackage.robot          | 52 +++++++++++-
 8 files changed, 221 insertions(+), 21 deletions(-)

diff --git a/SOL002/VNFFaultManagement-API/Subscriptions.robot b/SOL002/VNFFaultManagement-API/Subscriptions.robot
index 33f084573..094065deb 100644
--- a/SOL002/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL002/VNFFaultManagement-API/Subscriptions.robot
@@ -38,6 +38,17 @@ Create a duplicated Subscription
     Post Create subscription
     Check Response for duplicated subscription
 
+Void
+     [Documentation]    Test ID: 6.3.4.4.3
+    ...    Test title: Void
+    ...    Test objective: Void
+    ...    Pre-conditions: Void
+    ...    Reference: Void
+    ...    Config ID: Void
+    ...    Applicability: Void
+    ...    Post-Conditions: Void
+    Void
+
 GET Subscriptions
     [Documentation]    Test ID: 6.3.4.4.4
     ...    Test title: GET Subscriptions
@@ -276,7 +287,7 @@ Get subscriptions with filter "filter.probableCauses"
     Check PostCondition HTTP Response Body Subscriptions Matches the requested attribute-based filter "filter_probableCauses"
     
 POST Create a new Subscription - Unprocessable Entity
-    [Documentation]    Test ID: 6.3.4.4.21
+    [Documentation]    Test ID: 6.3.4.4.22
     ...    Test title: POST Create a new Subscription - Unprocessable Entity
     ...    Test objective: The objective is to test that content type of the payload body is supported and the payload body of a request contains syntactically correct data but the data cannot be processed.
     ...    re-conditions: none
@@ -511,3 +522,7 @@ Check Response for duplicated subscription
     Run Keyword If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 1    Check HTTP Response Status Code Is    201
     Run Keyword If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 1    Check HTTP Response Body Json Schema Is    FmSubscription
     Run Keyword If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 0    Check HTTP Response Status Code Is    303
+
+Void
+    log    do nothing
+      
diff --git a/SOL003/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot b/SOL003/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
index ecac9cb58..0cfc35ffd 100644
--- a/SOL003/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
+++ b/SOL003/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
@@ -58,6 +58,17 @@ Get multi file VNFD in Individual VNF Package in Plain or Zip Format
     Check HTTP Response Status Code Is    200
     Check HTTP Response Header Content-Type Is    application/zip
 
+Void
+     [Documentation]    Test ID: 7.3.3.4.5
+    ...    Test title: Void
+    ...    Test objective: Void
+    ...    Pre-conditions: Void
+    ...    Reference: Void
+    ...    Config ID: Void
+    ...    Applicability: Void
+    ...    Post-Conditions: Void
+    Void
+
 Get VNFD in Individual VNF Package with invalid resource identifier
     [Documentation]    Test ID: 7.3.3.4.6
     ...    Test title: Get VNFD in Individual VNF Package with invalid resource identifier
@@ -183,6 +194,17 @@ Get multi file VNFD in Individual OnBoarded VNF Package in Plain or Zip Format
     Check HTTP Response Status Code Is    200
     Check HTTP Response Header Content-Type Is    application/zip
 
+Void
+     [Documentation]    Test ID: 7.3.3.4.16
+    ...    Test title: Void
+    ...    Test objective: Void
+    ...    Pre-conditions: Void
+    ...    Reference: Void
+    ...    Config ID: Void
+    ...    Applicability: Void
+    ...    Post-Conditions: Void
+    Void
+
 Get VNFD in Individual OnBoarded VNF Package with invalid resource identifier
     [Documentation]    Test ID: 7.3.3.4.17
     ...    Test title: Get VNFD in Individual OnBoarded VNF Package with invalid resource identifier
@@ -280,4 +302,9 @@ Get multi file VNFD in Individual OnBoarded VNF Package with security informatio
     ...    Post-Conditions: none
     Get multi file VNFD in Individual OnBoarded VNF Package with security information
     Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
\ No newline at end of file
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+*** Keywords ***
+
+Void
+    log    do nothing
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/IndividualNSDescriptor.robot b/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
index 4583ca024..af1f0343e 100644
--- a/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
+++ b/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
@@ -107,6 +107,17 @@ Enable Individual Network Service Descriptor with HTTP Etag precondition failure
     Send PATCH to enable Individual Network Service Descriptor with HTTP Etag precondition failure
     Check HTTP Response Status Code Is    412
 
+Void
+     [Documentation]    Test ID: 5.3.1.2.8
+    ...    Test title: Void
+    ...    Test objective: Void
+    ...    Pre-conditions: Void
+    ...    Reference: Void
+    ...    Config ID: Void
+    ...    Applicability: Void
+    ...    Post-Conditions: Void
+    Void
+
 DELETE Individual Network Service Descriptor
     [Documentation]    Test ID: 5.3.1.2.9
     ...    Test title:  DELETE Individual Network Service Descriptor
@@ -157,3 +168,8 @@ PUT Individual Network Service Descriptor - Method not implemented
     ...    Post-Conditions: none
     Send PUT Request for Individual Network Service Descriptor
     Check HTTP Response Status Code Is    405
+    
+*** Keywords ***
+
+Void
+    log    do nothing
diff --git a/SOL005/NSDManagement-API/NSDArchiveContent.robot b/SOL005/NSDManagement-API/NSDArchiveContent.robot
index dd887b574..466390100 100644
--- a/SOL005/NSDManagement-API/NSDArchiveContent.robot
+++ b/SOL005/NSDManagement-API/NSDArchiveContent.robot
@@ -8,6 +8,18 @@ Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_veri
 Library           OperatingSystem
 
 *** Test Cases ***
+
+Void
+     [Documentation]    Test ID: 5.3.1.3.1
+    ...    Test title: Void
+    ...    Test objective: Void
+    ...    Pre-conditions: Void
+    ...    Reference: Void
+    ...    Config ID: Void
+    ...    Applicability: Void
+    ...    Post-Conditions: Void
+    Void
+
 Get NSD Content in Zip Format
     [Documentation]    Test ID: 5.3.1.3.2
     ...    Test title: Get NSD Content in Zip Format
@@ -21,6 +33,39 @@ Get NSD Content in Zip Format
     Check HTTP Response Status Code Is    200
     Check HTTP Response Header Content-Type Is    application/zip
 
+Void
+     [Documentation]    Test ID: 5.3.1.3.3
+    ...    Test title: Void
+    ...    Test objective: Void
+    ...    Pre-conditions: Void
+    ...    Reference: Void
+    ...    Config ID: Void
+    ...    Applicability: Void
+    ...    Post-Conditions: Void
+    Void
+
+Void
+     [Documentation]    Test ID: 5.3.1.3.4
+    ...    Test title: Void
+    ...    Test objective: Void
+    ...    Pre-conditions: Void
+    ...    Reference: Void
+    ...    Config ID: Void
+    ...    Applicability: Void
+    ...    Post-Conditions: Void
+    Void
+
+Void
+     [Documentation]    Test ID: 5.3.1.3.5
+    ...    Test title: Void
+    ...    Test objective: Void
+    ...    Pre-conditions: Void
+    ...    Reference: Void
+    ...    Config ID: Void
+    ...    Applicability: Void
+    ...    Post-Conditions: Void
+    Void
+    
 Get NSD Content with invalid resource identifier
     [Documentation]    Test ID: 5.3.1.3.6
     ...    Test title: Get NSD Content with invalid resource identifier
@@ -100,7 +145,19 @@ Upload NSD Content as Zip file in asynchronous mode
     Send PUT Request to upload NSD Content as zip file in asynchronous mode
     Check HTTP Response Status Code Is    202
     Check Post Condition NSD Content has been Uploaded
-   
+
+Void
+     [Documentation]    Test ID: 5.3.1.3.12
+    ...    Test title: Void
+    ...    Test objective: Void
+    ...    Pre-conditions: Void
+    ...    Reference: Void
+    ...    Config ID: Void
+    ...    Applicability: Void
+    ...    Post-Conditions: Void
+    Void
+
+
 Upload NSD Content as Zip file in synchronous mode
     [Documentation]    Test ID: 5.3.1.3.13
     ...    Test title: Upload NSD Content as Zip file in synchronous mode
@@ -113,7 +170,18 @@ Upload NSD Content as Zip file in synchronous mode
     Send PUT Request to upload NSD Content as zip file in synchronous mode
     Check HTTP Response Status Code Is    204
     Check Postcondition NSD Content is uploaded and available in the NFVO
- 
+
+Void
+     [Documentation]    Test ID: 5.3.1.3.14
+    ...    Test title: Void
+    ...    Test objective: Void
+    ...    Pre-conditions: Void
+    ...    Reference: Void
+    ...    Config ID: Void
+    ...    Applicability: Void
+    ...    Post-Conditions: Void
+    Void
+
 Upload NSD Content with conflict due to onboarding state
    [Documentation]    Test ID: 5.3.1.3.15
     ...    Test title: Upload NSD Content with conflict due to onboarding state
@@ -161,4 +229,10 @@ DELETE NSD Content - Method not implemented
     ...    Applicability: none
     ...    Post-Conditions: none
     Send DELETE Request for NSD Content
-    Check HTTP Response Status Code Is    405
\ No newline at end of file
+    Check HTTP Response Status Code Is    405
+    
+    
+*** Keywords ***
+
+Void
+    log    do nothing
\ No newline at end of file
diff --git a/SOL005/NSFaultManagement-API/Alarms.robot b/SOL005/NSFaultManagement-API/Alarms.robot
index 4650a5b89..439ef8a27 100644
--- a/SOL005/NSFaultManagement-API/Alarms.robot
+++ b/SOL005/NSFaultManagement-API/Alarms.robot
@@ -112,7 +112,7 @@ GET information about multiple alarms with "exclude_fields" attribute selector
     Check HTTP Response Body Json Schema Is    alarms  
     
 PUT Alarms - Method not implemented
-    [Documentation]    Test ID: 5.3.3.1.5
+    [Documentation]    Test ID: 5.3.3.1.9
     ...    Test title: PUT Alarms - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed for Fault management alarms on NFV
     ...    Pre-conditions:  none
@@ -124,7 +124,7 @@ PUT Alarms - Method not implemented
     Check HTTP Response Status Code Is    405
     
 PATCH Alarms - Method not implemented
-    [Documentation]    Test ID: 5.3.3.1.6
+    [Documentation]    Test ID: 5.3.3.1.10
     ...    Test title: PATCH Alarms - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed for Fault management alarms on NFV
     ...    Pre-conditions:  none
@@ -136,7 +136,7 @@ PATCH Alarms - Method not implemented
     Check HTTP Response Status Code Is    405
 
 DELETE Alarms - Method not implemented
-    [Documentation]    Test ID: 5.3.3.1.7
+    [Documentation]    Test ID: 5.3.3.1.11
     ...    Test title: DELETE Alarms - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed for Fault management alarms on NFV
     ...    Pre-conditions:  none
@@ -148,7 +148,7 @@ DELETE Alarms - Method not implemented
     Check HTTP Response Status Code Is    405
 
 GET information about multiple alarms as Paged Response
-    [Documentation]    Test ID: 5.3.3.1.8
+    [Documentation]    Test ID: 5.3.3.1.12
     ...    Test title: GET information about multiple alarms as Paged Response
     ...    Test objective: The objective is to retrieve information about the alarm list as paged response.
     ...    Pre-conditions:  none
@@ -161,7 +161,7 @@ GET information about multiple alarms as Paged Response
     Check HTTP Response Header Contains Location
     
 GET information about multiple alarms - Bad Request Response too Big
-    [Documentation]    Test ID: 5.3.3.1.9
+    [Documentation]    Test ID: 5.3.3.1.13
     ...    Test title: GET information about multiple alarms - Bad Request Response too Big
     ...    Test objective:  The objective is to test that the retrieval of information about the alarm list fails because response is too big, and perform a JSON schema and content validation of the returned problem details data structure
     ...    Pre-conditions:  none
@@ -174,7 +174,7 @@ GET information about multiple alarms - Bad Request Response too Big
     Check HTTP Response Body Json Schema Is    ProblemDetails
     
 GET information about multiple alarms with filter "id"
-     [Documentation]    Test ID: 5.3.3.1.10
+     [Documentation]    Test ID: 5.3.3.1.14
     ...    Test title: GET information about multiple alarms with filter "id"
     ...    Test objective: The objective is to retrieve information about the alarm list with filter "id" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions:  none
@@ -188,7 +188,7 @@ GET information about multiple alarms with filter "id"
     Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "id"
     
 GET information about multiple alarms with filter "rootCauseFaultyComponent.faultyNestedNsInstanceId"
-     [Documentation]    Test ID: 5.3.3.1.11
+     [Documentation]    Test ID: 5.3.3.1.15
     ...    Test title: GET information about multiple alarms with filter "rootCauseFaultyComponent.faultyNestedNsInstanceId"
     ...    Test objective: The objective is to retrieve information about the alarm list with filter "rootCauseFaultyComponent.faultyNestedNsInstanceId" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions:  none
@@ -202,7 +202,7 @@ GET information about multiple alarms with filter "rootCauseFaultyComponent.faul
     Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "rootCauseFaultyComponent_faultyNestedNsInstanceId"
     
 GET information about multiple alarms with filter "rootCauseFaultyComponent.faultyNsVirtualLinkInstanceId"
-     [Documentation]    Test ID: 5.3.3.1.12
+     [Documentation]    Test ID: 5.3.3.1.16
     ...    Test title: GET information about multiple alarms with filter "rootCauseFaultyComponent.faultyNsVirtualLinkInstanceId"
     ...    Test objective: The objective is to retrieve information about the alarm list with filter "rootCauseFaultyComponent.faultyNsVirtualLinkInstanceId" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions:  none
@@ -216,7 +216,7 @@ GET information about multiple alarms with filter "rootCauseFaultyComponent.faul
     Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "faultyNsVirtualLinkInstanceId"
     
 GET information about multiple alarms with filter "rootCauseFaultyComponent.faultyVnfInstanceId"
-     [Documentation]    Test ID: 5.3.3.1.13
+     [Documentation]    Test ID: 5.3.3.1.17
     ...    Test title: GET information about multiple alarms with filter "rootCauseFaultyComponent.faultyVnfInstanceId"
     ...    Test objective: The objective is to retrieve information about the alarm list with filter "rootCauseFaultyComponent.faultyVnfInstanceId" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions:  none
@@ -230,7 +230,7 @@ GET information about multiple alarms with filter "rootCauseFaultyComponent.faul
     Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "faultyVnfInstanceId"
     
 GET information about multiple alarms with filter "rootCauseFaultyResource.faultyResourceType"
-     [Documentation]    Test ID: 5.3.3.1.14
+     [Documentation]    Test ID: 5.3.3.1.18
     ...    Test title: GET information about multiple alarms with filter "rootCauseFaultyResource.faultyResourceType"
     ...    Test objective: The objective is to retrieve information about the alarm list with filter "rootCauseFaultyResource.faultyResourceType" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions:  none
@@ -244,7 +244,7 @@ GET information about multiple alarms with filter "rootCauseFaultyResource.fault
     Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "faultyResourceType"
     
 GET information about multiple alarms with filter "eventType"
-     [Documentation]    Test ID: 5.3.3.1.15
+     [Documentation]    Test ID: 5.3.3.1.19
     ...    Test title: GET information about multiple alarms with filter "eventType"
     ...    Test objective: The objective is to retrieve information about the alarm list with filter "eventType" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions:  none
@@ -258,7 +258,7 @@ GET information about multiple alarms with filter "eventType"
     Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "eventType"
     
 GET information about multiple alarms with filter "perceivedSeverity"
-     [Documentation]    Test ID: 5.3.3.1.16
+     [Documentation]    Test ID: 5.3.3.1.20
     ...    Test title: GET information about multiple alarms with filter "perceivedSeverity"
     ...    Test objective: The objective is to retrieve information about the alarm list with filter "perceivedSeverity" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions:  none
@@ -272,7 +272,7 @@ GET information about multiple alarms with filter "perceivedSeverity"
     Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "perceivedSeverity"
     
 GET information about multiple alarms with filter "probableCause"
-     [Documentation]    Test ID: 5.3.3.1.17
+     [Documentation]    Test ID: 5.3.3.1.21
     ...    Test title: GET information about multiple alarms with filter "probableCause"
     ...    Test objective: The objective is to retrieve information about the alarm list with filter "probableCause" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions:  none
diff --git a/SOL005/NSFaultManagement-API/Subscriptions.robot b/SOL005/NSFaultManagement-API/Subscriptions.robot
index ca32011da..d5d1a1f79 100644
--- a/SOL005/NSFaultManagement-API/Subscriptions.robot
+++ b/SOL005/NSFaultManagement-API/Subscriptions.robot
@@ -38,6 +38,19 @@ Create a duplicated Subscription
     Check Response for duplicated subscription
     Check Operation Occurrence Id
     
+
+Void
+     [Documentation]    Test ID: 5.3.3.3.3
+    ...    Test title: Void
+    ...    Test objective: Void
+    ...    Pre-conditions: Void
+    ...    Reference: Void
+    ...    Config ID: Void
+    ...    Applicability: Void
+    ...    Post-Conditions: Void
+    Void
+
+
 Retrieve a list of alarm subscriptions
     [Documentation]    Test ID: 5.3.3.3.4
     ...    Test title: Retrieve a list of alarm subscriptions
@@ -286,4 +299,9 @@ Create a new alarm subscription - Unprocessable Entity
     ...    Post-Conditions: none
     POST Subscription
     Check HTTP Response Status Code Is    422
-    Check HTTP Response Body Json Schema Is  ProblemDetails
\ No newline at end of file
+    Check HTTP Response Body Json Schema Is  ProblemDetails
+    
+*** Keywords ***
+
+Void
+    log    do nothing
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
index 5f5ad8950..3f7c9bb0b 100644
--- a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
@@ -72,7 +72,7 @@ PATCH Terminate NSInstance - Method not implemented
     Check HTTP Response Status Code Is    405
 
 DELETE Terminate NSInstance - Method not implemented
-         [Documentation]    Test ID: 5.3.2.7.5
+         [Documentation]    Test ID: 5.3.2.7.6
     ...    Test title: DELETE Terminate NSInstance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
diff --git a/SOL005/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot b/SOL005/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
index 90829b3f6..47375543c 100644
--- a/SOL005/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
+++ b/SOL005/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
@@ -6,6 +6,17 @@ Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
 
 *** Test Cases ***
+Void
+     [Documentation]    Test ID: 5.3.5.3.1
+    ...    Test title: Void
+    ...    Test objective: Void
+    ...    Pre-conditions: Void
+    ...    Reference: Void
+    ...    Config ID: Void
+    ...    Applicability: Void
+    ...    Post-Conditions: Void
+    Void
+
 Get VNFD in Individual VNF Package in Zip Format
     [Documentation]    Test ID: 5.3.5.3.2
     ...    Test title: Get VNFD in Individual VNF Package in Zip Format
@@ -19,6 +30,40 @@ Get VNFD in Individual VNF Package in Zip Format
     Check HTTP Response Status Code Is    200
     Check HTTP Response Header Content-Type Is    application/zip
 
+Void
+     [Documentation]    Test ID: 5.3.5.3.3
+    ...    Test title: Void
+    ...    Test objective: Void
+    ...    Pre-conditions: Void
+    ...    Reference: Void
+    ...    Config ID: Void
+    ...    Applicability: Void
+    ...    Post-Conditions: Void
+    Void
+    
+Void
+     [Documentation]    Test ID: 5.3.5.3.4
+    ...    Test title: Void
+    ...    Test objective: Void
+    ...    Pre-conditions: Void
+    ...    Reference: Void
+    ...    Config ID: Void
+    ...    Applicability: Void
+    ...    Post-Conditions: Void
+    Void
+    
+Void
+     [Documentation]    Test ID: 5.3.5.3.5
+    ...    Test title: Void
+    ...    Test objective: Void
+    ...    Pre-conditions: Void
+    ...    Reference: Void
+    ...    Config ID: Void
+    ...    Applicability: Void
+    ...    Post-Conditions: Void
+    Void
+
+
 Get VNFD in Individual VNF Package with invalid resource identifier
     [Documentation]    Test ID: 5.3.5.3.6
     ...    Test title: Get VNFD in Individual VNF Package with invalid resource identifier
@@ -104,4 +149,9 @@ Get VNFD in Individual VNF Package with security information
     ...    Post-Conditions: none
     Get VNFD in Individual VNF Package with security information
     Check HTTP Response Status Code Is    200
-    Check HTTP Response Header Content-Type Is    application/zip
\ No newline at end of file
+    Check HTTP Response Header Content-Type Is    application/zip
+    
+*** Keywords ***
+
+Void
+    log    do nothing
\ No newline at end of file
-- 
GitLab


From 642e865c038009ddffbce39ca7b0499b4d433ab4 Mon Sep 17 00:00:00 2001
From: vreck <laurent.vreck@etsi.org>
Date: Thu, 3 Jun 2021 10:41:52 +0200
Subject: [PATCH 322/322] Update README.md

---
 README.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/README.md b/README.md
index 185d1a400..bab2d8a74 100644
--- a/README.md
+++ b/README.md
@@ -8,12 +8,6 @@ v2.7.1.
 
 More information and download is available at [DGS/NFV-TST010ed271](https://portal.etsi.org/webapp/WorkProgram/Report_WorkItem.asp?WKI_ID=58931).
 
-**{- Disclaimer: The content of this repository is related to a DRAFT, i.e. a working document, of ETSI ISG NFV.-}**
-
-{-It is provided for information only and is still under development. The content may be updated, replaced, or removed at any time. Do not use as reference material.-}
-
-The latest draft may be downloaded at the [ISG NFV open area](https://docbox.etsi.org/isg/nfv/open/Drafts/).
-
 ## Overview
 
 The Test Specification is built as a collection of [Robot Framework](robotframework.org/) Test Description. [Robot Framework](robotframework.org/) is a generic test automation framework for acceptance testing and acceptance test-driven development.
-- 
GitLab